diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-24 15:02:42 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-24 15:02:42 +0000 |
| commit | 727a0432f5909ba54e6d15010fde94dff825fe5e (patch) | |
| tree | 2bca1de02335533dc2678c143e7b8ff088c25d47 /plugins/ShellExt/src | |
| parent | 0ccdb951979ead80e9264233776b9147ff701fc7 (diff) | |
fixes for MENUITEMINFO declarations
git-svn-id: http://svn.miranda-ng.org/main/trunk@14363 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/ShellExt/src')
| -rw-r--r-- | plugins/ShellExt/src/shlext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/ShellExt/src/shlext.cpp b/plugins/ShellExt/src/shlext.cpp index 780d7f86e3..a8d87632f1 100644 --- a/plugins/ShellExt/src/shlext.cpp +++ b/plugins/ShellExt/src/shlext.cpp @@ -319,8 +319,8 @@ grouploop: static void BuildMenuGroupTree(TGroupNode *p, TEnumData *lParam, HMENU hLastMenu)
{
- MENUITEMINFOA mii;
- mii.cbSize = sizeof(MENUITEMINFO);
+ MENUITEMINFOA mii = { 0 };
+ mii.cbSize = sizeof(mii);
mii.fMask = MIIM_ID | MIIM_DATA | MIIM_TYPE | MIIM_SUBMENU;
// go thru each group and create a menu for it adding submenus too.
@@ -398,7 +398,7 @@ static void BuildMenus(TEnumData *lParam) }
MENUITEMINFOA mii = { 0 };
- mii.cbSize = sizeof(MENUITEMINFO);
+ mii.cbSize = sizeof(mii);
mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_DATA;
// add all the contacts that have no group (which maybe all of them)
pg = lParam->ipch->ContactsBegin;
@@ -467,7 +467,7 @@ static void BuildMenus(TEnumData *lParam) // allocate display info/memory for "Miranda" string
- mii.cbSize = sizeof(MENUITEMINFO);
+ mii.cbSize = sizeof(mii);
if (bIsVistaPlus)
mii.fMask = MIIM_ID | MIIM_DATA | MIIM_FTYPE | MIIM_SUBMENU | MIIM_STRING | MIIM_BITMAP;
else
@@ -738,8 +738,8 @@ HRESULT ipcGetFiles(THeaderIPC *pipch, IDataObject* pDataObject, MCONTACT hConta HRESULT RequestTransfer(TShellExt *Self, int idxCmd)
{
// get the contact information
- MENUITEMINFOA mii;
- mii.cbSize = sizeof(MENUITEMINFO);
+ MENUITEMINFOA mii = { 0 };
+ mii.cbSize = sizeof(mii);
mii.fMask = MIIM_ID | MIIM_DATA;
if ( !GetMenuItemInfoA(Self->hRootMenu, Self->idCmdFirst + idxCmd, false, &mii))
return E_INVALIDARG;
|