From: Brendan Shanks <bshanks@codeweavers.com> --- dlls/winemac.drv/cocoa_app.h | 4 ++-- dlls/winemac.drv/cocoa_app.m | 6 +++--- dlls/winemac.drv/cocoa_clipboard.m | 8 ++++---- dlls/winemac.drv/cocoa_event.m | 10 +++++----- dlls/winemac.drv/cocoa_window.m | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index e2f25c6cc41..d64b528e9f5 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -151,5 +151,5 @@ @interface WineApplication : NSApplication void OnMainThreadAsync(dispatch_block_t block); -void LogError(const char* func, NSString* format, ...); -void LogErrorv(const char* func, NSString* format, va_list args); +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 102a5b70702..f8933b82233 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2388,7 +2388,7 @@ void OnMainThreadAsync(dispatch_block_t block) /*********************************************************************** * LogError */ -void LogError(const char* func, NSString* format, ...) +void LogError(const char* func, const char* format, ...) { va_list args; va_start(args, format); @@ -2399,11 +2399,11 @@ void LogError(const char* func, NSString* format, ...) /*********************************************************************** * LogErrorv */ -void LogErrorv(const char* func, NSString* format, va_list args) +void LogErrorv(const char* func, const char* format, va_list args) { @autoreleasepool { - NSString* message = [[NSString alloc] initWithFormat:format arguments:args]; + NSString* message = [[NSString alloc] initWithFormat:[NSString stringWithUTF8String:format] arguments:args]; fprintf(stderr, "err:%s:%s", func, [message UTF8String]); [message release]; } diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 1eb9995b4eb..8fc14c5329a 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -132,7 +132,7 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) } @catch (id e) { - ERR(@"Exception discarded while copying pasteboard types: %@\n", e); + ERR("Exception discarded while copying pasteboard types: %@\n", e); } }); @@ -175,7 +175,7 @@ CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) } @catch (id e) { - ERR(@"Exception discarded while copying pasteboard types: %@\n", e); + ERR("Exception discarded while copying pasteboard types: %@\n", e); } }); @@ -203,7 +203,7 @@ void macdrv_clear_pasteboard(macdrv_window w) } @catch (id e) { - ERR(@"Exception discarded while clearing pasteboard: %@\n", e); + ERR("Exception discarded while clearing pasteboard: %@\n", e); } }); } @@ -240,7 +240,7 @@ int macdrv_set_pasteboard_data(CFStringRef type, CFDataRef data, macdrv_window w } @catch (id e) { - ERR(@"Exception discarded while copying pasteboard types: %@\n", e); + ERR("Exception discarded while copying pasteboard types: %@\n", e); } }); diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index d3fc4e8f22c..aaa31ea302b 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -189,7 +189,7 @@ - (void) signalEventAvailable } while (rc < 0 && errno == EINTR); if (rc < 0 && errno != EAGAIN) - ERR(@"%@: got error writing to event queue signaling pipe: %s\n", self, strerror(errno)); + ERR("%@: got error writing to event queue signaling pipe: %s\n", self, strerror(errno)); } - (void) postEventObject:(MacDrvEvent*)event @@ -258,9 +258,9 @@ - (MacDrvEvent*) getEventMatchingMask:(macdrv_event_mask)mask if (rc == 0 || (rc < 0 && errno != EAGAIN)) { if (rc == 0) - ERR(@"%@: event queue signaling pipe unexpectedly closed\n", self); + ERR("%@: event queue signaling pipe unexpectedly closed\n", self); else - ERR(@"%@: got error reading from event queue signaling pipe: %s\n", self, strerror(errno)); + ERR("%@: got error reading from event queue signaling pipe: %s\n", self, strerror(errno)); return nil; } @@ -437,7 +437,7 @@ - (int) registerHotKey:(UInt32)keyCode modifiers:(UInt32)modifiers vkey:(unsigne status = InstallApplicationEventHandler(HotKeyHandler, 1, &eventType, self, &handler); if (status != noErr) { - ERR(@"InstallApplicationEventHandler() failed: %d\n", status); + ERR("InstallApplicationEventHandler() failed: %d\n", status); handler = NULL; return MACDRV_HOTKEY_FAILURE; } @@ -461,7 +461,7 @@ - (int) registerHotKey:(UInt32)keyCode modifiers:(UInt32)modifiers vkey:(unsigne return MACDRV_HOTKEY_ALREADY_REGISTERED; if (status != noErr) { - ERR(@"RegisterEventHotKey() failed: %d\n", status); + ERR("RegisterEventHotKey() failed: %d\n", status); return MACDRV_HOTKEY_FAILURE; } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 8ca5dd76635..23ea24ec0fc 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1595,7 +1595,7 @@ - (BOOL) becameEligibleParentOrChild reordered = TRUE; } else - ERR(@"shouldn't happen: %@ thinks %@ is a latent child, but it doesn't agree\n", self, child); + ERR("shouldn't happen: %@ thinks %@ is a latent child, but it doesn't agree\n", self, child); [indexesToRemove addIndex:i]; } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9503