Alistair Leslie-Hughes : winex11.drv: Define ControlMask when not available.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cf4a781e987a98a8d48610362a20a320c4a1016d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=cf4a781e987a98a8d48610362...

Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Date:   Sun May 22 17:40:44 2022 +1000

winex11.drv: Define ControlMask when not available.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---

 dlls/winex11.drv/bitblt.c      | 2 --
 dlls/winex11.drv/event.c       | 6 ------
 dlls/winex11.drv/keyboard.c    | 7 ++++---
 dlls/winex11.drv/mouse.c       | 4 +---
 dlls/winex11.drv/window.c      | 6 +++---
 dlls/winex11.drv/x11drv.h      | 3 +++
 dlls/winex11.drv/x11drv_main.c | 4 +---
 7 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
index d1e6407d87c..10388a1cc8f 100644
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -46,8 +46,6 @@
 # endif
 #endif
 
-#include "windef.h"
-#include "winbase.h"
 #include "x11drv.h"
 #include "winternl.h"
 #include "wine/debug.h"
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index cbab1dcfe13..f81d2338faf 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -39,13 +39,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "windef.h"
-#include "winbase.h"
-
 #include "x11drv.h"
-
-/* avoid conflict with field names in included win32 headers */
-#undef Status
 #include "shlobj.h"  /* DROPFILES */
 #include "shellapi.h"
 
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 6157548474b..7b4ad9acd8d 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -44,14 +44,13 @@
 
 #define NONAMELESSUNION
 
-#include "windef.h"
-#include "winbase.h"
+#include "x11drv.h"
+
 #include "wingdi.h"
 #include "winuser.h"
 #include "winreg.h"
 #include "winnls.h"
 #include "ime.h"
-#include "x11drv.h"
 #include "wine/server.h"
 #include "wine/debug.h"
 
@@ -64,6 +63,8 @@
 WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
 WINE_DECLARE_DEBUG_CHANNEL(key);
 
+static const unsigned int ControlMask = 1 << 2;
+
 static int min_keycode, max_keycode, keysyms_per_keycode;
 static KeySym *key_mapping;
 static WORD keyc2vkey[256], keyc2scan[256];
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index d0cdd3d4984..2ce03c3f12f 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -50,11 +50,9 @@ MAKE_FUNCPTR(XcursorLibraryLoadCursor);
 
 #define NONAMELESSUNION
 #define OEMRESOURCE
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
 
 #include "x11drv.h"
+#include "winreg.h"
 #include "wine/server.h"
 #include "wine/debug.h"
 
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 773fa81f5f3..07fb1515e24 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -43,14 +43,14 @@
 
 /* avoid conflict with field names in included win32 headers */
 #undef Status
+
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
+
+#include "x11drv.h"
 #include "wingdi.h"
 #include "winuser.h"
 
-#include "x11drv.h"
 #include "wine/debug.h"
 #include "wine/server.h"
 #include "mwm.h"
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 613dc0e05fe..222d7328387 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -57,6 +57,9 @@
 #undef Status  /* avoid conflict with wintrnl.h */
 typedef int Status;
 
+/* avoid conflict with processthreadsapi.h */
+#undef ControlMask
+
 #include "windef.h"
 #include "winbase.h"
 #include "ntgdi.h"
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 40d0e750d1b..a118757dfbe 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -45,14 +45,12 @@
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
 
 #define VK_NO_PROTOTYPES
 #define WINE_VK_HOST
 
 #include "x11drv.h"
+#include "winreg.h"
 #include "xcomposite.h"
 #include "wine/server.h"
 #include "wine/debug.h"