[ros-diffs] [fireball] 45688: Maarten Kroese - SHELL_MergeMenus: Don't skip higher IDs if uIDAdjustMax is set to 0xFFFF (according to MSDN).
fireball at svn.reactos.org
fireball at svn.reactos.org
Fri Feb 26 20:09:43 CET 2010
Author: fireball
Date: Fri Feb 26 20:09:43 2010
New Revision: 45688
URL: http://svn.reactos.org/svn/reactos?rev=45688&view=rev
Log:
Maarten Kroese
- SHELL_MergeMenus: Don't skip higher IDs if uIDAdjustMax is set to 0xFFFF (according to MSDN).
Modified:
trunk/reactos/dll/win32/shell32/shlmenu.c
Modified: trunk/reactos/dll/win32/shell32/shlmenu.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlmenu.c?rev=45688&r1=45687&r2=45688&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlmenu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlmenu.c [iso-8859-1] Fri Feb 26 20:09:43 2010
@@ -910,7 +910,7 @@
{
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 @@
{
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 */
More information about the Ros-diffs
mailing list