From 857ed7d1e4db8a0fa994591a00d90f6d07c56664 Mon Sep 17 00:00:00 2001 From: "depstein%netscape.com" Date: Thu, 14 Nov 2002 02:39:46 +0000 Subject: [PATCH] Added 2nd param inputs for nsIDOMWindow in nsICmdParams. GRE 1.3a tag in winEmbedFileLocProvider.cpp. Not part of the build. git-svn-id: svn://10.0.0.236/trunk@133809 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/qa/testembed/nsICmdParams.cpp | 6 +++--- mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/embedding/qa/testembed/nsICmdParams.cpp b/mozilla/embedding/qa/testembed/nsICmdParams.cpp index ba473628178..d9b16002b37 100644 --- a/mozilla/embedding/qa/testembed/nsICmdParams.cpp +++ b/mozilla/embedding/qa/testembed/nsICmdParams.cpp @@ -60,7 +60,7 @@ void CnsICmdParams::GetValueTypeTest(const char *aCommand, const char *stateType return; } else { - rv = cmdMgrObj->GetCommandState(aCommand,cmdParamObj); + rv = cmdMgrObj->GetCommandState(aCommand, nsnull, cmdParamObj); RvTestResult(rv, "cmdMgrObj->GetCommandState test", displayMode); } rv = cmdParamObj->GetValueType(stateType, &retval); @@ -85,7 +85,7 @@ void CnsICmdParams::GetBooleanValueTest(const char *aCommand, const char *stateT return; } else - cmdMgrObj->GetCommandState(aCommand, cmdParamObj); + cmdMgrObj->GetCommandState(aCommand, nsnull, cmdParamObj); rv = cmdParamObj->GetBooleanValue(stateType, &retval); RvTestResult(rv, "GetBooleanValue test", displayMode); @@ -159,7 +159,7 @@ void CnsICmdParams::GetCStringValueTest(const char *aCommand, const char *stateT return; } else - cmdMgrObj->GetCommandState(aCommand, cmdParamObj); + cmdMgrObj->GetCommandState(aCommand, nsnull, cmdParamObj); char *tCstringValue = nsnull; rv = cmdParamObj->GetCStringValue(stateType, &tCstringValue); RvTestResult(rv, "GetCStringValue test", displayMode); diff --git a/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp b/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp index a379e314f6f..e6bc950f9df 100644 --- a/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp +++ b/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp @@ -190,14 +190,14 @@ static char * GetGreLocationFromRegistry() // 1. Note the usage of the "Software\\Mozilla\\GRE" subkey - this allows // us to have multiple versions of GREs on the same machine by having // subkeys such as 1.0, 1.1, 2.0 etc. under it. - // 2. In this sample below we're looking for the location of GRE version 1.2 - // i.e. we're compatible with GRE 1.2 and we're trying to find it's install + // 2. In this sample below we're looking for the location of GRE version 1.3 + // i.e. we're compatible with GRE 1.3 and we're trying to find it's install // location. // // Please see http://www.mozilla.org/projects/embedding/MRE.html for // more info. // - strcpy(szKey, "Software\\Mozilla\\GRE\\1.2b"); + strcpy(szKey, "Software\\Mozilla\\GRE\\1.3a"); if (::RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &hRegKey) == ERROR_SUCCESS) {