Throw up an error dialog and stop if any zippy errors detected. [nsbeta3+ b=34014; r=ssu; a=syd]

xpinstall/wizard/mac/src/MacInstallWizard.c

@@ -383,7 +383,7 @@ void ErrorHandler(short errCode)
     }
     else
     {
-        pstrcpy(pMessage, "\pSystem error: ");
+        pstrcpy(pMessage, "\pInstallation failed due to error: ");
         pstrcat(pMessage, pErrNo);
     }  
         

xpinstall/wizard/mac/src/XPInstallGlue.c

@@ -301,7 +301,9 @@ RunAllXPIs(short xpiVRefNum, long xpiDirID, short vRefNum, long dirID)
 							HUnlock(gControls->cfg->comp[i].shortDesc);
 						}
 						
-						RunXPI(xpiSpec, &xpi_installProc);
+						err = RunXPI(xpiSpec, &xpi_installProc);
+						if (err != NS_OK)
+						    break;
 						
 						// update progess bar
 						if (gControls->tw->allProgressBar)
@@ -334,7 +336,7 @@ RunXPI(FSSpec& aXPI, XPI_InstallProc *xpi_installProc)
 	long		flags = 0x1000; /* XPI_NO_NEW_THREAD = 0x1000 from nsISoftwareUpdate.h */
 	Boolean		indeterminateFlag = true;
 	
-	rv = (*xpi_installProc)( aXPI, "", flags );
+	XPI_ERR_CHECK((*xpi_installProc)( aXPI, "", flags ));
 	
 	/* reset progress bar to barber poll */
 	bMaxDiscovered = false;