[dquintana] 62420: [SHLWAPI] * SHInvokeDefaultCommand is supposed to invoke the DEFAULT command, so why was bInvokeDefault given FALSE?! [RSHELL] * A couple of trivial fixes. [NTUSER/USER32] * I mi...

Author: dquintana
Date: Wed Mar  5 09:12:40 2014
New Revision: 62420

URL: http://svn.reactos.org/svn/reactos?rev=62420&view=rev
Log:
[SHLWAPI]
* SHInvokeDefaultCommand is supposed to invoke the DEFAULT command, so why was
bInvokeDefault given FALSE?!

[RSHELL]
* A couple of trivial fixes.

[NTUSER/USER32]
* I missed two bits. See CORE-7966 for more info on the menu issue.

CORE-7586

Modified:
    branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
    branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp
    branches/shell-experiments/dll/win32/shlwapi/ordinal.c
    branches/shell-experiments/win32ss/user/ntuser/window.c
    branches/shell-experiments/win32ss/user/user32/windows/menu.c

Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp	[iso-8859-1] Wed Mar  5
09:12:40 2014
@@ -517,7 +517,7 @@
 
         popup = NULL;
         hr = IUnknown_GetSite(window, IID_PPV_ARG(IMenuPopup, &popup));
-        if (FAILED_UNEXPECTEDLY(hr))
+        if (FAILED(hr))
             return FALSE;
     }
 

Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp	[iso-8859-1] Wed Mar  5
09:12:40 2014
@@ -816,7 +816,7 @@
         {
             AddSeparator(last);
         }
-        else // if (info.fType == MFT_STRING)
+        else if (!(info.fType & MFT_BITMAP))
         {
 
             info.cch++;

Modified: branches/shell-experiments/dll/win32/shlwapi/ordinal.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl…
==============================================================================
--- branches/shell-experiments/dll/win32/shlwapi/ordinal.c	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shlwapi/ordinal.c	[iso-8859-1] Wed Mar  5
09:12:40 2014
@@ -1,4 +1,4 @@
-/*
+/*
  * SHLWAPI ordinal functions
  *
  * Copyright 1997 Marcus Meissner
@@ -2911,7 +2911,7 @@
 HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST
lpApidl)
 {
     TRACE("%p %p %p\n", hWnd, lpFolder, lpApidl);
-    return SHInvokeCommand(hWnd, lpFolder, lpApidl, FALSE);
+    return SHInvokeCommand(hWnd, lpFolder, lpApidl, TRUE);
 }
 
 /*************************************************************************

Modified: branches/shell-experiments/win32ss/user/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…
==============================================================================
--- branches/shell-experiments/win32ss/user/ntuser/window.c	[iso-8859-1] (original)
+++ branches/shell-experiments/win32ss/user/ntuser/window.c	[iso-8859-1] Wed Mar  5
09:12:40 2014
@@ -976,7 +976,7 @@
 
             ItemInfo.cbSize = sizeof(MENUITEMINFOW);
             ItemInfo.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_SUBMENU;
-            ItemInfo.fType = MF_POPUP;
+            ItemInfo.fType = 0;
             ItemInfo.fState = MFS_ENABLED;
             ItemInfo.dwTypeData = NULL;
             ItemInfo.cch = 0;

Modified: branches/shell-experiments/win32ss/user/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…
==============================================================================
--- branches/shell-experiments/win32ss/user/user32/windows/menu.c	[iso-8859-1] (original)
+++ branches/shell-experiments/win32ss/user/user32/windows/menu.c	[iso-8859-1] Wed Mar  5
09:12:40 2014
@@ -1696,7 +1696,7 @@
                 SendMessageW(hwndOwner, WM_MENUSELECT,
                            MAKELONG(ItemInfo.hSubMenu ? wIndex : ItemInfo.wID,
                                     ItemInfo.fType | ItemInfo.fState | MF_MOUSESELECT |
-                                    (hmenu->Flags & MF_SYSMENU)), (LPARAM)
hmenu->Self);
+                                    (hmenu->Flags & (MF_SYSMENU|MF_POPUP))),
(LPARAM) hmenu->Self);
             }
         }
     }