user32: Redefine internal pop-up tracking flags to avoid conflicts.

Dan Hipschman dsh at linux.ucla.edu
Thu Jun 26 18:18:05 CDT 2008


These internal flags conflict with the Win32 API flags TPM_RECURSE,
TPM_RIGHTBUTTON, and TPM_CENTERALIGN respectively, which are all stored
in the same flag UINT.  This fixes a bug I'm looking at with the same
description as

http://bugs.winehq.org/show_bug.cgi?id=14029

I'll update the bugtracker so the reporter can retest with this patch.

User32 tests continue to pass.

---
 dlls/user32/menu.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 88eb72f..b4c1955 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -116,9 +116,9 @@ typedef struct {
 
 /* internal flags for menu tracking */
 
-#define TF_ENDMENU              0x0001
-#define TF_SUSPENDPOPUP         0x0002
-#define TF_SKIPREMOVE		0x0004
+#define TF_ENDMENU              0x10000
+#define TF_SUSPENDPOPUP         0x20000
+#define TF_SKIPREMOVE           0x40000
 
 typedef struct
 {



More information about the wine-patches mailing list