Changeset 801 in dev for branches/egtra/ab5.0/abdev/OldWindowsHelperImpl.cpp

Timestamp:

Feb 6, 2011, 9:47:29 PM (13 years ago)

Author:

イグトランス (egtra)

Message:

コンパイラにXP以前対応用のコードを適用

File:

• branches/egtra/ab5.0/abdev/OldWindowsHelperImpl.cpp (modified) (8 diffs)

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

@@ -1 +1 @@
 #include "stdafx.h"
 #include <cstdint>
+#include <cstring>
 #include <process.h>
 #include "OSVersion.h"
@@ -16 +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"
@@ -26 +31 @@
     if (hmodKernel == nullptr)
     {
-        hmodKernel = GetModuleHandle(TEXT("kernel32"));
+        hmodKernel = GetModuleHandleA("kernel32");
     }
     return hmodKernel;
@@ -65 +70 @@
 #pragma warning(pop)
 
-__declspec(naked) long __stdcall Alternative_InterlockedCompareExchange(long volatile*, long, long)
+__declspec(naked) long WINAPI Alternative_InterlockedCompareExchange(long volatile*, long, long)
 {
     __asm
@@ -83 +88 @@
 }
 
+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)) { \
@@ -88 +135 @@
     } else { \
         alias__imp__ ## name = reinterpret_cast<FARPROC>(Alternative_ ## name); \
+    }
+
+#define FUNCTION_INIT_9X(name) \
+    if (ActiveBasic::Common::Is9x()) { \
+        alias__imp__ ## name = reinterpret_cast<FARPROC>(Alternative_ ## name); \
+    } else { \
+        alias__imp__ ## name = ::GetProcAddress(GetKernelModule(), #name); \
     }
 
@@ -100 +154 @@
     FUNCTION_INIT(DecodePointer);
     FUNCTION_INIT(HeapSetInformation);
-    alias__imp__InitializeCriticalSectionAndSpinCount = 
-        ActiveBasic::Common::Is9x()
-        ? reinterpret_cast<FARPROC>(Alternative_InitializeCriticalSectionAndSpinCount)
-        : ::GetProcAddress(GetKernelModule(), "InitializeCriticalSectionAndSpinCount");
+    FUNCTION_INIT_9X(InitializeCriticalSectionAndSpinCount);
     FUNCTION_INIT(InterlockedCompareExchange);
     FUNCTION_INIT(IsProcessorFeaturePresent);
     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,
@@ -118 +173 @@
 extern "C"
 {
-#ifdef _UNICODE
-int wWinMainCRTStartup();
-#define tWinMainCRTStartup wWinMainCRTStartup
+#ifdef _CONSOLE
+#   ifdef _UNICODE
+        int wmainCRTStartup();
+#       define CRTStartup wmainCRTStartup
+#   else
+        int mainCRTStartup();
+#       define CRTStartup mainCRTStartup
+#   endif
 #else
-int WinMainCRTStartup();
-#define tWinMainCRTStartup WinMainCRTStartup
+#   ifdef _UNICODE
+        int wWinMainCRTStartup();
+#       define CRTStartup wWinMainCRTStartup
+#   else
+        int WinMainCRTStartup();
+#       define CRTStartup WinMainCRTStartup
+#   endif
 #endif
 
-void WinMainStartup_OldWindowsHelper()
+void Startup_OldWindowsHelper()
 {
     __security_init_cookie();
-
+//  MessageBox(0, "Startup", "", 0);
     InitializeOldWindowsHelper();
 
     __asm
     {
-        jmp tWinMainCRTStartup;
+        jmp CRTStartup;
     }
 }