more installer/uninstaller refactoring

sumatrapdfreader · Dec 29, 2018 · 435c17a · 435c17a
1 parent 148a44a
commit 435c17a
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 130 deletions.
diff --git a/src/installer/InstUninstCommon.cpp b/src/installer/InstUninstCommon.cpp
@@ -46,12 +46,22 @@ Color COLOR_MSG_OK(gCol5);
 Color COLOR_MSG_INSTALLATION(gCol5);
 Color COLOR_MSG_FAILED(gCol1);
 
+InstUninstGlobals gInstUninstGlobals = {
+    false,   /* bool silent */
+    false,   /* bool showUsageAndQuit */
+    nullptr, /* WCHAR *installDir */
+    nullptr, /* WCHAR *firstError */
+    nullptr, /* HANDLE hThread */
+    false,   /* bool success */
+};
+
+
 WCHAR* GetInstalledExePath() {
-    return path::Join(gGlobalData.installDir, EXENAME);
+    return path::Join(gInstUninstGlobals.installDir, EXENAME);
 }
 
 WCHAR* GetUninstallerPath() {
-    return path::Join(gGlobalData.installDir, L"uninstall.exe");
+    return path::Join(gInstUninstGlobals.installDir, L"uninstall.exe");
 }
 
 WCHAR* GetInstalledBrowserPluginPath() {