More progress on the launcher

Author: ldufr

AutoitLauncher/GWToolbox.au3

@@ -48,7 +48,6 @@ class InjectWindow
 
 bool IsRunningAsAdmin();
 bool CreateProcessAsAdmin(const wchar_t *path, const wchar_t *args, const wchar_t *workdir);
-bool RestartAsAdmin(const wchar_t *args = L"");
+bool RestartAsAdmin(const wchar_t *args);
 bool EnableDebugPrivilege();
-
 bool InjectRemoteThread(Process& process, LPCWSTR ImagePath, LPDWORD lpExitCode);

AutoitLauncher/OldLauncher.au3

@@ -6,6 +6,7 @@
 #endif
 #include <Windows.h>
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -79,6 +80,30 @@ static bool RegWriteDWORD(HKEY hKey, LPCWSTR KeyName, DWORD Value)
     return true;
 }
 
+static bool RegReadStr(HKEY hKey, LPCWSTR KeyName, LPWSTR Buffer, size_t BufferLength)
+{
+    assert(BufferLength > 0);
+
+    DWORD cbData = static_cast<DWORD>(BufferLength - 1) * sizeof(WCHAR);
+    LSTATUS status = RegGetValueW(
+        hKey,
+        L"",
+        KeyName,
+        RRF_RT_REG_SZ,
+        nullptr,
+        Buffer,
+        &cbData);
+
+    if (status != ERROR_SUCCESS)
+    {
+        fprintf(stderr, "RegGetValueW failed: status:%d\n", status);
+        return false;
+    }
+
+    Buffer[cbData / sizeof(WCHAR)] = 0;
+    return true;
+}
+
 static bool GetFileSize(const wchar_t *path, uint64_t *file_size)
 {
     HANDLE hFile = CreateFileW(
@@ -309,3 +334,21 @@ bool Uninstall(bool quiet)
 
     return true;
 }
+
+bool GetInstallationLocation(wchar_t *path, size_t length)
+{
+    HKEY UninstallKey;
+    if (!OpenUninstallHive(HKEY_CURRENT_USER, &UninstallKey)) {
+        fprintf(stderr, "OpenUninstallHive failed\n");
+        return false;
+    }
+
+    if (!RegReadStr(UninstallKey, L"InstallLocation", path, length)) {
+        fprintf(stderr, "RegReadStr failed\n");
+        RegCloseKey(UninstallKey);
+        return false;
+    }
+
+    RegCloseKey(UninstallKey);
+    return true;
+}

AutoitLauncher/StringSize.au3

@@ -2,3 +2,5 @@
 
 bool Install(bool quiet);
 bool Uninstall(bool quiet);
+
+bool GetInstallationLocation(wchar_t *path, size_t length);

GWToolbox/Inject.h

@@ -42,7 +42,6 @@ void ParseCommandLine(int argc, char *argv[])
         } else if (strcmp(arg, "/reinstall") == 0) {
             options.reinstall = true;
         } else if (strcmp(arg, "/pid") == 0) {
-            fprintf(stderr, "Process id\n");
             if (++i == argc) {
                 fprintf(stderr, "'/pid' must be followed by a process id\n");
                 PrintUsage(true);

GWToolbox/Install.cpp

@@ -118,7 +118,9 @@ bool PathCompose(wchar_t *dest, size_t length, const wchar_t *left, const wchar_
         return false;
     }
 
-    memmove(dest, left, left_size);
+    if (dest != left) {
+        memmove(dest, left, left_size);
+    }
 
     if (PathAppendW(dest, right) != TRUE) {
         fprintf(stderr, "PathAppendW failed\n");