mirror of
https://github.com/reactos/reactos.git
synced 2024-07-04 11:44:33 +00:00
Maarten Kroese
- SHELL_MergeMenus: Don't skip higher IDs if uIDAdjustMax is set to 0xFFFF (according to MSDN). svn path=/trunk/; revision=45688
This commit is contained in:
parent
1aed20b05d
commit
83038a06e3
|
@ -910,7 +910,7 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
|
||||||
{
|
{
|
||||||
miiSrc.wID += uIDAdjust; /* add uIDAdjust to the ID */
|
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;
|
continue;
|
||||||
|
|
||||||
if (uIDMax <= miiSrc.wID) /* remember the highest ID */
|
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 */
|
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;
|
continue;
|
||||||
|
|
||||||
if (uIDMax <= miiSrc.wID) /* remember the highest ID */
|
if (uIDMax <= miiSrc.wID) /* remember the highest ID */
|
||||||
|
|
Loading…
Reference in a new issue