I'm planning to remove resource-fork font support next, which will get rid of the other #defines in `win32u/freetype.c`
From: Brendan Shanks bshanks@codeweavers.com
--- dlls/winemac.drv/cocoa_app.h | 37 ------------------------------------ dlls/winemac.drv/cocoa_app.m | 12 +----------- 2 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 9ba4d86e319..f14b31876f6 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -22,43 +22,6 @@
#include "macdrv_cocoa.h"
-#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 -/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ -#define NSCompositingOperationSourceOver NSCompositeSourceOver -#define NSEventMaskAny NSAnyEventMask -#define NSEventMaskLeftMouseDown NSLeftMouseDownMask -#define NSEventMaskOtherMouseDown NSOtherMouseDownMask -#define NSEventMaskRightMouseDown NSRightMouseDownMask -#define NSEventModifierFlagCommand NSCommandKeyMask -#define NSEventModifierFlagControl NSControlKeyMask -#define NSEventModifierFlagOption NSAlternateKeyMask -#define NSEventModifierFlagShift NSShiftKeyMask -#define NSEventTypeAppKitDefined NSAppKitDefined -#define NSEventTypeApplicationDefined NSApplicationDefined -#define NSEventTypeFlagsChanged NSFlagsChanged -#define NSEventTypeKeyDown NSKeyDown -#define NSEventTypeKeyUp NSKeyUp -#define NSEventTypeLeftMouseDown NSLeftMouseDown -#define NSEventTypeLeftMouseDragged NSLeftMouseDragged -#define NSEventTypeLeftMouseUp NSLeftMouseUp -#define NSEventTypeMouseMoved NSMouseMoved -#define NSEventTypeOtherMouseDown NSOtherMouseDown -#define NSEventTypeOtherMouseDragged NSOtherMouseDragged -#define NSEventTypeOtherMouseUp NSOtherMouseUp -#define NSEventTypeRightMouseDown NSRightMouseDown -#define NSEventTypeRightMouseUp NSRightMouseUp -#define NSEventTypeRightMouseDragged NSRightMouseDragged -#define NSEventTypeScrollWheel NSScrollWheel -#define NSWindowStyleMaskBorderless NSBorderlessWindowMask -#define NSWindowStyleMaskClosable NSClosableWindowMask -#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask -#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask -#define NSWindowStyleMaskResizable NSResizableWindowMask -#define NSWindowStyleMaskTitled NSTitledWindowMask -#define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask -#define NSWindowStyleMaskNonactivatingPanel NSNonactivatingPanelMask -#endif - #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false)
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 500b933005a..4d72baadf76 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -46,15 +46,6 @@ int macdrv_err_on;
-#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 -@interface NSWindow (WineAutoTabbingExtensions) - - + (void) setAllowsAutomaticWindowTabbing:(BOOL)allows; - -@end -#endif - - #if !defined(MAC_OS_VERSION_14_0) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_VERSION_14_0 @interface NSApplication (CooperativeActivationSelectorsForOldSDKs)
@@ -145,8 +136,7 @@ + (void) initialize
[[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
- if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)]) - [NSWindow setAllowsAutomaticWindowTabbing:NO]; + [NSWindow setAllowsAutomaticWindowTabbing:NO]; } }
From: Brendan Shanks bshanks@codeweavers.com
--- configure.ac | 1 - dlls/winemac.drv/Makefile.in | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac index b373c47cfbb..848d8329554 100644 --- a/configure.ac +++ b/configure.ac @@ -924,7 +924,6 @@ case $host_os in AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation") AC_SUBST(DISKARBITRATION_LIBS,"-framework DiskArbitration -framework CoreFoundation") AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation") - AC_SUBST(METAL_LIBS,"-framework Metal") AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index a9ce7249eb3..621388f2bd8 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -9,10 +9,10 @@ UNIX_LIBS = \ -framework CoreVideo \ -framework Foundation \ -framework IOKit \ + -framework Metal \ -framework OpenGL \ -framework QuartzCore \ -framework Security \ - $(METAL_LIBS)
SOURCES = \ clipboard.c \
From: Brendan Shanks bshanks@codeweavers.com
The Mac OS X 10.6 SDK was the last version to define these QuickDraw functions. --- dlls/win32u/freetype.c | 22 ----------------- dlls/winemac.drv/macdrv_cocoa.h | 44 --------------------------------- dlls/winspool.drv/cups.c | 44 --------------------------------- 3 files changed, 110 deletions(-)
diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 2eea7535466..c638a6addfb 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -47,25 +47,14 @@ #define GetCurrentThread __carbon_GetCurrentThread #define GetCurrentProcess __carbon_GetCurrentProcess #define GetProcessInformation __carbon_GetProcessInformation -#define AnimatePalette __carbon_AnimatePalette #define DeleteMenu __carbon_DeleteMenu #define DrawMenu __carbon_DrawMenu #define DrawMenuBar __carbon_DrawMenuBar #define EnableMenuItem __carbon_EnableMenuItem -#define EqualRgn __carbon_EqualRgn -#define FillRgn __carbon_FillRgn -#define FrameRgn __carbon_FrameRgn #define GetMenu __carbon_GetMenu -#define GetPixel __carbon_GetPixel -#define InvertRgn __carbon_InvertRgn #define IsWindowVisible __carbon_IsWindowVisible -#define LineTo __carbon_LineTo #define MoveWindow __carbon_MoveWindow -#define OffsetRgn __carbon_OffsetRgn -#define PaintRgn __carbon_PaintRgn #define Polygon __carbon_Polygon -#define ResizePalette __carbon_ResizePalette -#define SetRectRgn __carbon_SetRectRgn #define ShowWindow __carbon_ShowWindow #include <Carbon/Carbon.h> #undef LoadResource @@ -74,26 +63,15 @@ #undef _CDECL #undef GetCurrentProcess #undef GetProcessInformation -#undef AnimatePalette #undef CheckMenuItem #undef DeleteMenu #undef DrawMenu #undef DrawMenuBar #undef EnableMenuItem -#undef EqualRgn -#undef FillRgn -#undef FrameRgn #undef GetMenu -#undef GetPixel -#undef InvertRgn #undef IsWindowVisible -#undef LineTo #undef MoveWindow -#undef OffsetRgn -#undef PaintRgn #undef Polygon -#undef ResizePalette -#undef SetRectRgn #undef ShowWindow #endif /* __APPLE__ */
diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 9807d4e53fc..82a577fed37 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -32,29 +32,7 @@ #define GetCurrentThread MacGetCurrentThread #define GetProcessInformation MacGetProcessInformation #define LoadResource MacLoadResource -#define AnimatePalette MacAnimatePalette -#define EqualRgn MacEqualRgn -#define FillRgn MacFillRgn -#define FrameRgn MacFrameRgn -#define GetPixel MacGetPixel -#define InvertRgn MacInvertRgn -#define LineTo MacLineTo -#define OffsetRgn MacOffsetRgn -#define PaintRgn MacPaintRgn #define Polygon MacPolygon -#define ResizePalette MacResizePalette -#define SetRectRgn MacSetRectRgn -#define EqualRect MacEqualRect -#define FillRect MacFillRect -#define FrameRect MacFrameRect -#define GetCursor MacGetCursor -#define InvertRect MacInvertRect -#define OffsetRect MacOffsetRect -#define PtInRect MacPtInRect -#define SetCursor MacSetCursor -#define SetRect MacSetRect -#define ShowCursor MacShowCursor -#define UnionRect MacUnionRect
#include <ApplicationServices/ApplicationServices.h>
@@ -62,29 +40,7 @@ #undef GetCurrentThread #undef GetProcessInformation #undef LoadResource -#undef AnimatePalette -#undef EqualRgn -#undef FillRgn -#undef FrameRgn -#undef GetPixel -#undef InvertRgn -#undef LineTo -#undef OffsetRgn -#undef PaintRgn #undef Polygon -#undef ResizePalette -#undef SetRectRgn -#undef EqualRect -#undef FillRect -#undef FrameRect -#undef GetCursor -#undef InvertRect -#undef OffsetRect -#undef PtInRect -#undef SetCursor -#undef SetRect -#undef ShowCursor -#undef UnionRect
#include <pthread.h>
diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 8cdc193d33a..65b399ab6bf 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -46,57 +46,13 @@ #define GetCurrentThread GetCurrentThread_Mac #define GetProcessInformation GetProcessInformation_Mac #define LoadResource LoadResource_Mac -#define AnimatePalette AnimatePalette_Mac -#define EqualRgn EqualRgn_Mac -#define FillRgn FillRgn_Mac -#define FrameRgn FrameRgn_Mac -#define GetPixel GetPixel_Mac -#define InvertRgn InvertRgn_Mac -#define LineTo LineTo_Mac -#define OffsetRgn OffsetRgn_Mac -#define PaintRgn PaintRgn_Mac #define Polygon Polygon_Mac -#define ResizePalette ResizePalette_Mac -#define SetRectRgn SetRectRgn_Mac -#define EqualRect EqualRect_Mac -#define FillRect FillRect_Mac -#define FrameRect FrameRect_Mac -#define GetCursor GetCursor_Mac -#define InvertRect InvertRect_Mac -#define OffsetRect OffsetRect_Mac -#define PtInRect PtInRect_Mac -#define SetCursor SetCursor_Mac -#define SetRect SetRect_Mac -#define ShowCursor ShowCursor_Mac -#define UnionRect UnionRect_Mac #include <ApplicationServices/ApplicationServices.h> #undef GetCurrentProcess #undef GetCurrentThread #undef GetProcessInformation #undef LoadResource -#undef AnimatePalette -#undef EqualRgn -#undef FillRgn -#undef FrameRgn -#undef GetPixel -#undef InvertRgn -#undef LineTo -#undef OffsetRgn -#undef PaintRgn #undef Polygon -#undef ResizePalette -#undef SetRectRgn -#undef EqualRect -#undef FillRect -#undef FrameRect -#undef GetCursor -#undef InvertRect -#undef OffsetRect -#undef PtInRect -#undef SetCursor -#undef SetRect -#undef ShowCursor -#undef UnionRect #endif
#include "ntstatus.h"
This merge request was approved by Huw Davies.
-
Brendan Shanks -
Brendan Shanks (＠bshanks)
-
Huw Davies (＠huw)