Changeset 3361 in kBuild for trunk/src/kWorker/kWorkerTlsXxxK.c

Timestamp:

Jun 8, 2020 7:27:14 PM (4 years ago)

Author:

bird

Message:

kWorker: Adjustments for VC++ 14.2. Fixed bug in GetFileAttributesExW/A where we'd forget to set the return value on success. Reduced the size of the Tls DLLs, but having to add more as the re-load-same-dll hack doesn't work anymore.

File:

• trunk/src/kWorker/kWorkerTlsXxxK.c (modified) (2 diffs)

trunk/src/kWorker/kWorkerTlsXxxK.c

@@ -58 +58 @@
  * Initialization data.
  */
-static char const g_abDummy[TLS_SIZE] = {0x42};
+//static char const g_abDummy[TLS_SIZE] = {0x42};
+static char g_abDummy[TLS_SIZE] = {0};
 
 /**
@@ -88 +89 @@
     if (dwReason == DLL_PROCESS_ATTACH)
     {
-        HMODULE hModExe = (HMODULE)(ULONG_PTR)KWORKER_BASE;
+        //HMODULE hModExe = (HMODULE)(ULONG_PTR)KWORKER_BASE;
+        HMODULE hModExe = GetModuleHandleW(NULL);
         KWLDRTLSALLOCATIONHOOK *pfnHook = (KWLDRTLSALLOCATIONHOOK *)GetProcAddress(hModExe, "kwLdrTlsAllocationHook");
         if (pfnHook)