Fix setup error checking

Author: dmex

tools/CustomSetupTool/CustomSetupTool/appsup.c

@@ -505,7 +505,6 @@ static BOOLEAN NTAPI PhpPreviousInstancesCallback(
 BOOLEAN ShutdownProcessHacker(VOID)
 {
     PhEnumDirectoryObjects(PhGetNamespaceHandle(), PhpPreviousInstancesCallback, NULL);
-
     return TRUE;
 }
 

tools/CustomSetupTool/CustomSetupTool/setup.c

@@ -178,41 +178,51 @@ BOOLEAN SetupCreateUninstallFile(
 
     // Check if the user has started the setup from the installation folder.
     if (PhStartsWithStringRef2(&currentFilePath, PhGetString(Context->SetupInstallPath), TRUE))
-    {
-        // Do nothing, latest version already in the installation folder. 
         return TRUE;
-    }
 
     backupFilePath = PhConcatStrings2(PhGetString(Context->SetupInstallPath), L"\\processhacker-setup.bak");
     uninstallFilePath = PhConcatStrings2(PhGetString(Context->SetupInstallPath), L"\\processhacker-setup.exe");
 
     if (RtlDoesFileExists_U(backupFilePath->Buffer))
     {
-        // TODO: Move to temp directory
-    }
+        GUID randomGuid;
+        PPH_STRING tempPath = NULL;
+        PPH_STRING guidString = NULL;
 
-    if (RtlDoesFileExists_U(uninstallFilePath->Buffer))
-    {
-        if (!DeleteFile(backupFilePath->Buffer))
+        tempPath = PhCreateStringEx(NULL, GetTempPath(0, NULL) * sizeof(WCHAR));
+        GetTempPath((ULONG)tempPath->Length / sizeof(WCHAR), tempPath->Buffer);
+
+        PhGenerateGuid(&randomGuid);
+
+        if (guidString = PhFormatGuid(&randomGuid))
+        {
+            PhMoveReference(&guidString, PhSubstring(guidString, 1, guidString->Length / sizeof(WCHAR) - 2));
+        }
+
+        PhMoveReference(&guidString, PhConcatStrings(
+            3,
+            PhGetString(tempPath),
+            L"\\",
+            PhGetString(guidString)
+            ));
+
+        if (!MoveFile(backupFilePath->Buffer, guidString->Buffer))
         {
             Context->ErrorCode = GetLastError();
-            PhDereferenceObject(uninstallFilePath);
-            return FALSE;
         }
+    }
 
+    if (RtlDoesFileExists_U(uninstallFilePath->Buffer))
+    {
         if (!MoveFile(uninstallFilePath->Buffer, backupFilePath->Buffer))
         {
             Context->ErrorCode = GetLastError();
-            PhDereferenceObject(uninstallFilePath);
-            return FALSE;
         }
     }
 
-    if (!CopyFile(currentFilePath.Buffer, uninstallFilePath->Buffer, FALSE))
+    if (!CopyFile(currentFilePath.Buffer, uninstallFilePath->Buffer, TRUE))
     {
         Context->ErrorCode = GetLastError();
-        PhDereferenceObject(uninstallFilePath);
-        return FALSE;
     }
 
     PhDereferenceObject(uninstallFilePath);
@@ -336,27 +346,24 @@ BOOLEAN SetupUninstallKph(
     _In_ PPH_SETUP_CONTEXT Context
     )
 {
-    BOOLEAN deleted = FALSE;
-    SC_HANDLE serviceHandle;
-    SERVICE_STATUS serviceStatus;
-
-    if (serviceHandle = PhOpenService(
-        L"KProcessHacker3", 
-        SERVICE_STOP | DELETE
-        ))
+    while (TRUE)
     {
-        ControlService(serviceHandle, SERVICE_CONTROL_STOP, &serviceStatus);
+        SC_HANDLE serviceHandle;
+        SERVICE_STATUS serviceStatus;
 
-        deleted = DeleteService(serviceHandle);
+        if (!(serviceHandle = PhOpenService(
+            L"KProcessHacker3",
+            SERVICE_STOP | DELETE
+            )))
+            break;
+
+        ControlService(serviceHandle, SERVICE_CONTROL_STOP, &serviceStatus);
+        DeleteService(serviceHandle);
 
         CloseServiceHandle(serviceHandle);
     }
-    else
-    {
-        deleted = TRUE;
-    }
 
-    return deleted;
+    return TRUE;
 }
 
 VOID SetupSetWindowsOptions(

tools/CustomSetupTool/CustomSetupTool/update.c

@@ -141,12 +141,7 @@ VOID SetupShowUpdatingErrorDialog(
     config.pfCallback = SetupErrorTaskDialogCallbackProc;
     config.lpCallbackData = (LONG_PTR)Context;
     config.pszWindowTitle = PhApplicationName;
-    config.pszMainInstruction = PhaFormatString(
-        L"Error updating to the latest version...",
-        PHAPP_VERSION_MAJOR,
-        PHAPP_VERSION_MINOR,
-        PHAPP_VERSION_REVISION
-        )->Buffer;
+    config.pszMainInstruction = L"Error updating to the latest version.";
 
     if (Context->ErrorCode)
     {