Bug 444664 � Unable to install due to misreporting of OS version (requires Microsoft Windows 2000 or newer). r=jmathies, approval1.9.0.2=samuel.sidler

toolkit/mozapps/installer/windows/nsis/common.nsh

@@ -4464,9 +4464,22 @@
 
       !ifdef ___WINVER__NSH___
         ${Unless} ${AtLeastWin2000}
-          MessageBox MB_OK|MB_ICONSTOP "$R9" IDOK
-          ; Nothing initialized so no need to call OnEndCommon
-          Quit
+          ; XXX-rstrong - some systems fail the AtLeastWin2000 test for an
+          ; unknown reason. To work around this also check if the Windows NT
+          ; registry Key exists and if it does if the first char in
+          ; CurrentVersion is equal to 3 (Windows NT 3.5 and 3.5.1) or 4
+          ; (Windows NT 4).
+          StrCpy $R8 ""
+          ClearErrors
+          ReadRegStr $R8 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+          StrCpy $R8 "$R8" 1
+          ${If} ${Errors}
+          ${OrIf} "$R8" == "3"
+          ${OrIf} "$R8" == "4"
+            MessageBox MB_OK|MB_ICONSTOP "$R9" IDOK
+            ; Nothing initialized so no need to call OnEndCommon
+            Quit
+          ${EndIf}
         ${EndUnless}
       !endif
 
@@ -4609,7 +4622,7 @@
 !macro InstallOnInitCommonCall _WARN_UNSUPPORTED_MSG
   !verbose push
   !verbose ${_MOZFUNC_VERBOSE}
-  Push ${_WARN_UNSUPPORTED_MSG}
+  Push "${_WARN_UNSUPPORTED_MSG}"
   Call InstallOnInitCommon
   !verbose pop
 !macroend