[PATCH 0/1] MR9231: winemac.drv: Include Carbon.h in macdrv_cocoa.h and remove duplicate definitions.

[Brendan Shanks (＠bshanks)]

Include Carbon.h in macdrv_cocoa.h, this allows duplicate definitions to be removed from keyboard.c. The `#ifdef __i386__` isn't strictly needed, but marks them to be removed when we stop supporting i386 (likely sooner than later).

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9231

[PATCH 1/1] winemac.drv: Include Carbon.h in macdrv_cocoa.h and remove duplicate definitions.

[Brendan Shanks]

From: Brendan Shanks <bshanks(a)codeweavers.com>

---
 dlls/winemac.drv/cocoa_app.m    |   2 -
 dlls/winemac.drv/cocoa_event.m  |   1 -
 dlls/winemac.drv/cocoa_window.m |   1 -
 dlls/winemac.drv/keyboard.c     | 143 --------------------------------
 dlls/winemac.drv/macdrv_cocoa.h |  23 ++++-
 5 files changed, 21 insertions(+), 149 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m
index f62f0c1fbdb..25696ba38c4 100644
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#import <Carbon/Carbon.h>
-
 #import "cocoa_app.h"
 #import "cocoa_cursorclipping.h"
 #import "cocoa_event.h"
diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m
index 336de1c9047..7c86fc1d5ff 100644
--- a/dlls/winemac.drv/cocoa_event.m
+++ b/dlls/winemac.drv/cocoa_event.m
@@ -22,7 +22,6 @@
 #include <sys/event.h>
 #include <sys/time.h>
 #include <libkern/OSAtomic.h>
-#import <Carbon/Carbon.h>
 
 #include "macdrv_cocoa.h"
 #import "cocoa_event.h"
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 6e69ddb1fc1..326b5925c5f 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #define GL_SILENCE_DEPRECATION
-#import <Carbon/Carbon.h>
 #import <CoreVideo/CoreVideo.h>
 #import <Metal/Metal.h>
 #import <QuartzCore/QuartzCore.h>
diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index f06f98f2cbe..645d082b166 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -38,149 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
 WINE_DECLARE_DEBUG_CHANNEL(key);
 
 
-/* Carbon-style modifier mask definitions from <Carbon/HIToolbox/Events.h>. */
-enum {
-    cmdKeyBit       = 8,
-    shiftKeyBit     = 9,
-    alphaLockBit    = 10,
-    optionKeyBit    = 11,
-    controlKeyBit   = 12,
-};
-
-enum {
-    cmdKey      = 1 << cmdKeyBit,
-    shiftKey    = 1 << shiftKeyBit,
-    alphaLock   = 1 << alphaLockBit,
-    optionKey   = 1 << optionKeyBit,
-    controlKey  = 1 << controlKeyBit,
-};
-
-
-/* Mac virtual key code definitions from <Carbon/HIToolbox/Events.h>. */
-enum {
-    kVK_ANSI_A              = 0x00,
-    kVK_ANSI_S              = 0x01,
-    kVK_ANSI_D              = 0x02,
-    kVK_ANSI_F              = 0x03,
-    kVK_ANSI_H              = 0x04,
-    kVK_ANSI_G              = 0x05,
-    kVK_ANSI_Z              = 0x06,
-    kVK_ANSI_X              = 0x07,
-    kVK_ANSI_C              = 0x08,
-    kVK_ANSI_V              = 0x09,
-    kVK_ISO_Section         = 0x0A,
-    kVK_ANSI_B              = 0x0B,
-    kVK_ANSI_Q              = 0x0C,
-    kVK_ANSI_W              = 0x0D,
-    kVK_ANSI_E              = 0x0E,
-    kVK_ANSI_R              = 0x0F,
-    kVK_ANSI_Y              = 0x10,
-    kVK_ANSI_T              = 0x11,
-    kVK_ANSI_1              = 0x12,
-    kVK_ANSI_2              = 0x13,
-    kVK_ANSI_3              = 0x14,
-    kVK_ANSI_4              = 0x15,
-    kVK_ANSI_6              = 0x16,
-    kVK_ANSI_5              = 0x17,
-    kVK_ANSI_Equal          = 0x18,
-    kVK_ANSI_9              = 0x19,
-    kVK_ANSI_7              = 0x1A,
-    kVK_ANSI_Minus          = 0x1B,
-    kVK_ANSI_8              = 0x1C,
-    kVK_ANSI_0              = 0x1D,
-    kVK_ANSI_RightBracket   = 0x1E,
-    kVK_ANSI_O              = 0x1F,
-    kVK_ANSI_U              = 0x20,
-    kVK_ANSI_LeftBracket    = 0x21,
-    kVK_ANSI_I              = 0x22,
-    kVK_ANSI_P              = 0x23,
-    kVK_Return              = 0x24,
-    kVK_ANSI_L              = 0x25,
-    kVK_ANSI_J              = 0x26,
-    kVK_ANSI_Quote          = 0x27,
-    kVK_ANSI_K              = 0x28,
-    kVK_ANSI_Semicolon      = 0x29,
-    kVK_ANSI_Backslash      = 0x2A,
-    kVK_ANSI_Comma          = 0x2B,
-    kVK_ANSI_Slash          = 0x2C,
-    kVK_ANSI_N              = 0x2D,
-    kVK_ANSI_M              = 0x2E,
-    kVK_ANSI_Period         = 0x2F,
-    kVK_Tab                 = 0x30,
-    kVK_Space               = 0x31,
-    kVK_ANSI_Grave          = 0x32,
-    kVK_Delete              = 0x33,
-    kVK_Escape              = 0x35,
-    kVK_RightCommand        = 0x36, /* invented for Wine; co-opt unused key code */
-    kVK_Command             = 0x37,
-    kVK_Shift               = 0x38,
-    kVK_CapsLock            = 0x39,
-    kVK_Option              = 0x3A,
-    kVK_Control             = 0x3B,
-    kVK_RightShift          = 0x3C,
-    kVK_RightOption         = 0x3D,
-    kVK_RightControl        = 0x3E,
-    kVK_Function            = 0x3F,
-    kVK_F17                 = 0x40,
-    kVK_ANSI_KeypadDecimal  = 0x41,
-    kVK_ANSI_KeypadMultiply = 0x43,
-    kVK_ANSI_KeypadPlus     = 0x45,
-    kVK_ANSI_KeypadClear    = 0x47,
-    kVK_VolumeUp            = 0x48,
-    kVK_VolumeDown          = 0x49,
-    kVK_Mute                = 0x4A,
-    kVK_ANSI_KeypadDivide   = 0x4B,
-    kVK_ANSI_KeypadEnter    = 0x4C,
-    kVK_ANSI_KeypadMinus    = 0x4E,
-    kVK_F18                 = 0x4F,
-    kVK_F19                 = 0x50,
-    kVK_ANSI_KeypadEquals   = 0x51,
-    kVK_ANSI_Keypad0        = 0x52,
-    kVK_ANSI_Keypad1        = 0x53,
-    kVK_ANSI_Keypad2        = 0x54,
-    kVK_ANSI_Keypad3        = 0x55,
-    kVK_ANSI_Keypad4        = 0x56,
-    kVK_ANSI_Keypad5        = 0x57,
-    kVK_ANSI_Keypad6        = 0x58,
-    kVK_ANSI_Keypad7        = 0x59,
-    kVK_F20                 = 0x5A,
-    kVK_ANSI_Keypad8        = 0x5B,
-    kVK_ANSI_Keypad9        = 0x5C,
-    kVK_JIS_Yen             = 0x5D,
-    kVK_JIS_Underscore      = 0x5E,
-    kVK_JIS_KeypadComma     = 0x5F,
-    kVK_F5                  = 0x60,
-    kVK_F6                  = 0x61,
-    kVK_F7                  = 0x62,
-    kVK_F3                  = 0x63,
-    kVK_F8                  = 0x64,
-    kVK_F9                  = 0x65,
-    kVK_JIS_Eisu            = 0x66,
-    kVK_F11                 = 0x67,
-    kVK_JIS_Kana            = 0x68,
-    kVK_F13                 = 0x69,
-    kVK_F16                 = 0x6A,
-    kVK_F14                 = 0x6B,
-    kVK_F10                 = 0x6D,
-    kVK_F12                 = 0x6F,
-    kVK_F15                 = 0x71,
-    kVK_Help                = 0x72,
-    kVK_Home                = 0x73,
-    kVK_PageUp              = 0x74,
-    kVK_ForwardDelete       = 0x75,
-    kVK_F4                  = 0x76,
-    kVK_End                 = 0x77,
-    kVK_F2                  = 0x78,
-    kVK_PageDown            = 0x79,
-    kVK_F1                  = 0x7A,
-    kVK_LeftArrow           = 0x7B,
-    kVK_RightArrow          = 0x7C,
-    kVK_DownArrow           = 0x7D,
-    kVK_UpArrow             = 0x7E,
-};
-
-extern const CFStringRef kTISTypeKeyboardLayout;
-
 /* Indexed by Mac virtual keycode values defined above. */
 static const struct {
     WORD vkey;
diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h
index 1ab20ec2724..f91e9f9f169 100644
--- a/dlls/winemac.drv/macdrv_cocoa.h
+++ b/dlls/winemac.drv/macdrv_cocoa.h
@@ -33,14 +33,35 @@
 #define GetProcessInformation MacGetProcessInformation
 #define LoadResource MacLoadResource
 #define Polygon MacPolygon
+#ifdef __i386__
+#  define CheckMenuItem MacCheckMenuItem
+#  define DeleteMenu MacDeleteMenu
+#  define DrawMenuBar MacDrawMenuBar
+#  define EnableMenuItem MacEnableMenuItem
+#  define GetMenu MacGetMenu
+#  define IsWindowVisible MacIsWindowVisible
+#  define MoveWindow MacMoveWindow
+#  define ShowWindow MacShowWindow
+#endif
 
 #include <ApplicationServices/ApplicationServices.h>
+#include <Carbon/Carbon.h>
 
 #undef GetCurrentProcess
 #undef GetCurrentThread
 #undef GetProcessInformation
 #undef LoadResource
 #undef Polygon
+#ifdef __i386__
+#  undef CheckMenuItem
+#  undef DeleteMenu
+#  undef DrawMenuBar
+#  undef EnableMenuItem
+#  undef GetMenu
+#  undef IsWindowVisible
+#  undef MoveWindow
+#  undef ShowWindow
+#endif
 
 #include <pthread.h>
 
@@ -77,8 +98,6 @@
     MACDRV_HOTKEY_FAILURE,
 };
 
-typedef struct __TISInputSource *TISInputSourceRef;
-
 typedef struct macdrv_opaque_window* macdrv_window;
 typedef struct macdrv_opaque_event_queue* macdrv_event_queue;
 typedef struct macdrv_opaque_view* macdrv_view;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9231