wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1138807 - Treat user cancelling of HTTPHandlerPane as Success. r=jimm

Browse Source
This commit is contained in:
Hector Zhao 2015-03-03 12:55:50 +08:00
parent 9b1bec56da
commit ad746928dd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/components/shell/nsWindowsShellService.cpp
View File

@ -620,9 +620,13 @@ DynSHOpenWithDialog(HWND hwndParent, const OPENASINFO *poainfo)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
nsresult rv = nsresult rv;
SUCCEEDED(SHOpenWithDialogFn(hwndParent, poainfo)) ? NS_OK : HRESULT hr = SHOpenWithDialogFn(hwndParent, poainfo);
NS_ERROR_FAILURE; if (SUCCEEDED(hr) || (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED))) {
rv = NS_OK;
} else {
rv = NS_ERROR_FAILURE;
}
FreeLibrary(shellDLL); FreeLibrary(shellDLL);
return rv; return rv;
} }