Maarten Kroese

- SHELL_MergeMenus: Don't skip higher IDs if uIDAdjustMax is set to 0xFFFF (according to MSDN).

svn path=/trunk/; revision=45688

diff --git a/reactos/dll/win32/shell32/shlmenu.c b/reactos/dll/win32/shell32/shlmenu.c
index 7ca1ce8..c25667e 100644 (file)
--- a/reactos/dll/win32/shell32/shlmenu.c
+++ b/reactos/dll/win32/shell32/shlmenu.c
@@ -910,7 +910,7 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
            {
              miiSrc.wID += uIDAdjust;                  /* add uIDAdjust to the ID */
 
-             if (miiSrc.wID > uIDAdjustMax)            /* skip ID's higher uIDAdjustMax */
+             if (uIDAdjustMax != 0xFFFF && miiSrc.wID > uIDAdjustMax)          /* skip ID's higher uIDAdjustMax */
                continue;
 
              if (uIDMax <= miiSrc.wID)                 /* remember the highest ID */
@@ -937,7 +937,7 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
          {
            miiSrc.wID += uIDAdjust;                    /* add uIDAdjust to the ID */
 
-           if (miiSrc.wID > uIDAdjustMax)              /* skip ID's higher uIDAdjustMax */
+           if (uIDAdjustMax != 0xFFFF && miiSrc.wID > uIDAdjustMax)            /* skip ID's higher uIDAdjustMax */
              continue;
 
            if (uIDMax <= miiSrc.wID)                   /* remember the highest ID */