Changeset 70341 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Dec 26, 2017 2:42:28 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119941

Message:

IPRT: More NT 3.1 compatibility tweaking.

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• vcc100-kernel32-fakes.cpp (modified) (24 diffs)
• vcc100-kernel32-fakesA.asm (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#define RT_NO_STRICT /* Minimal deps so that it works on NT 3.51 too. */
+//#define RT_NO_STRICT /* Minimal deps so that it works on NT 3.51 too. */
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
@@ -55 +55 @@
 #define VerifyVersionInfoA                      Ignore_VerifyVersionInfoA
 #define VerSetConditionMask                     Ignore_VerSetConditionMask
-#define IsProcessorFeaturePresent               Ignore_IsProcessorFeaturePresent /* NT 3.51 start */
+#define IsProcessorFeaturePresent               Ignore_IsProcessorFeaturePresent    /* NT 3.51 start */
 #define CancelIo                                Ignore_CancelIo
-#define IsDebuggerPresent                       Ignore_IsDebuggerPresent /* NT 3.50 start */
+#define IsDebuggerPresent                       Ignore_IsDebuggerPresent            /* NT 3.50 start */
 #define GetSystemTimeAsFileTime                 Ignore_GetSystemTimeAsFileTime
+#define GetVersionExA                           Ignore_GetVersionExA                /* NT 3.1 start */
+#define GetVersionExW                           Ignore_GetVersionExW
+#define GetEnvironmentStringsW                  Ignore_GetEnvironmentStringsW
+#define FreeEnvironmentStringsW                 Ignore_FreeEnvironmentStringsW
+#define GetLocaleInfoA                          Ignore_GetLocaleInfoA
+#define EnumSystemLocalesA                      Ignore_EnumSystemLocalesA
+#define IsValidLocale                           Ignore_IsValidLocale
+#define SetThreadAffinityMask                   Ignore_SetThreadAffinityMask
+#define GetProcessAffinityMask                  Ignore_GetProcessAffinityMask
+#define CommandLineToArgvW                      Ignore_CommandLineToArgvW
 
 #include <iprt/nt/nt-and-windows.h>
@@ -81 +91 @@
 #undef IsDebuggerPresent
 #undef GetSystemTimeAsFileTime
-
-
+#undef GetVersionExA
+#undef GetVersionExW
+#undef GetEnvironmentStringsW
+#undef FreeEnvironmentStringsW
+#undef GetLocaleInfoA
+#undef EnumSystemLocalesA
+#undef IsValidLocale
+#undef SetThreadAffinityMask
+#undef GetProcessAffinityMask
+#undef CommandLineToArgvW
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #ifndef HEAP_STANDARD
 # define HEAP_STANDARD 0
@@ -118 +141 @@
 
 
-extern "C"
-__declspec(dllexport) PVOID WINAPI
-DecodePointer(PVOID pvEncoded)
+/** Declare a kernel32 API.
+ * @note We are not exporting them as that causes duplicate symbol troubles in
+ *       the OpenGL bits. */
+#define DECL_KERNEL32(a_Type) extern "C" a_Type WINAPI
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+DECL_KERNEL32(BOOL) WINAPI GetVersionExA(LPOSVERSIONINFOA pInfo);
+
+
+DECL_KERNEL32(PVOID) DecodePointer(PVOID pvEncoded)
 {
     RESOLVE_ME(DecodePointer);
@@ -133 +166 @@
 
 
-extern "C"
-__declspec(dllexport) PVOID WINAPI
-EncodePointer(PVOID pvNative)
+DECL_KERNEL32(PVOID) EncodePointer(PVOID pvNative)
 {
     RESOLVE_ME(EncodePointer);
@@ -148 +179 @@
 
 
-extern "C"
-__declspec(dllexport) BOOL WINAPI
-InitializeCriticalSectionAndSpinCount(LPCRITICAL_SECTION pCritSect, DWORD cSpin)
+DECL_KERNEL32(BOOL) InitializeCriticalSectionAndSpinCount(LPCRITICAL_SECTION pCritSect, DWORD cSpin)
 {
     RESOLVE_ME(InitializeCriticalSectionAndSpinCount);
@@ -164 +193 @@
 
 
-extern "C"
-__declspec(dllexport) BOOL WINAPI
-HeapSetInformation(HANDLE hHeap, HEAP_INFORMATION_CLASS enmInfoClass, PVOID pvBuf, SIZE_T cbBuf)
+DECL_KERNEL32(BOOL) HeapSetInformation(HANDLE hHeap, HEAP_INFORMATION_CLASS enmInfoClass, PVOID pvBuf, SIZE_T cbBuf)
 {
     RESOLVE_ME(HeapSetInformation);
@@ -193 +220 @@
 
 
-extern "C"
-__declspec(dllexport) BOOL WINAPI
-HeapQueryInformation(HANDLE hHeap, HEAP_INFORMATION_CLASS enmInfoClass, PVOID pvBuf, SIZE_T cbBuf, PSIZE_T pcbRet)
+DECL_KERNEL32(BOOL) HeapQueryInformation(HANDLE hHeap, HEAP_INFORMATION_CLASS enmInfoClass,
+                                         PVOID pvBuf, SIZE_T cbBuf, PSIZE_T pcbRet)
 {
     RESOLVE_ME(HeapQueryInformation);
@@ -223 +249 @@
 /* These are used by INTEL\mt_obj\Timer.obj: */
 
-extern "C"
-__declspec(dllexport)
-HANDLE WINAPI CreateTimerQueue(void)
+DECL_KERNEL32(HANDLE) CreateTimerQueue(void)
 {
     RESOLVE_ME(CreateTimerQueue);
@@ -234 +258 @@
 }
 
-extern "C"
-__declspec(dllexport)
-BOOL WINAPI CreateTimerQueueTimer(PHANDLE phTimer, HANDLE hTimerQueue, WAITORTIMERCALLBACK pfnCallback, PVOID pvUser,
-                                  DWORD msDueTime, DWORD msPeriod, ULONG fFlags)
+DECL_KERNEL32(BOOL) CreateTimerQueueTimer(PHANDLE phTimer, HANDLE hTimerQueue, WAITORTIMERCALLBACK pfnCallback, PVOID pvUser,
+                                          DWORD msDueTime, DWORD msPeriod, ULONG fFlags)
 {
     RESOLVE_ME(CreateTimerQueueTimer);
@@ -246 +268 @@
 }
 
-extern "C"
-__declspec(dllexport)
-BOOL WINAPI DeleteTimerQueueTimer(HANDLE hTimerQueue, HANDLE hTimer, HANDLE hEvtCompletion)
+DECL_KERNEL32(BOOL) DeleteTimerQueueTimer(HANDLE hTimerQueue, HANDLE hTimer, HANDLE hEvtCompletion)
 {
     RESOLVE_ME(DeleteTimerQueueTimer);
@@ -259 +279 @@
 /* This is used by several APIs. */
 
-extern "C"
-__declspec(dllexport)
-VOID WINAPI InitializeSListHead(PSLIST_HEADER pHead)
+DECL_KERNEL32(VOID) InitializeSListHead(PSLIST_HEADER pHead)
 {
     RESOLVE_ME(InitializeSListHead);
@@ -271 +289 @@
 
 
-extern "C"
-__declspec(dllexport)
-PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER pHead)
+DECL_KERNEL32(PSLIST_ENTRY) InterlockedFlushSList(PSLIST_HEADER pHead)
 {
     RESOLVE_ME(InterlockedFlushSList);
@@ -299 +315 @@
 }
 
-extern "C"
-__declspec(dllexport)
-PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER pHead)
+DECL_KERNEL32(PSLIST_ENTRY) InterlockedPopEntrySList(PSLIST_HEADER pHead)
 {
     RESOLVE_ME(InterlockedPopEntrySList);
@@ -335 +349 @@
 }
 
-extern "C"
-__declspec(dllexport)
-PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER pHead, PSLIST_ENTRY pEntry)
+DECL_KERNEL32(PSLIST_ENTRY) InterlockedPushEntrySList(PSLIST_HEADER pHead, PSLIST_ENTRY pEntry)
 {
     RESOLVE_ME(InterlockedPushEntrySList);
@@ -360 +372 @@
 }
 
-extern "C"
-__declspec(dllexport)
-WORD WINAPI QueryDepthSList(PSLIST_HEADER pHead)
+DECL_KERNEL32(WORD) QueryDepthSList(PSLIST_HEADER pHead)
 {
     RESOLVE_ME(QueryDepthSList);
@@ -372 +382 @@
 
 /* curl drags these in: */
-extern "C"
-__declspec(dllexport)
-BOOL WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA pInfo, DWORD fTypeMask, DWORDLONG fConditionMask)
+DECL_KERNEL32(BOOL) VerifyVersionInfoA(LPOSVERSIONINFOEXA pInfo, DWORD fTypeMask, DWORDLONG fConditionMask)
 {
     RESOLVE_ME(VerifyVersionInfoA);
@@ -384 +392 @@
     RT_ZERO(VerInfo);
     VerInfo.dwOSVersionInfoSize = sizeof(VerInfo);
-    if (!GetVersionEx((OSVERSIONINFO *)&VerInfo))
+    if (!GetVersionExA((OSVERSIONINFO *)&VerInfo))
     {
         RT_ZERO(VerInfo);
         VerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-        AssertReturn(GetVersionEx((OSVERSIONINFO *)&VerInfo), FALSE);
+        AssertReturn(GetVersionExA((OSVERSIONINFO *)&VerInfo), FALSE);
     }
 
@@ -427 +435 @@
 
 
-extern "C"
-__declspec(dllexport)
-ULONGLONG WINAPI VerSetConditionMask(ULONGLONG fConditionMask, DWORD fTypeMask, BYTE bOperator)
+DECL_KERNEL32(ULONGLONG) VerSetConditionMask(ULONGLONG fConditionMask, DWORD fTypeMask, BYTE bOperator)
 {
     RESOLVE_ME(VerSetConditionMask);
@@ -452 +458 @@
  */
 
-extern "C" DECLEXPORT(BOOL) WINAPI IsProcessorFeaturePresent(DWORD enmProcessorFeature)
+DECL_KERNEL32(BOOL) IsProcessorFeaturePresent(DWORD enmProcessorFeature)
 {
     RESOLVE_ME(IsProcessorFeaturePresent);
@@ -463 +469 @@
 
 
-extern "C" DECLEXPORT(BOOL) WINAPI CancelIo(HANDLE hHandle)
+DECL_KERNEL32(BOOL) CancelIo(HANDLE hHandle)
 {
     RESOLVE_ME(CancelIo);
@@ -492 +498 @@
  */
 
-extern "C" DECLEXPORT(BOOL) WINAPI IsDebuggerPresent(VOID)
+DECL_KERNEL32(BOOL) IsDebuggerPresent(VOID)
 {
     RESOLVE_ME(IsDebuggerPresent);
@@ -501 +507 @@
 
 
-extern "C" DECLEXPORT(VOID) WINAPI GetSystemTimeAsFileTime(LPFILETIME pTime)
+DECL_KERNEL32(VOID) GetSystemTimeAsFileTime(LPFILETIME pTime)
 {
     RESOLVE_ME(GetSystemTimeAsFileTime);
@@ -528 +534 @@
         else
         {
-            /** @todo    */
-            __debugbreak();
-        }
-    }
+            /* NT 3.1 didn't have a KUSER_SHARED_DATA nor a GetSystemTimeAsFileTime export. */
+            SYSTEMTIME SystemTime;
+            GetSystemTime(&SystemTime);
+            BOOL fRet = SystemTimeToFileTime(&SystemTime, pTime);
+            AssertStmt(fRet, pTime->dwHighDateTime = pTime->dwLowDateTime = 0);
+        }
+    }
+}
+
+
+/*
+ * NT 3.1 stuff.
+ */
+
+DECL_KERNEL32(BOOL) GetVersionExA(LPOSVERSIONINFOA pInfo)
+{
+    RESOLVE_ME(GetVersionExA);
+    if (pfnApi)
+        return pfnApi(pInfo);
+
+    DWORD dwVersion = GetVersion();
+
+    /* Common fields: */
+    pInfo->dwMajorVersion = dwVersion & 0xff;
+    pInfo->dwMinorVersion = (dwVersion >> 8) & 0xff;
+    if (!(dwVersion & RT_BIT_32(31)))
+        pInfo->dwBuildNumber = dwVersion >> 16;
+    else
+        pInfo->dwBuildNumber = 511;
+    pInfo->dwPlatformId = VER_PLATFORM_WIN32_NT;
+/** @todo get CSD from registry. */
+    pInfo->szCSDVersion[0] = '\0';
+
+    /* OSVERSIONINFOEX fields: */
+    if (pInfo->dwOSVersionInfoSize > sizeof((*pInfo)))
+    {
+        LPOSVERSIONINFOEXA pInfoEx = (LPOSVERSIONINFOEXA)pInfo;
+        if (pInfoEx->dwOSVersionInfoSize > RT_UOFFSETOF(OSVERSIONINFOEXA, wServicePackMinor))
+        {
+            pInfoEx->wServicePackMajor = 0;
+            pInfoEx->wServicePackMinor = 0;
+        }
+        if (pInfoEx->dwOSVersionInfoSize > RT_UOFFSETOF(OSVERSIONINFOEXA, wSuiteMask))
+            pInfoEx->wSuiteMask = 0;
+        if (pInfoEx->dwOSVersionInfoSize > RT_UOFFSETOF(OSVERSIONINFOEXA, wProductType))
+            pInfoEx->wProductType = VER_NT_WORKSTATION;
+        if (pInfoEx->wReserved > RT_UOFFSETOF(OSVERSIONINFOEXA, wProductType))
+            pInfoEx->wReserved = 0;
+    }
+
+    return TRUE;
+}
+
+
+DECL_KERNEL32(BOOL) GetVersionExW(LPOSVERSIONINFOW pInfo)
+{
+    RESOLVE_ME(GetVersionExW);
+    if (pfnApi)
+        return pfnApi(pInfo);
+
+    DWORD dwVersion = GetVersion();
+
+    /* Common fields: */
+    pInfo->dwMajorVersion = dwVersion & 0xff;
+    pInfo->dwMinorVersion = (dwVersion >> 8) & 0xff;
+    if (!(dwVersion & RT_BIT_32(31)))
+        pInfo->dwBuildNumber = dwVersion >> 16;
+    else
+        pInfo->dwBuildNumber = 511;
+    pInfo->dwPlatformId = VER_PLATFORM_WIN32_NT;
+/** @todo get CSD from registry. */
+    pInfo->szCSDVersion[0] = '\0';
+
+    /* OSVERSIONINFOEX fields: */
+    if (pInfo->dwOSVersionInfoSize > sizeof((*pInfo)))
+    {
+        LPOSVERSIONINFOEXW pInfoEx = (LPOSVERSIONINFOEXW)pInfo;
+        if (pInfoEx->dwOSVersionInfoSize > RT_UOFFSETOF(OSVERSIONINFOEXW, wServicePackMinor))
+        {
+            pInfoEx->wServicePackMajor = 0;
+            pInfoEx->wServicePackMinor = 0;
+        }
+        if (pInfoEx->dwOSVersionInfoSize > RT_UOFFSETOF(OSVERSIONINFOEXW, wSuiteMask))
+            pInfoEx->wSuiteMask = 0;
+        if (pInfoEx->dwOSVersionInfoSize > RT_UOFFSETOF(OSVERSIONINFOEXW, wProductType))
+            pInfoEx->wProductType = VER_NT_WORKSTATION;
+        if (pInfoEx->wReserved > RT_UOFFSETOF(OSVERSIONINFOEXW, wProductType))
+            pInfoEx->wReserved = 0;
+    }
+
+    return TRUE;
+}
+
+
+DECL_KERNEL32(LPWCH) GetEnvironmentStringsW(void)
+{
+    RESOLVE_ME(GetEnvironmentStringsW);
+    if (pfnApi)
+        return pfnApi();
+
+    /*
+     * Environment is ANSI in NT 3.1. We should only be here for NT 3.1.
+     * For now, don't try do a perfect job converting it, just do it.
+     */
+    char    *pszzEnv = (char *)RTNtCurrentPeb()->ProcessParameters->Environment;
+    size_t   offEnv  = 0;
+    while (pszzEnv[offEnv] != '\0')
+    {
+        size_t cchLen = strlen(&pszzEnv[offEnv]);
+        offEnv += cchLen + 1;
+    }
+    size_t const cchEnv = offEnv + 1;
+
+    PRTUTF16 pwszzEnv = (PRTUTF16)HeapAlloc(GetProcessHeap(), 0, cchEnv * sizeof(RTUTF16));
+    if (!pwszzEnv)
+        return NULL;
+    for (offEnv = 0; offEnv < cchEnv; offEnv++)
+    {
+        unsigned char ch = pwszzEnv[offEnv];
+        if (!(ch & 0x80))
+            pwszzEnv[offEnv] = ch;
+        else
+            pwszzEnv[offEnv] = '_';
+    }
+    return pwszzEnv;
+}
+
+
+DECL_KERNEL32(BOOL) FreeEnvironmentStringsW(LPWCH pwszzEnv)
+{
+    RESOLVE_ME(FreeEnvironmentStringsW);
+    if (pfnApi)
+        return pfnApi(pwszzEnv);
+    if (pwszzEnv)
+        HeapFree(GetProcessHeap(), 0, pwszzEnv);
+    return TRUE;
+}
+
+
+DECL_KERNEL32(int) GetLocaleInfoA(LCID idLocale, LCTYPE enmType, LPSTR pData, int cchData)
+{
+    RESOLVE_ME(GetLocaleInfoA);
+    if (pfnApi)
+        return pfnApi(idLocale, enmType, pData, cchData);
+
+    AssertMsgFailed(("GetLocaleInfoA: idLocale=%#x enmType=%#x cchData=%#x\n", idLocale, enmType, cchData));
+    SetLastError(ERROR_NOT_SUPPORTED);
+    return 0;
+}
+
+
+DECL_KERNEL32(BOOL) EnumSystemLocalesA(LOCALE_ENUMPROCA pfnCallback, DWORD fFlags)
+{
+    RESOLVE_ME(EnumSystemLocalesA);
+    if (pfnApi)
+        return pfnApi(pfnCallback, fFlags);
+
+    AssertMsgFailed(("EnumSystemLocalesA: pfnCallback=%p fFlags=%#x\n", pfnCallback, fFlags));
+    SetLastError(ERROR_NOT_SUPPORTED);
+    return FALSE;
+}
+
+
+DECL_KERNEL32(BOOL) IsValidLocale(LCID idLocale, DWORD fFlags)
+{
+    RESOLVE_ME(IsValidLocale);
+    if (pfnApi)
+        return pfnApi(idLocale, fFlags);
+
+    AssertMsgFailed(("IsValidLocale: idLocale fFlags=%#x\n", idLocale, fFlags));
+    SetLastError(ERROR_NOT_SUPPORTED);
+    return FALSE;
+}
+
+
+DECL_KERNEL32(DWORD_PTR) SetThreadAffinityMask(HANDLE hThread, DWORD_PTR fAffinityMask)
+{
+    RESOLVE_ME(SetThreadAffinityMask);
+    if (pfnApi)
+        return pfnApi(hThread, fAffinityMask);
+
+    SYSTEM_INFO SysInfo;
+    GetSystemInfo(&SysInfo);
+    AssertMsgFailed(("SetThreadAffinityMask: hThread=%p fAffinityMask=%p SysInfo.dwActiveProcessorMask=%p\n",
+                     hThread, fAffinityMask, SysInfo.dwActiveProcessorMask));
+    if (   SysInfo.dwActiveProcessorMask == fAffinityMask
+        || fAffinityMask                 == ~(DWORD_PTR)0)
+        return fAffinityMask;
+
+    SetLastError(ERROR_NOT_SUPPORTED);
+    return 0;
+}
+
+
+DECL_KERNEL32(BOOL) GetProcessAffinityMask(HANDLE hProcess, PDWORD_PTR pfProcessAffinityMask, PDWORD_PTR pfSystemAffinityMask)
+{
+    RESOLVE_ME(GetProcessAffinityMask);
+    if (pfnApi)
+        return pfnApi(hProcess, pfProcessAffinityMask, pfSystemAffinityMask);
+
+    SYSTEM_INFO SysInfo;
+    GetSystemInfo(&SysInfo);
+    AssertMsgFailed(("GetProcessAffinityMask: SysInfo.dwActiveProcessorMask=%p\n", SysInfo.dwActiveProcessorMask));
+    if (pfProcessAffinityMask)
+        *pfProcessAffinityMask = SysInfo.dwActiveProcessorMask;
+    if (pfSystemAffinityMask)
+        *pfSystemAffinityMask  = SysInfo.dwActiveProcessorMask;
+    return TRUE;
+}
+
+
+/** @todo This is actually in SHELL32. */
+DECL_KERNEL32(LPWSTR *) CommandLineToArgvW(LPCWSTR pwszCmdLine, int *pcArgs)
+{
+    RESOLVE_ME(CommandLineToArgvW);
+    if (pfnApi)
+        return pfnApi(pwszCmdLine, pcArgs);
+
+    *pcArgs = 0;
+    return NULL;
 }
 

trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakesA.asm

@@ -45 +45 @@
 GLOBALNAME vcc100_kernel32_fakes_asm
 
+; NT 4
 MAKE_IMPORT_ENTRY DecodePointer, 4
 MAKE_IMPORT_ENTRY EncodePointer, 4
@@ -60 +61 @@
 MAKE_IMPORT_ENTRY VerifyVersionInfoA, 16
 MAKE_IMPORT_ENTRY VerSetConditionMask, 16
+; NT 3.51
 MAKE_IMPORT_ENTRY IsProcessorFeaturePresent, 4
 MAKE_IMPORT_ENTRY CancelIo, 4
+; NT 3.50
 MAKE_IMPORT_ENTRY IsDebuggerPresent, 0
 MAKE_IMPORT_ENTRY GetSystemTimeAsFileTime, 4
+; NT 3.1
+MAKE_IMPORT_ENTRY GetVersionExA, 4
+MAKE_IMPORT_ENTRY GetVersionExW, 4
+MAKE_IMPORT_ENTRY GetEnvironmentStringsW, 0
+MAKE_IMPORT_ENTRY FreeEnvironmentStringsW, 4
+MAKE_IMPORT_ENTRY GetLocaleInfoA, 16
+MAKE_IMPORT_ENTRY EnumSystemLocalesA, 8
+MAKE_IMPORT_ENTRY IsValidLocale, 8
+MAKE_IMPORT_ENTRY SetThreadAffinityMask, 8
+MAKE_IMPORT_ENTRY GetProcessAffinityMask, 12
+MAKE_IMPORT_ENTRY CommandLineToArgvW, 8 ; Lazy bird: this lives in shell32.