mirror of
https://github.com/reactos/reactos.git
synced 2024-09-06 10:52:52 +00:00
merged WineHQ changes
svn path=/trunk/; revision=7544
This commit is contained in:
parent
091c63fe23
commit
6b88f5285f
|
@ -307,6 +307,7 @@ static BOOL DoPaste(
|
|||
#endif
|
||||
return bSuccess;
|
||||
}
|
||||
|
||||
/**************************************************************************
|
||||
* ISVBgCm_fnInvokeCommand()
|
||||
*/
|
||||
|
@ -317,8 +318,8 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
|
|||
ICOM_THIS(BgCmImpl, iface);
|
||||
|
||||
LPSHELLBROWSER lpSB;
|
||||
LPSHELLVIEW lpSV;
|
||||
HWND hWndSV;
|
||||
LPSHELLVIEW lpSV = NULL;
|
||||
HWND hWndSV = 0;
|
||||
|
||||
TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
|
||||
|
||||
|
@ -331,15 +332,13 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
|
|||
}
|
||||
}
|
||||
|
||||
if(lpSV)
|
||||
{
|
||||
if(HIWORD(lpcmi->lpVerb))
|
||||
{
|
||||
TRACE("%s\n",lpcmi->lpVerb);
|
||||
|
||||
if (! strcmp(lpcmi->lpVerb,CMDSTR_NEWFOLDERA))
|
||||
{
|
||||
if(lpSV) DoNewFolder(iface, lpSV);
|
||||
DoNewFolder(iface, lpSV);
|
||||
}
|
||||
else if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWLISTA))
|
||||
{
|
||||
|
@ -371,8 +370,9 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand(
|
|||
}
|
||||
}
|
||||
|
||||
if (lpSV)
|
||||
IShellView_Release(lpSV); /* QueryActiveShellView does AddRef*/
|
||||
}
|
||||
|
||||
return NOERROR;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue