Changeset 84405 in vbox

Timestamp:

May 20, 2020 2:27:07 PM (5 years ago)

Author:

vboxsync

Message:

IPRT: Quick adjustments for making the vcc-fakes-kernel32* stuff build with VC++ 19.0. bugref:8489

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• vcc-fakes-kernel32-A.asm (modified) (1 diff)
• vcc-fakes-kernel32.cpp (modified) (12 diffs)

trunk/src/VBox/Runtime/r3/win/vcc-fakes-kernel32-A.asm

@@ -35 +35 @@
 %ifdef VCC_FAKES_TARGET_VCC100
  %include "vcc-fakes-kernel32-100.h"
+%elifdef VCC_FAKES_TARGET_VCC140
+ %include "vcc-fakes-kernel32-141.h"
 %elifdef VCC_FAKES_TARGET_VCC141
  %include "vcc-fakes-kernel32-141.h"

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

@@ -69 +69 @@
 #ifdef VCC_FAKES_TARGET_VCC100
 # include "vcc-fakes-kernel32-100.h"
+#elif defined(VCC_FAKES_TARGET_VCC140)
+# include "vcc-fakes-kernel32-141.h"
 #elif defined(VCC_FAKES_TARGET_VCC141)
 # include "vcc-fakes-kernel32-141.h"
@@ -381 +383 @@
 
 
-#if VCC_FAKES_TARGET >= 141
+#if VCC_FAKES_TARGET >= 140
 /** @since 5.0 (windows 2000) */
 DECL_KERNEL32(BOOL) Fake_GetModuleHandleExW(DWORD dwFlags, LPCWSTR pwszModuleName, HMODULE *phModule)
@@ -425 +427 @@
 
 
-#if VCC_FAKES_TARGET >= 141
+#if VCC_FAKES_TARGET >= 140
 /** @since 5.0 (windows 2000) */
 DECL_KERNEL32(BOOL) Fake_SetFilePointerEx(HANDLE hFile, LARGE_INTEGER offDistanceToMove,
@@ -476 +478 @@
     return FakeSetLastErrorFromNtStatus(rcNt);
 }
-#endif /* VCC_FAKES_TARGET >= 141 */
-
-
-#if VCC_FAKES_TARGET >= 141
+#endif /* VCC_FAKES_TARGET >= 140 */
+
+
+#if VCC_FAKES_TARGET >= 140
 /** @since 5.0 (windows 2000) */
 DECL_KERNEL32(BOOL) Fake_GetFileSizeEx(HANDLE hFile, PLARGE_INTEGER pcbFile)
@@ -493 +495 @@
     return FakeSetLastErrorFromNtStatus(rcNt);
 }
-#endif /* VCC_FAKES_TARGET >= 141 */
+#endif /* VCC_FAKES_TARGET >= 140 */
 
 
@@ -502 +504 @@
  */
 
-#if VCC_FAKES_TARGET >= 141
+#if VCC_FAKES_TARGET >= 140
 /** @since 4.0 */
 DECL_KERNEL32(HANDLE) Fake_FindFirstFileExW(LPCWSTR pwszFileName, FINDEX_INFO_LEVELS enmInfoLevel, LPVOID pvFindFileData,
@@ -518 +520 @@
     return FindFirstFileW(pwszFileName, (WIN32_FIND_DATAW *)pvFindFileData);
 }
-#endif /* VCC_FAKES_TARGET >= 141 */
+#endif /* VCC_FAKES_TARGET >= 140 */
 
 
@@ -554 +556 @@
  */
 
-#if VCC_FAKES_TARGET >= 141
+#if VCC_FAKES_TARGET >= 140
 /** @since 3.51 */
 DECL_KERNEL32(VOID) Fake_FreeLibraryAndExitThread(HMODULE hLibModule, DWORD dwExitCode)
@@ -562 +564 @@
     ExitThread(dwExitCode);
 }
-#endif /* VCC_FAKES_TARGET >= 141 */
+#endif /* VCC_FAKES_TARGET >= 140 */
 
 
@@ -734 +736 @@
 
 
-#if VCC_FAKES_TARGET >= 141
+#if VCC_FAKES_TARGET >= 140
 /** @since 3.51 */
 DECL_KERNEL32(BOOL) Fake_EnumSystemLocalesW(LOCALE_ENUMPROCW pfnLocaleEnum, DWORD dwFlags)
@@ -742 +744 @@
     return FALSE;
 }
-#endif /* VCC_FAKES_TARGET >= 141 */
+#endif /* VCC_FAKES_TARGET >= 140 */
 
 
@@ -839 +841 @@
 #ifdef VCC_FAKES_TARGET_VCC100
 # include "vcc-fakes-kernel32-100.h"
+#elif defined(VCC_FAKES_TARGET_VCC140)
+# include "vcc-fakes-kernel32-141.h"
 #elif defined(VCC_FAKES_TARGET_VCC141)
 # include "vcc-fakes-kernel32-141.h"