Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 966626 - Fix for browser launch error dialog on Win8 caused by CommandExecuteHandler changes in bug 950241: release the IShellItemArray Explorer hands us prior to derefing the ceh. r=bbondy

Browse Source
This commit is contained in:
Jim Mathies 2014-02-01 08:03:11 -06:00
parent c0224eeb4c
commit f90fce9929
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
browser/metro/shell/commandexecutehandler/CommandExecuteHandler.cpp
View File

@ -103,6 +103,7 @@ public:
}
bool RequestMet() { return mRequestMet; }
void SetRequestMet();
long RefCount() { return mRef; }
void HeartBeat();
@ -386,8 +387,6 @@ public:
private:
~CExecuteCommandVerb()
{
SafeRelease(&mShellItemArray);
SafeRelease(&mUnkSite);
}
void LaunchDesktopBrowser();
@ -665,12 +664,12 @@ CExecuteCommandVerb::HeartBeat()
!IsMetroProcessRunning()) {
mDelayedLaunchType = NONE;
LaunchDesktopBrowser();
mRequestMet = true;
SetRequestMet();
}
if (mDelayedLaunchType == METRO && !TestForUpdateLock()) {
mDelayedLaunchType = NONE;
LaunchMetroBrowser();
mRequestMet = true;
SetRequestMet();
}
}
@ -748,15 +747,13 @@ CExecuteCommandVerb::LaunchMetroBrowser()
return true;
}
class AutoSetRequestMet
void CExecuteCommandVerb::SetRequestMet()
{
public:
explicit AutoSetRequestMet(bool* aFlag) :
mFlag(aFlag) {}
~AutoSetRequestMet() { if (mFlag) *mFlag = true; }
private:
bool* mFlag;
};
SafeRelease(&mShellItemArray);
SafeRelease(&mUnkSite);
mRequestMet = true;
Log(L"Request met, exiting.");
}
IFACEMETHODIMP CExecuteCommandVerb::Execute()
{
@ -764,7 +761,7 @@ IFACEMETHODIMP CExecuteCommandVerb::Execute()
if (!mTarget.GetLength()) {
// We shut down when this flips to true
mRequestMet = true;
SetRequestMet();
return E_FAIL;
}
@ -784,7 +781,7 @@ IFACEMETHODIMP CExecuteCommandVerb::Execute()
if (mRequestType == DESKTOP_RESTART ||
(mRequestType == DEFAULT_LAUNCH && DefaultLaunchIsDesktop())) {
LaunchDesktopBrowser();
mRequestMet = true;
SetRequestMet();
return S_OK;
}
@ -796,7 +793,7 @@ IFACEMETHODIMP CExecuteCommandVerb::Execute()
}
LaunchMetroBrowser();
mRequestMet = true;
SetRequestMet();
return S_OK;
}