From: Aleksey Bragin <aleksey@reactos.org>
Date: Fri, 26 Feb 2010 19:09:43 +0000 (+0000)
Subject: Maarten Kroese
X-Git-Tag: ReactOS-0.3.11-CLT2010~8^2~72
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=83038a06e3590568d909197bfe4778ea1191c449

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 7ca1ce83972..c25667e633c 100644
--- 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 */