Merge branch 'develop' into develop-output-signtools-exception-details

Squirrel · Sep 14, 2024 · 589f835 · 589f835
2 parents e4f5945 + 51f5e2c
commit 589f835
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/src/Setup/UpdateRunner.cpp b/src/Setup/UpdateRunner.cpp
@@ -34,6 +34,19 @@ void CUpdateRunner::DisplayErrorMessage(CString& errorMessage, wchar_t* logFile)
 	}
 }
 
+HRESULT CUpdateRunner::AreWeInWine()
+{
+	// NB: Behaving differently in Wine is *usually* discouraged
+	// https://wiki.winehq.org/Developer_FAQ#How_can_I_detect_Wine.3F
+	HMODULE hntdll = GetModuleHandle(L"ntdll.dll");
+	if (!hntdll) {
+		// NB: This can never fail but we'll be pedantic
+		return E_FAIL;
+	}
+
+	return GetProcAddress(hntdll, "wine_get_version") != NULL ? S_OK : S_FALSE;
+}
+
 HRESULT CUpdateRunner::AreWeUACElevated()
 {
 	HANDLE hProcess = GetCurrentProcess();

diff --git a/src/Setup/UpdateRunner.h b/src/Setup/UpdateRunner.h
@@ -4,6 +4,7 @@ class CUpdateRunner
 
 public:
 	static void DisplayErrorMessage(CString& errorMessage, wchar_t* logFile);
+	static HRESULT AreWeInWine();
 	static HRESULT AreWeUACElevated();
 	static HRESULT ShellExecuteFromExplorer(LPWSTR pszFile, LPWSTR pszParameters);
 	static bool DirectoryExists(wchar_t* szPath);

diff --git a/src/Setup/winmain.cpp b/src/Setup/winmain.cpp
@@ -110,7 +110,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 
 	// If we're UAC-elevated, we shouldn't be because it will give us permissions
 	// problems later. Just silently rerun ourselves.
-	if (weAreUACElevated) {
+	// (Skip this check in Wine, which always reports admin privileges)
+	if (weAreUACElevated && CUpdateRunner::AreWeInWine() != S_OK) {
 		wchar_t buf[4096];
 		HMODULE hMod = GetModuleHandle(NULL);
 		GetModuleFileNameW(hMod, buf, 4096);

diff --git a/src/Squirrel/TrayHelper.cs b/src/Squirrel/TrayHelper.cs
@@ -103,7 +103,7 @@ public unsafe void RemoveDeadEntries(List<string> executablesInPackage, string r
                         var path = item.ExePath.ToLowerInvariant();
 
                         // Someone completely unrelated? Keep it!
-                        if (!executablesInPackage.Any(exe => path.Contains(exe))) {
+                        if (!executablesInPackage.Any(exe => path.Contains(exe.ToLowerInvariant()))) {
                             goto keepItem;
                         }
 

diff --git a/src/Squirrel/Utility.cs b/src/Squirrel/Utility.cs
@@ -783,7 +783,7 @@ static unsafe class UnsafeUtility
         public static List<Tuple<string, int>> EnumerateProcesses()
         {
             int bytesReturned = 0;
-            var pids = new int[2048];
+            var pids = new int[16384];
 
             fixed(int* p = pids) {
                 if (!NativeMethods.EnumProcesses((IntPtr)p, sizeof(int) * pids.Length, out bytesReturned)) {