diff --git a/browser/components/shell/src/nsWindowsShellService.cpp b/browser/components/shell/src/nsWindowsShellService.cpp index 3a3ba68ab2c1..7fc4a5fb349d 100644 --- a/browser/components/shell/src/nsWindowsShellService.cpp +++ b/browser/components/shell/src/nsWindowsShellService.cpp @@ -344,9 +344,11 @@ nsWindowsShellService::IsDefaultBrowserVista(PRBool* aIsDefaultBrowser) (void**)&pAAR); if (SUCCEEDED(hr)) { + BOOL res; hr = pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE, APP_REG_NAME, - aIsDefaultBrowser); + &res); + *aIsDefaultBrowser = res; pAAR->Release(); return PR_TRUE; diff --git a/extensions/cookie/nsCookiePermission.cpp b/extensions/cookie/nsCookiePermission.cpp index 6170d327d825..8062d7640870 100644 --- a/extensions/cookie/nsCookiePermission.cpp +++ b/extensions/cookie/nsCookiePermission.cpp @@ -367,16 +367,18 @@ nsCookiePermission::CanSetCookie(nsIURI *aURI, } PRBool rememberDecision = PR_FALSE; + PRInt32 dialogRes = nsICookiePromptService::DENY_COOKIE; rv = cookiePromptService->CookieDialog(parent, aCookie, hostPort, countFromHost, foundCookie, - &rememberDecision, aResult); + &rememberDecision, &dialogRes); if (NS_FAILED(rv)) return rv; - - if (*aResult == nsICookiePromptService::ACCEPT_SESSION_COOKIE) + + *aResult = !!dialogRes; + if (dialogRes == nsICookiePromptService::ACCEPT_SESSION_COOKIE) *aIsSession = PR_TRUE; if (rememberDecision) { - switch (*aResult) { + switch (dialogRes) { case nsICookiePromptService::DENY_COOKIE: mPermMgr->Add(aURI, kPermissionType, (PRUint32) nsIPermissionManager::DENY_ACTION, nsIPermissionManager::EXPIRE_NEVER, 0); diff --git a/extensions/cookie/nsCookiePromptService.cpp b/extensions/cookie/nsCookiePromptService.cpp index 7d59790b3cb9..3159ecc6f130 100644 --- a/extensions/cookie/nsCookiePromptService.cpp +++ b/extensions/cookie/nsCookiePromptService.cpp @@ -114,7 +114,7 @@ nsCookiePromptService::CookieDialog(nsIDOMWindow *aParent, if (NS_FAILED(rv)) return rv; // get back output parameters - PRBool tempValue; + PRInt32 tempValue; block->GetInt(nsICookieAcceptDialog::ACCEPT_COOKIE, &tempValue); *aAccept = tempValue; diff --git a/layout/tables/nsTableRowFrame.h b/layout/tables/nsTableRowFrame.h index 68c3300c9f95..3885a57c93c8 100644 --- a/layout/tables/nsTableRowFrame.h +++ b/layout/tables/nsTableRowFrame.h @@ -204,8 +204,8 @@ public: PRBool IsFirstInserted() const; void SetFirstInserted(PRBool aValue); - PRBool GetContentHeight() const; - void SetContentHeight(nscoord aTwipValue); + nscoord GetContentHeight() const; + void SetContentHeight(nscoord aTwipValue); PRBool HasStyleHeight() const; diff --git a/modules/libreg/include/VerReg.h b/modules/libreg/include/VerReg.h index 0090d7277e4d..b6359e9909a2 100644 --- a/modules/libreg/include/VerReg.h +++ b/modules/libreg/include/VerReg.h @@ -94,7 +94,7 @@ VR_INTERFACE(REGERR) VR_UninstallDeleteFileFromList(char *component_path, char * VR_INTERFACE(REGERR) VR_UninstallDeleteSharedFilesKey(char *regPackageName); VR_INTERFACE(REGERR) VR_UninstallDestroy(char *regPackageName); VR_INTERFACE(REGERR) VR_EnumUninstall(REGENUM *state, char* userPackageName, - int32 len1, char*regPackageName, int32 len2, PRBool bSharedList); + int32 len1, char*regPackageName, int32 len2, XP_Bool bSharedList); VR_INTERFACE(REGERR) VR_GetUninstallUserName(char *regPackageName, char *outbuf, uint32 buflen); PR_END_EXTERN_C diff --git a/netwerk/base/src/nsAutodialWin.cpp b/netwerk/base/src/nsAutodialWin.cpp index 3504fdfa6ccc..14767b466bc8 100644 --- a/netwerk/base/src/nsAutodialWin.cpp +++ b/netwerk/base/src/nsAutodialWin.cpp @@ -377,7 +377,7 @@ PRBool nsAutodial::IsRASConnected() DWORD structSize = sizeof(rasConn); if (!LoadRASapi32DLL()) - return NS_ERROR_NULL_POINTER; + return PR_FALSE; DWORD result = (*mpRasEnumConnections)(&rasConn, &structSize, &connections); @@ -671,7 +671,7 @@ PRBool nsAutodial::IsAutodialServiceEnabled(int location) if (!LoadRASapi32DLL()) return PR_FALSE; - PRBool enabled; + BOOL enabled; if ((*mpRasGetAutodialEnable)(location, &enabled) != ERROR_SUCCESS) { LOGE(("Autodial: Error calling RasGetAutodialEnable()")); diff --git a/netwerk/base/src/nsStandardURL.h b/netwerk/base/src/nsStandardURL.h index b144d522c429..790e76a0e085 100644 --- a/netwerk/base/src/nsStandardURL.h +++ b/netwerk/base/src/nsStandardURL.h @@ -338,7 +338,7 @@ nsStandardURL::Prepath() } inline const nsDependentCSubstring -nsStandardURL::Userpass(int includeDelim) +nsStandardURL::Userpass(PRBool includeDelim) { PRUint32 pos=0, len=0; // if there is no username, then there can be no password diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 7442b4acba91..dd1ae0cae454 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -882,7 +882,7 @@ CNavDTD::HandleDefaultStartToken(CToken* aToken, eHTMLTags aChildTag, if (mParserCommand != eViewFragment) { PRBool theChildAgrees = PR_TRUE; PRInt32 theIndex = mBodyContext->GetCount(); - PRBool theParentContains = PR_FALSE; + PRInt32 theParentContains = 0; do { eHTMLTags theParentTag = mBodyContext->TagAt(--theIndex); diff --git a/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp b/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp index 91c98284b87b..f57b2d18d4b2 100644 --- a/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp +++ b/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp @@ -233,10 +233,14 @@ nsParentalControlsServiceWin::RequestURIOverride(nsIURI *aTarget, nsIInterfaceRe if (hWnd == nsnull) hWnd = GetDesktopWindow(); + BOOL ret; nsRefPtr wpcws; - if (SUCCEEDED(mPC->GetWebSettings(NULL, getter_AddRefs(wpcws)))) + if (SUCCEEDED(mPC->GetWebSettings(NULL, getter_AddRefs(wpcws)))) { wpcws->RequestURLOverride(hWnd, NS_ConvertUTF8toUTF16(spec).get(), - 0, NULL, _retval); + 0, NULL, &ret); + *_retval = ret; + } + return NS_OK; } @@ -308,11 +312,14 @@ nsParentalControlsServiceWin::RequestURIOverrides(nsIArray *aTargets, nsIInterfa if (!uriIdx) return NS_ERROR_INVALID_ARG; - + + BOOL ret; nsRefPtr wpcws; - if (SUCCEEDED(mPC->GetWebSettings(NULL, getter_AddRefs(wpcws)))) + if (SUCCEEDED(mPC->GetWebSettings(NULL, getter_AddRefs(wpcws)))) { wpcws->RequestURLOverride(hWnd, NS_ConvertUTF8toUTF16(rootSpec).get(), - uriIdx, (LPCWSTR*)arrUrls.get(), _retval); + uriIdx, (LPCWSTR*)arrUrls.get(), &ret); + *_retval = ret; + } // Free up the allocated strings in our array for (idx = 0; idx < uriIdx; idx++) diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp index ef8fa7862822..51a34b77298a 100644 --- a/toolkit/components/places/nsNavHistory.cpp +++ b/toolkit/components/places/nsNavHistory.cpp @@ -2680,7 +2680,7 @@ nsNavHistory::AddVisit(nsIURI* aURI, PRTime aTime, nsIURI* aReferringURI, rv = stmt->GetInt32(2, &oldTypedState); NS_ENSURE_SUCCESS(rv, rv); - PRBool oldHiddenState = 0; + PRInt32 oldHiddenState = 0; rv = stmt->GetInt32(3, &oldHiddenState); NS_ENSURE_SUCCESS(rv, rv);