Bug 339732 - NSIS installer is unable to close running instance of firefox (for this to be work on the trunk bug 344309 will need to be fixed as well). r=sspitzer

browser/installer/windows/nsis/installer.nsi

@@ -180,7 +180,8 @@ Page custom preShortcuts ChangeShortcuts
 ; Finish Page
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !define MUI_FINISHPAGE_TITLE_3LINES
-!define MUI_FINISHPAGE_RUN $INSTDIR\${FileMainEXE}
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_FUNCTION LaunchApp
 !define MUI_FINISHPAGE_RUN_TEXT $(LAUNCH_TEXT)
 !define MUI_PAGE_CUSTOMFUNCTION_PRE disableCancel
 !insertmacro MUI_PAGE_FINISH
@@ -1191,6 +1192,11 @@ Function preComponents
   ${EndUnless}
 FunctionEnd
 
+Function LaunchApp
+  ${CloseApp} $(WARN_APP_RUNNING_INSTALL)
+  Exec "$INSTDIR\${FileMainEXE}"
+FunctionEnd
+
 Function .onInit
   StrCpy $LANGUAGE 0
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "options.ini"

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

@@ -726,7 +726,7 @@ Exch $R9 ; exchange the new $R9 value with the top of the stack
       IntCmp $R8 0 end
       MessageBox MB_OKCANCEL|MB_ICONQUESTION "$R9" IDCANCEL exit 0
       ; Only post this one time.
-      System::Call 'user32::PostMessage(i r1, i ${WM_QUIT}, i 0, i 0)'
+      System::Call 'user32::PostMessage(i r18, i ${WM_QUIT}, i 0, i 0)'
       # The amount of time to wait for the app to shutdown before prompting again
       Sleep 4000
       Goto loop