winex11.drv: Define ControlMask when not available.

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"

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"
 

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];

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"
 

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"

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"

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"