Changeset 802 in dev for branches/egtra/ab5.0

Timestamp:

Feb 6, 2011, 10:07:24 PM (14 years ago)

Author:

イグトランス (egtra)

Message:

コンパイラでもMSLUを使用するように変更

Location:

branches/egtra/ab5.0/abdev

Files:

• OldWindowsHelper.asm (modified) (1 diff)
• OldWindowsHelperImpl.cpp (modified) (3 diffs)
• compiler.vcxproj (modified) (2 diffs)

branches/egtra/ab5.0/abdev/OldWindowsHelper.asm

@@ -20 +20 @@
     ImportTrap InterlockedPopEntrySList, 4
     ImportTrap InterlockedCompareExchange, 12
-    ImportTrap GetModuleHandleW, 4
-    ImportTrap GetStartupInfoW, 4
-    ImportTrap GetEnvironmentStringsW, 0
-    ImportTrap FreeEnvironmentStringsW, 4
     TrapTableLast LABEL DWORD
 

branches/egtra/ab5.0/abdev/OldWindowsHelperImpl.cpp

@@ -17 +17 @@
     extern FARPROC alias__imp__InterlockedPushEntrySList;
     extern FARPROC alias__imp__InterlockedPopEntrySList;
-    extern FARPROC alias__imp__GetModuleHandleW;
-    extern FARPROC alias__imp__GetStartupInfoW;
-    extern FARPROC alias__imp__GetEnvironmentStringsW;
-    extern FARPROC alias__imp__FreeEnvironmentStringsW;
     extern void* TrapTableLast;
 } // extern "C"
@@ -88 +84 @@
 }
 
-HMODULE WINAPI Alternative_GetModuleHandleW(LPCWSTR moduleName)
-{
-    HMODULE ret = nullptr;
-    auto size = std::wcslen(moduleName) + 1;
-    auto mbsSize = size * 2;
-    if (auto buffer = static_cast<LPSTR>(::HeapAlloc(::GetProcessHeap(), HEAP_ZERO_MEMORY, mbsSize)))
-    {
-        if (::WideCharToMultiByte(CP_ACP, 0, moduleName, static_cast<int>(size), buffer, static_cast<int>(mbsSize), nullptr, nullptr) > 0)
-        {
-            ret = ::GetModuleHandleA(buffer);
-        }
-        ::HeapFree(::GetProcessHeap(), 0, buffer);
-    }
-    return ret;
-}
-
-// CRT用に最小限の実装
-void WINAPI Alternative_GetStartupInfoW(LPSTARTUPINFOW psi)
-{
-    STARTUPINFOA sia;
-    ::GetStartupInfoA(&sia);
-
-    *psi = STARTUPINFOW();
-    psi->cb = sizeof *psi;
-    if (sia.dwFlags & STARTF_USESHOWWINDOW)
-    {
-        psi->dwFlags = STARTF_USESHOWWINDOW;
-        psi->wShowWindow = sia.wShowWindow;
-    }
-}
-
-LPWCH WINAPI Alternative_GetEnvironmentStringsW()
-{
-    static WCHAR c[2];
-    return c;
-}
-
-BOOL WINAPI Alternative_FreeEnvironmentStringsW(LPWCH)
-{
-    return TRUE;
-}
-
 #define FUNCTION_INIT(name) \
     if (auto f = ::GetProcAddress(GetKernelModule(), #name)) { \
@@ -159 +113 @@
     alias__imp__InterlockedPushEntrySList = ::GetProcAddress(GetKernelModule(), "InterlockedPushEntrySList");
     alias__imp__InterlockedPopEntrySList = ::GetProcAddress(GetKernelModule(), "InterlockedPopEntrySList");
-    FUNCTION_INIT_9X(GetModuleHandleW);
-    FUNCTION_INIT_9X(GetStartupInfoW);
-    FUNCTION_INIT_9X(GetEnvironmentStringsW);
-    FUNCTION_INIT_9X(FreeEnvironmentStringsW);
 
     ::VirtualProtect(&TrapTableFirst,

branches/egtra/ab5.0/abdev/compiler.vcxproj

@@ -112 +112 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>comctl32.lib;psapi.lib;imagehlp.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>unicows.lib;comctl32.lib;psapi.lib;imagehlp.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\jenga\lib\x86;lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -192 +192 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>comctl32.lib;psapi.lib;imagehlp.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>unicows.lib;comctl32.lib;psapi.lib;imagehlp.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\jenga\lib\x86;lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>