system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 05:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

winemac: Add a simple ERR() logging macro that can be used from Cocoa code.

Browse source
This commit is contained in:
Ken Thomases 2013-01-21 00:07:47 -06:00 committed by Alexandre Julliard
parent dadcacf99a
commit b6d902ee46
4 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/winemac.drv/cocoa_app.h
View file

@ -23,6 +23,9 @@
#include "macdrv_cocoa.h"
#define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false)
@interface WineApplication : NSApplication <NSApplicationDelegate>
- (void) transformProcessToForeground;
@ -31,3 +34,6 @@ - (void) transformProcessToForeground;
void OnMainThread(dispatch_block_t block);
void OnMainThreadAsync(dispatch_block_t block);
void LogError(const char* func, NSString* format, ...);
void LogErrorv(const char* func, NSString* format, va_list args);

24
dlls/winemac.drv/cocoa_app.m
View file

@ -21,6 +21,9 @@
#import "cocoa_app.h"
int macdrv_err_on;
@implementation WineApplication
- (void) transformProcessToForeground
@ -87,3 +90,24 @@ void OnMainThreadAsync(dispatch_block_t block)
{
dispatch_async(dispatch_get_main_queue(), block);
}
/***********************************************************************
* LogError
*/
void LogError(const char* func, NSString* format, ...)
{
va_list args;
va_start(args, format);
LogErrorv(func, format, args);
va_end(args);
}
/***********************************************************************
* LogErrorv
*/
void LogErrorv(const char* func, NSString* format, va_list args)
{
NSString* message = [[NSString alloc] initWithFormat:format arguments:args];
fprintf(stderr, "err:%s:%s", func, [message UTF8String]);
[message release];
}

2
dlls/winemac.drv/macdrv_cocoa.h
View file

@ -109,6 +109,8 @@
/* main */
extern int macdrv_err_on;
extern int macdrv_start_cocoa_app(void) DECLSPEC_HIDDEN;

1
dlls/winemac.drv/macdrv_main.c
View file

@ -36,6 +36,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
switch(reason)
{
case DLL_PROCESS_ATTACH:
macdrv_err_on = ERR_ON(macdrv);
if (macdrv_start_cocoa_app())
{
ERR("Failed to start Cocoa app main loop\n");