]> git.sesse.net Git - vlc/commitdiff
Win32: do not load DLL from cwd
authorJean-Baptiste Kempf <jb@videolan.org>
Sat, 3 Sep 2011 16:26:59 +0000 (18:26 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Sat, 3 Sep 2011 16:28:44 +0000 (18:28 +0200)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>
bin/winvlc.c

index 076781f888a86c1215b92ace82f7186d8bf5227f..71a791ff2bf17bbccfbc2abd4a97770648e4755f 100644 (file)
@@ -128,12 +128,19 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     if(h_Kernel32)
     {
         BOOL (WINAPI * mySetProcessDEPPolicy)( DWORD dwFlags);
+        BOOL (WINAPI * mySetDllDirectoryA)(const char* lpPathName);
 # define PROCESS_DEP_ENABLE 1
 
         mySetProcessDEPPolicy = (BOOL WINAPI (*)(DWORD))
                             GetProcAddress(h_Kernel32, "SetProcessDEPPolicy");
         if(mySetProcessDEPPolicy)
             mySetProcessDEPPolicy(PROCESS_DEP_ENABLE);
+
+        /* Do NOT load any library from cwd. */
+        mySetDllDirectoryA = (BOOL WINAPI (*)(const char*)) GetProcAddress(h_Kernel32, "SetDllDirectoryA");
+        if(mySetDllDirectoryA)
+            mySetDllDirectoryA("");
+
         FreeLibrary(h_Kernel32);
     }