From: Brendan Shanks bshanks@codeweavers.com
In place of macdrv_cocoa.h.
Also move ObjC-only ERR() macro to macdrv.h. --- dlls/winemac.drv/cocoa_app.h | 3 --- dlls/winemac.drv/cocoa_app.m | 3 +++ dlls/winemac.drv/cocoa_clipboard.m | 4 +++- dlls/winemac.drv/cocoa_cursorclipping.m | 3 +++ dlls/winemac.drv/cocoa_display.m | 4 ++-- dlls/winemac.drv/cocoa_event.m | 4 +++- dlls/winemac.drv/cocoa_main.m | 4 +++- dlls/winemac.drv/cocoa_opengl.m | 6 +++--- dlls/winemac.drv/cocoa_status_item.m | 4 +++- dlls/winemac.drv/cocoa_window.m | 5 ++--- dlls/winemac.drv/macdrv.h | 5 +++++ dlls/winemac.drv/macdrv_cocoa.h | 6 ++---- 12 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index f6ba2b4414e..47468837218 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -144,6 +144,3 @@ @interface WineApplication : NSApplication
void OnMainThreadAsync(dispatch_block_t block); - -void LogError(const char* func, const char* format, ...); -void LogErrorv(const char* func, const char* format, va_list args); diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b0b5120718d..970065dee6b 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#import "config.h" +#import "macdrv.h" + #import "cocoa_app.h" #import "cocoa_cursorclipping.h" #import "cocoa_event.h" diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index e0a83778b44..8820474342c 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "macdrv_cocoa.h" +#import "config.h" +#import "macdrv.h" + #import "cocoa_app.h" #import "cocoa_event.h" #import "cocoa_window.h" diff --git a/dlls/winemac.drv/cocoa_cursorclipping.m b/dlls/winemac.drv/cocoa_cursorclipping.m index b6151a2c8c4..2563111ec6c 100644 --- a/dlls/winemac.drv/cocoa_cursorclipping.m +++ b/dlls/winemac.drv/cocoa_cursorclipping.m @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#import "config.h" +#import "macdrv.h" + #import "cocoa_app.h" #import "cocoa_cursorclipping.h" #import "cocoa_window.h" diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 372d89381f1..a458f80efd7 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#import "config.h" +#import "macdrv.h"
#import <AppKit/AppKit.h> #ifdef HAVE_MTLDEVICE_REGISTRYID #import <Metal/Metal.h> #endif -#include "macdrv_cocoa.h"
#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index cc120e4c7dc..c0b4fdc1e95 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -18,12 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#import "config.h" +#import "macdrv.h" + #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> #include <libkern/OSAtomic.h>
-#include "macdrv_cocoa.h" #import "cocoa_event.h" #import "cocoa_app.h" #import "cocoa_window.h" diff --git a/dlls/winemac.drv/cocoa_main.m b/dlls/winemac.drv/cocoa_main.m index 8c9507a75b1..e80aa93473c 100644 --- a/dlls/winemac.drv/cocoa_main.m +++ b/dlls/winemac.drv/cocoa_main.m @@ -18,11 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#import "config.h" +#import "macdrv.h" + #import <AppKit/AppKit.h> #include <mach/mach.h> #include <mach/mach_time.h>
-#include "macdrv_cocoa.h" #import "cocoa_app.h"
#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 2801834e825..adaf085d62f 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define GL_SILENCE_DEPRECATION -#include <OpenGL/gl.h> +#import "config.h" +#import "macdrv.h" + #import "cocoa_opengl.h"
-#include "macdrv_cocoa.h" #include "cocoa_app.h" #include "cocoa_event.h"
diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 31f8a668d81..71c358ce3b3 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#import "config.h" +#import "macdrv.h" + #import <Cocoa/Cocoa.h> -#include "macdrv_cocoa.h" #import "cocoa_app.h" #import "cocoa_event.h"
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ac42db124e9..8c734a63f8c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#import "config.h" +#import "macdrv.h"
-#define GL_SILENCE_DEPRECATION #import <CoreVideo/CoreVideo.h> #import <Metal/Metal.h> #import <QuartzCore/QuartzCore.h> @@ -28,7 +28,6 @@
#import "cocoa_window.h"
-#include "macdrv_cocoa.h" #import "cocoa_app.h" #import "cocoa_event.h" #import "cocoa_opengl.h" diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 255e45cc3f3..3bd9c3526ba 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -77,6 +77,11 @@ #include <OpenGL/glu.h> #include <OpenGL/CGLRenderers.h>
+#ifdef __OBJC__ +#undef ERR +#define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) +#endif +
extern bool allow_vsync; extern bool allow_set_gamma; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 71cc0bae04d..cae31eea616 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -208,6 +208,8 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) extern void macdrv_set_mouse_capture_window(macdrv_window window); extern void macdrv_set_cocoa_retina_mode(bool new_mode);
+extern void LogError(const char* func, const char* format, ...); +extern void LogErrorv(const char* func, const char* format, va_list args);
/* cursor */ extern void macdrv_set_cursor(CFStringRef name, CFArrayRef frames); @@ -218,10 +220,6 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point)
/* display */
-/* Used DISPLAY_DEVICE.StateFlags for adapters */ -#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 -#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 - /* Represent a physical GPU in the PCI slots */ struct macdrv_gpu {