Changeset 70394 in vbox for trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp

Timestamp:

Dec 30, 2017 7:27:35 PM (7 years ago)

Author:

vboxsync

Message:

vcc100-*: fixes and optimizations.

File:

• trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp (modified) (32 diffs)

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

@@ -70 +70 @@
 
 
-/**
- * Resolves all the APIs ones and for all, updating the fake IAT entries.
- */
-static void InitFakes(void)
-{
-    CURRENT_VERSION_VARIABLE();
-
-    HMODULE hmod = GetModuleHandleW(L"kernel32");
-    MY_ASSERT(hmod != NULL, "kernel32");
-
-#undef MAKE_IMPORT_ENTRY
-#define MAKE_IMPORT_ENTRY(a_uMajorVer, a_uMinorVer, a_Name, a_cb) RESOLVE_IMPORT(a_uMajorVer, a_uMinorVer, a_Name, a_cb)
-#include "vcc100-kernel32-fakes.h"
-
-    g_fInitialized = true;
-}
-
 
 DECL_KERNEL32(PVOID) Fake_DecodePointer(PVOID pvEncoded)
 {
-    INIT_FAKES(DecodePointer,(pvEncoded));
-
-    /*
-     * Fallback code.
-     */
     return pvEncoded;
 }
@@ -101 +79 @@
 DECL_KERNEL32(PVOID) Fake_EncodePointer(PVOID pvNative)
 {
-    INIT_FAKES(EncodePointer, (pvNative));
-
-    /*
-     * Fallback code.
-     */
     return pvNative;
 }
@@ -112 +85 @@
 DECL_KERNEL32(BOOL) Fake_InitializeCriticalSectionAndSpinCount(LPCRITICAL_SECTION pCritSect, DWORD cSpin)
 {
-    INIT_FAKES(InitializeCriticalSectionAndSpinCount, (pCritSect, cSpin));
-
-    /*
-     * Fallback code.
-     */
+    RT_NOREF(cSpin);
     InitializeCriticalSection(pCritSect);
     return TRUE;
@@ -124 +93 @@
 DECL_KERNEL32(BOOL) Fake_HeapSetInformation(HANDLE hHeap, HEAP_INFORMATION_CLASS enmInfoClass, PVOID pvBuf, SIZE_T cbBuf)
 {
-    INIT_FAKES(HeapSetInformation, (hHeap, enmInfoClass, pvBuf, cbBuf));
-
-    /*
-     * Fallback code.
-     */
+    RT_NOREF(hHeap);
     if (enmInfoClass == HeapCompatibilityInformation)
     {
@@ -150 +115 @@
                                               PVOID pvBuf, SIZE_T cbBuf, PSIZE_T pcbRet)
 {
-    INIT_FAKES(HeapQueryInformation, (hHeap, enmInfoClass, pvBuf, cbBuf, pcbRet));
-
-    /*
-     * Fallback code.
-     */
+    RT_NOREF(hHeap);
     if (enmInfoClass == HeapCompatibilityInformation)
     {
@@ -176 +137 @@
 DECL_KERNEL32(HANDLE) Fake_CreateTimerQueue(void)
 {
-    INIT_FAKES(CreateTimerQueue, ());
-
     SetLastError(ERROR_NOT_SUPPORTED);
     return NULL;
@@ -185 +144 @@
                                                DWORD msDueTime, DWORD msPeriod, ULONG fFlags)
 {
-    INIT_FAKES(CreateTimerQueueTimer, (phTimer, hTimerQueue, pfnCallback, pvUser, msDueTime, msPeriod, fFlags));
-
+    NOREF(phTimer); NOREF(hTimerQueue); NOREF(pfnCallback); NOREF(pvUser); NOREF(msDueTime); NOREF(msPeriod); NOREF(fFlags);
     SetLastError(ERROR_NOT_SUPPORTED);
     return FALSE;
@@ -193 +151 @@
 DECL_KERNEL32(BOOL) Fake_DeleteTimerQueueTimer(HANDLE hTimerQueue, HANDLE hTimer, HANDLE hEvtCompletion)
 {
-    INIT_FAKES(DeleteTimerQueueTimer, (hTimerQueue, hTimer, hEvtCompletion));
-
+    NOREF(hTimerQueue); NOREF(hTimer); NOREF(hEvtCompletion);
     SetLastError(ERROR_NOT_SUPPORTED);
     return FALSE;
@@ -203 +160 @@
 DECL_KERNEL32(VOID) Fake_InitializeSListHead(PSLIST_HEADER pHead)
 {
-    INIT_FAKES_VOID(InitializeSListHead, (pHead));
-
-    /* fallback: */
     pHead->Alignment = 0;
 }
@@ -212 +166 @@
 DECL_KERNEL32(PSLIST_ENTRY) Fake_InterlockedFlushSList(PSLIST_HEADER pHead)
 {
-    INIT_FAKES(InterlockedFlushSList, (pHead));
-
-    /* fallback: */
     PSLIST_ENTRY pRet = NULL;
     if (pHead->Next.Next)
@@ -236 +187 @@
 DECL_KERNEL32(PSLIST_ENTRY) Fake_InterlockedPopEntrySList(PSLIST_HEADER pHead)
 {
-    INIT_FAKES(InterlockedPopEntrySList, (pHead));
-
-    /* fallback: */
     PSLIST_ENTRY pRet = NULL;
     for (;;)
@@ -268 +216 @@
 DECL_KERNEL32(PSLIST_ENTRY) Fake_InterlockedPushEntrySList(PSLIST_HEADER pHead, PSLIST_ENTRY pEntry)
 {
-    INIT_FAKES(InterlockedPushEntrySList, (pHead, pEntry));
-
-    /* fallback: */
     PSLIST_ENTRY pRet = NULL;
     for (;;)
@@ -289 +234 @@
 DECL_KERNEL32(WORD) Fake_QueryDepthSList(PSLIST_HEADER pHead)
 {
-    INIT_FAKES(QueryDepthSList, (pHead));
-
-    /* fallback: */
     return pHead->Depth;
 }
@@ -299 +241 @@
 DECL_KERNEL32(BOOL) Fake_VerifyVersionInfoA(LPOSVERSIONINFOEXA pInfo, DWORD fTypeMask, DWORDLONG fConditionMask)
 {
-    INIT_FAKES(VerifyVersionInfoA, (pInfo, fTypeMask, fConditionMask));
-
-    /* fallback to make curl happy: */
     OSVERSIONINFOEXA VerInfo;
     RT_ZERO(VerInfo);
@@ -357 +296 @@
 DECL_KERNEL32(ULONGLONG) Fake_VerSetConditionMask(ULONGLONG fConditionMask, DWORD fTypeMask, BYTE bOperator)
 {
-    INIT_FAKES(VerSetConditionMask, (fConditionMask, fTypeMask, bOperator));
-
-    /* fallback: */
     for (unsigned i = 0; i < 8; i++)
         if (fTypeMask & RT_BIT_32(i))
@@ -378 +314 @@
 DECL_KERNEL32(BOOL) Fake_IsProcessorFeaturePresent(DWORD enmProcessorFeature)
 {
-    INIT_FAKES(IsProcessorFeaturePresent, (enmProcessorFeature));
-
     /* Could make more of an effort here... */
+    RT_NOREF(enmProcessorFeature);
     return FALSE;
 }
@@ -387 +322 @@
 DECL_KERNEL32(BOOL) Fake_CancelIo(HANDLE hHandle)
 {
-    INIT_FAKES(CancelIo, (hHandle));
-
     /* NT 3.51 have the NTDLL API this corresponds to. */
     RESOLVE_NTDLL_API(NtCancelIoFile);
@@ -414 +347 @@
 DECL_KERNEL32(BOOL) Fake_IsDebuggerPresent(VOID)
 {
-    INIT_FAKES(IsDebuggerPresent, ());
-
     /* Fallback: */
     return FALSE;
@@ -423 +354 @@
 DECL_KERNEL32(VOID) Fake_GetSystemTimeAsFileTime(LPFILETIME pTime)
 {
-    INIT_FAKES_VOID(GetSystemTimeAsFileTime, (pTime));
-
     DWORD dwVersion = GetVersion();
     if (   (dwVersion & 0xff) > 3
@@ -467 +396 @@
 DECL_KERNEL32(BOOL) Fake_GetVersionExA(LPOSVERSIONINFOA pInfo)
 {
-    INIT_FAKES(GetVersionExA, (pInfo));
-
-    /*
-     * Fallback.
-     */
     DWORD dwVersion = GetVersion();
 
@@ -508 +432 @@
 DECL_KERNEL32(BOOL) Fake_GetVersionExW(LPOSVERSIONINFOW pInfo)
 {
-    INIT_FAKES(GetVersionExW, (pInfo));
-
-    /*
-     * Fallback.
-     */
     DWORD dwVersion = GetVersion();
 
@@ -549 +468 @@
 DECL_KERNEL32(LPWCH) Fake_GetEnvironmentStringsW(void)
 {
-    INIT_FAKES(GetEnvironmentStringsW, ());
-
     /*
-     * Fallback:
-     *
      * 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.
@@ -583 +498 @@
 DECL_KERNEL32(BOOL) Fake_FreeEnvironmentStringsW(LPWCH pwszzEnv)
 {
-    INIT_FAKES(FreeEnvironmentStringsW, (pwszzEnv));
-
-    /* Fallback: */
     if (pwszzEnv)
         HeapFree(GetProcessHeap(), 0, pwszzEnv);
@@ -594 +506 @@
 DECL_KERNEL32(int) Fake_GetLocaleInfoA(LCID idLocale, LCTYPE enmType, LPSTR pData, int cchData)
 {
-    INIT_FAKES(GetLocaleInfoA, (idLocale, enmType, pData, cchData));
-
-    /* Fallback: */
-    MY_ASSERT(false, "GetLocaleInfoA: idLocale=%#x enmType=%#x cchData=%#x", idLocale, enmType, cchData);
+    NOREF(idLocale); NOREF(enmType); NOREF(pData); NOREF(cchData);
+    //MY_ASSERT(false, "GetLocaleInfoA: idLocale=%#x enmType=%#x cchData=%#x", idLocale, enmType, cchData);
+    MY_ASSERT(false, "GetLocaleInfoA");
     SetLastError(ERROR_NOT_SUPPORTED);
     return 0;
@@ -605 +516 @@
 DECL_KERNEL32(BOOL) Fake_EnumSystemLocalesA(LOCALE_ENUMPROCA pfnCallback, DWORD fFlags)
 {
-    INIT_FAKES(EnumSystemLocalesA, (pfnCallback, fFlags));
-
-    /* Fallback: */
-    MY_ASSERT(false, "EnumSystemLocalesA: pfnCallback=%p fFlags=%#x", pfnCallback, fFlags);
+    NOREF(pfnCallback); NOREF(fFlags);
+    //MY_ASSERT(false, "EnumSystemLocalesA: pfnCallback=%p fFlags=%#x", pfnCallback, fFlags);
+    MY_ASSERT(false, "EnumSystemLocalesA");
     SetLastError(ERROR_NOT_SUPPORTED);
     return FALSE;
@@ -616 +526 @@
 DECL_KERNEL32(BOOL) Fake_IsValidLocale(LCID idLocale, DWORD fFlags)
 {
-    INIT_FAKES(IsValidLocale, (idLocale, fFlags));
-
-    /* Fallback: */
-    MY_ASSERT(false, "IsValidLocale: idLocale fFlags=%#x", idLocale, fFlags);
+    NOREF(idLocale); NOREF(fFlags);
+    //MY_ASSERT(false, "IsValidLocale: idLocale fFlags=%#x", idLocale, fFlags);
+    MY_ASSERT(false, "IsValidLocale");
     SetLastError(ERROR_NOT_SUPPORTED);
     return FALSE;
@@ -627 +536 @@
 DECL_KERNEL32(DWORD_PTR) Fake_SetThreadAffinityMask(HANDLE hThread, DWORD_PTR fAffinityMask)
 {
-    INIT_FAKES(SetThreadAffinityMask, (hThread, fAffinityMask));
-
-    /* Fallback: */
     SYSTEM_INFO SysInfo;
     GetSystemInfo(&SysInfo);
-    MY_ASSERT(false, "SetThreadAffinityMask: hThread=%p fAffinityMask=%p SysInfo.dwActiveProcessorMask=%p",
-              hThread, fAffinityMask, SysInfo.dwActiveProcessorMask);
+    //MY_ASSERT(false, "SetThreadAffinityMask: hThread=%p fAffinityMask=%p SysInfo.dwActiveProcessorMask=%p",
+    //          hThread, fAffinityMask, SysInfo.dwActiveProcessorMask);
+    MY_ASSERT(false, "SetThreadAffinityMask");
     if (   SysInfo.dwActiveProcessorMask == fAffinityMask
         || fAffinityMask                 == ~(DWORD_PTR)0)
@@ -639 +546 @@
 
     SetLastError(ERROR_NOT_SUPPORTED);
+    RT_NOREF(hThread);
     return 0;
 }
@@ -645 +553 @@
 DECL_KERNEL32(BOOL) Fake_GetProcessAffinityMask(HANDLE hProcess, PDWORD_PTR pfProcessAffinityMask, PDWORD_PTR pfSystemAffinityMask)
 {
-    INIT_FAKES(GetProcessAffinityMask, (hProcess, pfProcessAffinityMask, pfSystemAffinityMask));
-
-    /* Fallback: */
     SYSTEM_INFO SysInfo;
     GetSystemInfo(&SysInfo);
-    MY_ASSERT(false, "GetProcessAffinityMask: SysInfo.dwActiveProcessorMask=%p", SysInfo.dwActiveProcessorMask);
+    //MY_ASSERT(false, "GetProcessAffinityMask: SysInfo.dwActiveProcessorMask=%p", SysInfo.dwActiveProcessorMask);
+    MY_ASSERT(false, "GetProcessAffinityMask");
     if (pfProcessAffinityMask)
         *pfProcessAffinityMask = SysInfo.dwActiveProcessorMask;
     if (pfSystemAffinityMask)
         *pfSystemAffinityMask  = SysInfo.dwActiveProcessorMask;
+    RT_NOREF(hProcess);
     return TRUE;
 }
@@ -661 +568 @@
 DECL_KERNEL32(BOOL) Fake_GetHandleInformation(HANDLE hObject, DWORD *pfFlags)
 {
-    INIT_FAKES(GetHandleInformation, (hObject, pfFlags));
-
-    /* Fallback: */
     OBJECT_HANDLE_FLAG_INFORMATION  Info  = { 0, 0 };
     DWORD                           cbRet = sizeof(Info);
@@ -674 +578 @@
     }
     *pfFlags = 0;
-    MY_ASSERT(rcNt == STATUS_INVALID_HANDLE, "rcNt=%#x", rcNt);
+    //MY_ASSERT(rcNt == STATUS_INVALID_HANDLE, "rcNt=%#x", rcNt);
+    MY_ASSERT(rcNt == STATUS_INVALID_HANDLE, "GetHandleInformation");
     SetLastError(rcNt == STATUS_INVALID_HANDLE ? ERROR_INVALID_HANDLE : ERROR_INVALID_FUNCTION); /* see also process-win.cpp */
     return FALSE;
@@ -682 +587 @@
 DECL_KERNEL32(BOOL) Fake_SetHandleInformation(HANDLE hObject, DWORD fMask, DWORD fFlags)
 {
-    INIT_FAKES(SetHandleInformation, (hObject, fMask, fFlags));
-
-    /* Fallback: */
+    NOREF(hObject); NOREF(fMask); NOREF(fFlags);
     SetLastError(ERROR_INVALID_FUNCTION);
     return FALSE;
+}
+
+
+
+/**
+ * Resolves all the APIs ones and for all, updating the fake IAT entries.
+ */
+DECLASM(void) FakeResolve_kernel32(void)
+{
+    CURRENT_VERSION_VARIABLE();
+
+    HMODULE hmod = GetModuleHandleW(L"kernel32");
+    MY_ASSERT(hmod != NULL, "kernel32");
+
+#undef MAKE_IMPORT_ENTRY
+#define MAKE_IMPORT_ENTRY(a_uMajorVer, a_uMinorVer, a_Name, a_cb) RESOLVE_IMPORT(a_uMajorVer, a_uMinorVer, a_Name, a_cb)
+#include "vcc100-kernel32-fakes.h"
+
+    g_fInitialized = true;
 }