Merge branch 'pr/1868' into develop

* pr/1868:
  Allow running as admin in Wine

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();

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);

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);