diff options
| author | Pale Moon <git-repo@palemoon.org> | 2015-07-28 12:16:12 +0200 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2015-07-28 12:16:12 +0200 |
| commit | 19af8f9eb1150da084ee7b721fbf46982dc29d88 (patch) | |
| tree | e7d84cd206a2fe5ebafe3d5d49bbb054f8d90743 | |
| parent | 96bea60b5bf73d8523f60ca67142b8111e696317 (diff) | |
| download | palemoon-gre-19af8f9eb1150da084ee7b721fbf46982dc29d88.tar.gz | |
Update application startup with proper error messages.
| -rw-r--r-- | browser/app/nsBrowserApp.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index fd5220d2d..f1f78d07c 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -90,9 +90,10 @@ static void Output(const char *fmt, ... ) #if MOZ_WINCONSOLE fwprintf_s(stderr, wide_msg); #else - MessageBoxW(NULL, wide_msg, L"Firefox", MB_OK - | MB_ICONERROR - | MB_SETFOREGROUND); + MessageBoxW(NULL, + wide_msg, + L"Pale Moon", + MB_OK | MB_ICONERROR | MB_SETFOREGROUND); #endif #endif @@ -190,7 +191,16 @@ static int do_main(int argc, char* argv[], nsIFile *xreDirectory) nsresult rv; uint32_t mainFlags = 0; - // Allow firefox.exe to launch XULRunner apps via -app <application.ini> +#ifdef XP_WIN + HKEY hKey; + LONG lRes = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\WPA\\PosReady", 0, KEY_READ, &hKey); + if (lRes == ERROR_SUCCESS) { + Output("Unsupported operating system."); + return 255; + } +#endif + + // Allow palemoon.exe to launch XULRunner apps via -app <application.ini> // Note that -app must be the *first* argument. const char *appDataFile = getenv("XUL_APP_FILE"); if (appDataFile && *appDataFile) { |