Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-fixing bug 7022 (Install.buildID). "2001040506" needs to be a double,

Browse Source 
doesn't fit in a javascript int.


git-svn-id: svn://10.0.0.236/trunk@92556 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dveditz%netscape.com
2001-04-17 13:13:24 +00:00
parent 152683d8fc
commit f4e8a362b7
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/xpinstall/src/nsJSInstall.cpp
View File

@@ -54,15 +54,14 @@ extern JSClass FileOpClass;
enum Install_slots
{
INSTALL_PLATFORM = -1,
INSTALL_BUILDID = -2,
INSTALL_JARFILE = -3,
INSTALL_ARCHIVE = -4,
INSTALL_ARGUMENTS = -5,
INSTALL_URL = -6,
INSTALL_FLAGS = -7,
INSTALL_STATUSSENT = -8,
INSTALL_INSTALL = -9,
INSTALL_INSTALLED_FILES = -10
INSTALL_JARFILE = -2,
INSTALL_ARCHIVE = -3,
INSTALL_ARGUMENTS = -4,
INSTALL_URL = -5,
INSTALL_FLAGS = -6,
INSTALL_STATUSSENT = -7,
INSTALL_INSTALL = -8,
INSTALL_INSTALLED_FILES = -9
};
// prototype for fileOp object
@@ -98,10 +97,6 @@ GetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
break;
}
case INSTALL_BUILDID:
*vp = INT_TO_JSVAL(NS_BUILD_ID);
break;
case INSTALL_ARCHIVE:
case INSTALL_JARFILE:
{
@@ -1706,7 +1701,6 @@ JSClass InstallClass = {
static JSPropertySpec InstallProperties[] =
{
{"platform", INSTALL_PLATFORM, JSPROP_ENUMERATE | JSPROP_READONLY},
{"buildID", INSTALL_BUILDID, JSPROP_ENUMERATE | JSPROP_READONLY},
{"jarfile", INSTALL_JARFILE, JSPROP_ENUMERATE | JSPROP_READONLY},
{"archive", INSTALL_ARCHIVE, JSPROP_ENUMERATE | JSPROP_READONLY},
{"arguments", INSTALL_ARGUMENTS, JSPROP_ENUMERATE | JSPROP_READONLY},
@@ -1781,6 +1775,8 @@ static JSConstDoubleSpec install_constants[] =
{ CHROME_DELAYED, "DELAYED_CHROME" },
{ CHROME_SELECT, "SELECT_CHROME" },
{ NS_BUILD_ID, "buildID" },
{0}
};

2
mozilla/xpinstall/src/nsSoftwareUpdate.cpp
View File

@@ -433,7 +433,7 @@ nsSoftwareUpdate::StartupTasks( PRBool *needAutoreg )
// Also check for build number changes
nsresult rv;
PRInt32 buildID = 0;
PRInt32 buildID = -1;
nsRegistryKey idKey = 0;
nsCOMPtr<nsIRegistry> reg = do_GetService(knsRegistryCID,&rv);
if (NS_SUCCEEDED(rv))

1
mozilla/xpinstall/src/nsXPInstallManager.cpp
View File

@@ -63,7 +63,6 @@
#include "nsIScriptGlobalObject.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID);
static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);