Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix position of dynamic context menus

Browse source 
svn path=/trunk/; revision=30055
This commit is contained in:
Johannes Anderwald 2007-11-01 21:30:44 +00:00
parent f61ad64412
commit df53d0f9d6
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
reactos/dll/win32/shell32/shv_item_cmenu.c
View file

@ -310,7 +310,7 @@ SH_EnlargeContextMenuArray(ItemCmImpl *This, UINT newsize)
return ret; return ret;
} }
VOID UINT
SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj, HMENU hMenu, UINT indexMenu ) SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj, HMENU hMenu, UINT indexMenu )
{ {
UINT i; UINT i;
@ -356,11 +356,15 @@ SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj, HMENU hMenu
{ {
cmenu = This->ecmenu[i]; cmenu = This->ecmenu[i];
hResult = cmenu->lpVtbl->QueryContextMenu(cmenu, hMenu, indexMenu, idCmdFirst, idCmdLast, CMF_NORMAL); hResult = cmenu->lpVtbl->QueryContextMenu(cmenu, hMenu, indexMenu, idCmdFirst, idCmdLast, CMF_NORMAL);
idCmdFirst += (hResult & 0xFFFF); if (SUCCEEDED(hResult))
{
idCmdFirst += (hResult & 0xFFFF);
indexMenu +=(hResult & 0xFFFF);
}
} }
This->iIdSHELast = idCmdFirst; This->iIdSHELast = idCmdFirst;
TRACE("SH_LoadContextMenuHandlers first %x last %x\n", This->iIdSHEFirst, This->iIdSHELast); TRACE("SH_LoadContextMenuHandlers first %x last %x\n", This->iIdSHEFirst, This->iIdSHELast);
return indexMenu;
} }
void void
@ -599,19 +603,16 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu(
MultiByteToWideChar( CP_ACP, 0, sBuffer, -1, (LPWSTR)szExt, 10); MultiByteToWideChar( CP_ACP, 0, sBuffer, -1, (LPWSTR)szExt, 10);
SH_AddStaticEntryForFileClass(This, szExt); SH_AddStaticEntryForFileClass(This, szExt);
indexMenu = SH_AddStaticEntryToMenu(hmenu, indexMenu, This); indexMenu = SH_AddStaticEntryToMenu(hmenu, indexMenu, This);
_InsertMenuItem(hmenu, ++indexMenu, TRUE, 0, MFT_SEPARATOR, NULL, 0);
} }
pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl); pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl);
if (pDataObj) if (pDataObj)
{ {
SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu); indexMenu = SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu);
IDataObject_Release(pDataObj); IDataObject_Release(pDataObj);
} }
if (idCmdFirst != 0)
FIXME("We should use idCmdFirst=%d and idCmdLast=%d for command ids\n", idCmdFirst, idCmdLast);
if(!(CMF_DEFAULTONLY & uFlags) && This->cidl>0) if(!(CMF_DEFAULTONLY & uFlags) && This->cidl>0)
{ {
if(!(uFlags & CMF_EXPLORE)) if(!(uFlags & CMF_EXPLORE))
@ -1193,7 +1194,7 @@ SH_LoadDynamicContextMenuHandler(HKEY hKey, const CLSID * szClass, IContextMenu*
cmobj->lpVtbl->Release(cmobj); cmobj->lpVtbl->Release(cmobj);
return FALSE; return FALSE;
} }
hr = shext->lpVtbl->Initialize(shext, pidlFolder, pDataObj, hKey); hr = shext->lpVtbl->Initialize(shext, NULL, pDataObj, hKey);
if (hr != S_OK) if (hr != S_OK)
{ {
TRACE("Failed to initialize shell extension\n"); TRACE("Failed to initialize shell extension\n");