[SHELL32]

- Simplify checks for success of ShellExecuteEx, field hInst may be an unreliable indicator according to http://msdn.microsoft.com/en-us/library/bb759784%28v=VS.85%29.aspx
- Fixes folder options control panel opening twice
See issue #4910 for more details.

svn path=/trunk/; revision=46907
This commit is contained in:
Gregor Schneider 2010-04-17 20:02:12 +00:00
parent 03eaad9b13
commit 22fbcbfd91
2 changed files with 3 additions and 4 deletions

View file

@ -1298,8 +1298,8 @@ static HRESULT WINAPI ICPanel_IContextMenu2_InvokeCommand(
sei.hwnd = lpcmi->hwnd;
sei.nShow = SW_SHOWNORMAL;
sei.lpVerb = L"open";
ShellExecuteExW(&sei);
if (sei.hInstApp <= (HINSTANCE)32)
if (ShellExecuteExW(&sei) == FALSE)
return E_FAIL;
}
else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME

View file

@ -979,8 +979,7 @@ static HRESULT WINAPI ISF_Fonts_IContextMenu2_InvokeCommand(
pfont = _ILGetFontStruct(This->apidl);
sei.lpFile = pfont->szName + pfont->offsFile;
ShellExecuteExW(&sei);
if (sei.hInstApp <= (HINSTANCE)32)
if (ShellExecuteExW(&sei) == FALSE)
return E_FAIL;
}
else if (lpcmi->lpVerb == MAKEINTRESOURCEA(4))