Update vc_crt_fix...'es (add stub for InitializeSRWLock needed for VS…

…2019 CRTL, checked in NetBox)
FarGroup · Jan 5, 2025 · fe83d2b · fe83d2b
1 parent 689e75f
commit fe83d2b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/far/vc_crt_fix.asm b/far/vc_crt_fix.asm
@@ -71,5 +71,6 @@ HOOK ReleaseSRWLockExclusive                ,  4, :dword
 HOOK SleepConditionVariableSRW              , 16, :dword, :dword, :dword, :dword
 HOOK WakeAllConditionVariable               ,  4, :dword
 HOOK TryAcquireSRWLockExclusive             ,  4, :dword
+HOOK InitializeSRWLock                      ,  4, :dword
 
 end
diff --git a/far/vc_crt_fix_impl.cpp b/far/vc_crt_fix_impl.cpp
@@ -412,6 +412,20 @@ extern "C" BOOLEAN WINAPI WRAPPER(TryAcquireSRWLockExclusive)(PSRWLOCK SRWLock)
 	CREATE_AND_RETURN(modules::kernel32, SRWLock);
 }
 
+// VC2019
+extern "C" void WINAPI WRAPPER(InitializeSRWLock)(PSRWLOCK SRWLock)
+{
+	struct implementation
+	{
+		static void WINAPI impl(PSRWLOCK SRWLock)
+		{
+			*(void**)SRWLock = 0;
+		}
+	};
+
+	CREATE_AND_RETURN(modules::kernel32, SRWLock);
+}
+
 extern "C" DWORD WINAPI WRAPPER(FlsAlloc)(PFLS_CALLBACK_FUNCTION Callback)
 {
 	struct implementation

diff --git a/far/vc_crt_fix_ulink.cpp b/far/vc_crt_fix_ulink.cpp
@@ -146,6 +146,8 @@ static FARPROC WINAPI delayFailureHook(/*dliNotification*/unsigned dliNotify,
         return (FARPROC)sim__unimpl_1arg;
       if(!lstrcmpA(pdli->dlp.szProcName, "TryAcquireSRWLockExclusive"))
         return (FARPROC)sim__unimpl_1arg;
+      if(!lstrcmpA(pdli->dlp.szProcName, "InitializeSRWLock"))
+        return (FARPROC)sim__unimpl_1arg;
     }
     return nullptr;
 }
@@ -166,6 +168,7 @@ static FARPROC WINAPI delayFailureHook(/*dliNotification*/unsigned dliNotify,
 #pragma comment(linker, "/delayload:kernel32.ReleaseSRWLockExclusive")
 #pragma comment(linker, "/delayload:kernel32.AcquireSRWLockExclusive")
 #pragma comment(linker, "/delayload:kernel32.TryAcquireSRWLockExclusive")
+#pragma comment(linker, "/delayload:kernel32.InitializeSRWLock")
 
 //----------------------------------------------------------------------------
 #if _MSC_FULL_VER >= 190024215 // VS2015sp3