Merge pull request #6057 from BOINC/vko_small_security_fix

AenBleidd · web-flow · commit 2962492486ee · 2025-02-03T18:47:23.000+01:00
[installer] small fix
diff --git a/installer/installer_setup/main.cpp b/installer/installer_setup/main.cpp
@@ -223,6 +223,8 @@ void ShowWindow(HINSTANCE hInstance, int nCmdShow) {
 }
 
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int nCmdShow) {
+    SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32);
+
     LPWSTR* szArglist;
     int nArgs;
     szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);
@@ -238,7 +240,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int nCmdShow) {
     }
     LocalFree(szArglist);
 
-    SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32);
     if (args == "") {
         ShowWindow(hInstance, nCmdShow);
     }

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,8 @@ void ShowWindow(HINSTANCE hInstance, int nCmdShow) {`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int nCmdShow) {`
	`226`	`+ SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32);`
	`227`	`+`
`226`	`228`	`LPWSTR* szArglist;`
`227`	`229`	`int nArgs;`
`228`	`230`	`szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);`
`@@ -238,7 +240,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int nCmdShow) {`
`238`	`240`	`}`
`239`	`241`	`LocalFree(szArglist);`
`240`	`242`
`241`		`- SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32);`
`242`	`243`	`if (args == "") {`
`243`	`244`	`ShowWindow(hInstance, nCmdShow);`
`244`	`245`	`}`