Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-18 14:56:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes bug #6408 and #15393. r=dbragg. fixes windows installer xpinstall

Browse Source 
error detection.  Windows platform only"
This commit is contained in:
ssu%netscape.com 1999-10-15 20:47:15 +00:00
parent 2dc743e6b1
commit 7548d0ba6d
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xpinstall/wizard/windows/setup/xpi.c
View File

@ -140,6 +140,7 @@ HRESULT SmartUpdateJars()
siC *siCObject = NULL;
HRESULT hrResult;
char szBuf[MAX_BUF];
char szEXpiInstall[MAX_BUF];
char szArchive[MAX_BUF];
char szMsgSmartUpdateStart[MAX_BUF];
@ -194,7 +195,19 @@ HRESULT SmartUpdateJars()
}
}
}
hrResult = pfnXpiInstall(szArchive, "", 0xFFFF);
if(hrResult != WIZ_OK)
{
if(NS_LoadString(hSetupRscInst, IDS_ERROR_XPI_INSTALL, szEXpiInstall, MAX_BUF) == WIZ_OK)
{
wsprintf(szBuf, "%d: %s", hrResult, szEXpiInstall);
PrintError(szBuf, ERROR_CODE_HIDE);
}
/* break out of the while loop */
break;
}
++dwCurrentArchive;
UpdateGaugeArchiveProgressBar((unsigned)(((double)(dwCurrentArchive)/(double)dwTotalArchives)*(double)100));
@ -215,7 +228,7 @@ HRESULT SmartUpdateJars()
DeInitializeXPIStub();
return(0);
return(hrResult);
}
void cbXPIStart(const char *URL, const char *UIName)

26
xpinstall/wizard/windows/setuprsc/setuprsc.h
View File

@ -2,31 +2,6 @@
// Microsoft Developer Studio generated include file.
// Used by setuprsc.rc
//
/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* The contents of this file are subject to the Netscape Public License
* Version 1.0 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Communicator client code,
* released March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape Communications
* Corporation. Portions created by Netscape are
* Copyright (C) 1999 Netscape Communications Corporation. All Rights
* Reserved.
*
* Contributors:
* Sean Su <ssu@netscape.com>
*/
#define IDS_ERROR_DIALOG_CREATE 1
#define IDS_ERROR_FAILED 2
#define IDS_ERROR_FILE_NOT_FOUND 3
@ -49,6 +24,7 @@
#define IDS_STR_FILENAME 20
#define IDS_MSG_SMARTUPDATE_START 21
#define IDS_MSG_CONFIGURING 22
#define IDS_ERROR_XPI_INSTALL 23
#define IDI_ICON1 105
#define IDI_SETUP 105
#define IDB_BITMAP_WELCOME 108

3
xpinstall/wizard/windows/setuprsc/setuprsc.rc
View File

@ -206,7 +206,7 @@ DLG_BROWSE_DIR DIALOGEX 147, 23, 190, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_NOPARENTNOTIFY
CAPTION "Select a directory"
FONT 8, "MS Shell Dlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
EDITTEXT IDC_EDIT_DESTINATION,8,16,177,12,ES_AUTOHSCROLL |
ES_OEMCONVERT | NOT WS_BORDER,WS_EX_CLIENTEDGE
@ -331,6 +331,7 @@ BEGIN
IDS_STR_FILENAME "Filename:"
IDS_MSG_SMARTUPDATE_START "Initializing SmartUpdate, please wait..."
IDS_MSG_CONFIGURING "Configuring %s, please wait..."
IDS_ERROR_XPI_INSTALL "Error ocurred during installation"
END
#endif // English (U.S.) resources