March 2013 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Allow for processing Cocoa events while waiting for query results.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 761ad810d978168edf3fce62dd8aa12f9e945292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761ad810d978168edf3fce62d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:57 2013 -0500 winemac: Allow for processing Cocoa events while waiting for query results. --- dlls/winemac.drv/cocoa_app.h | 7 ++++++- dlls/winemac.drv/cocoa_app.m | 16 ++++++++++++++-- dlls/winemac.drv/cocoa_event.h | 1 + dlls/winemac.drv/cocoa_event.m | 22 ++++++++++++++++++++-- dlls/winemac.drv/event.c | 3 ++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 67f75e1..e15d734 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -26,6 +26,11 @@ #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) +enum { + WineApplicationEventWakeQuery, +}; + + @class WineEventQueue; @class WineWindow; @@ -87,7 +92,7 @@ - (void) windowGotFocus:(WineWindow*)window; - - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout; + - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents; - (void) keyboardSelectionDidChange; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 5dc3008..7ee009d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -172,13 +172,25 @@ int macdrv_err_on; } } - - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout + - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents { PerformRequest(NULL); do { - [[NSRunLoop currentRunLoop] runMode:WineAppWaitQueryResponseMode beforeDate:timeout]; + if (processEvents) + { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask + untilDate:timeout + inMode:NSDefaultRunLoopMode + dequeue:YES]; + if (event) + [NSApp sendEvent:event]; + [pool release]; + } + else + [[NSRunLoop currentRunLoop] runMode:WineAppWaitQueryResponseMode beforeDate:timeout]; } while (!*done && [timeout timeIntervalSinceNow] >= 0); return *done; diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 56964da..e74875e 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -36,6 +36,7 @@ - (void) postEvent:(const macdrv_event*)inEvent; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window; + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout; @end diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index a5f1c1b..c95fac6 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -252,7 +252,7 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea [eventsLock unlock]; } - - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents { macdrv_event event; NSDate* timeoutDate = [NSDate dateWithTimeIntervalSinceNow:timeout]; @@ -264,10 +264,15 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea query->done = FALSE; [self postEvent:&event]; - timedout = ![NSApp waitUntilQueryDone:&query->done timeout:timeoutDate]; + timedout = ![NSApp waitUntilQueryDone:&query->done timeout:timeoutDate processEvents:processEvents]; return !timedout && query->status; } + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout + { + return [self query:query timeout:timeout processEvents:FALSE]; + } + /*********************************************************************** * OnMainThread @@ -470,8 +475,21 @@ void macdrv_set_query_done(macdrv_query *query) macdrv_retain_query(query); OnMainThreadAsync(^{ + NSEvent* event; + query->done = TRUE; macdrv_release_query(query); + + event = [NSEvent otherEventWithType:NSApplicationDefined + location:NSZeroPoint + modifierFlags:0 + timestamp:[[NSProcessInfo processInfo] systemUptime] + windowNumber:0 + context:nil + subtype:WineApplicationEventWakeQuery + data1:0 + data2:0]; + [NSApp postEvent:event atStart:TRUE]; }); } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 512d99e..1fba681 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -240,7 +240,8 @@ DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handle timeout, flags & MWMO_ALERTABLE); } - if (data->current_event) event_mask = 0; /* don't process nested events */ + if (data->current_event && data->current_event->type != QUERY_EVENT) + event_mask = 0; /* don't process nested events */ if (process_events(data->queue, event_mask)) ret = count - 1; else if (count || timeout)

1 0

Ken Thomases : winemac: Synthesize additional bitmap pasteboard types from any that Cocoa can convert .
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 95d5270a0d852b45198a6466aebcca94ee223798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d5270a0d852b45198a6466a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:43 2013 -0500 winemac: Synthesize additional bitmap pasteboard types from any that Cocoa can convert. Mac apps generally put TIFF on the pasteboard, but Windows programs are more likely to handle CF_DIB or CF_BITMAP which map to BMP. --- dlls/winemac.drv/cocoa_clipboard.m | 48 ++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 486cbd0..8d29326 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -25,6 +25,10 @@ static int owned_change_count = -1; +static NSArray* BitmapOutputTypes; +static NSDictionary* BitmapOutputTypeMap; +static dispatch_once_t BitmapOutputTypesInitOnce; + /*********************************************************************** * macdrv_is_pasteboard_owner @@ -54,11 +58,43 @@ CFArrayRef macdrv_copy_pasteboard_types(void) __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + dispatch_once(&BitmapOutputTypesInitOnce, ^{ + NSArray* bitmapFileTypes = [NSArray arrayWithObjects: + [NSNumber numberWithUnsignedInteger:NSTIFFFileType], + [NSNumber numberWithUnsignedInteger:NSPNGFileType], + [NSNumber numberWithUnsignedInteger:NSBMPFileType], + [NSNumber numberWithUnsignedInteger:NSGIFFileType], + [NSNumber numberWithUnsignedInteger:NSJPEGFileType], + [NSNumber numberWithUnsignedInteger:NSJPEG2000FileType], + nil]; + + BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png", + @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", + @"public.jpeg-2000", nil]; + + BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes + forKeys:BitmapOutputTypes]; + }); + OnMainThread(^{ @try { NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSArray* types = [pb types]; + + // If there are any types understood by NSBitmapImageRep, then we + // can offer all of the types that it can output, too. For example, + // if TIFF is on the pasteboard, we can offer PNG, BMP, etc. to the + // Windows program. We'll convert on demand. + if ([types firstObjectCommonWithArray:[NSBitmapImageRep imageTypes]] || + [types firstObjectCommonWithArray:[NSBitmapImageRep imagePasteboardTypes]]) + { + NSMutableArray* newTypes = [BitmapOutputTypes mutableCopy]; + [newTypes removeObjectsInArray:types]; + types = [types arrayByAddingObjectsFromArray:newTypes]; + [newTypes release]; + } + ret = (CFArrayRef)[types copy]; } @catch (id e) @@ -89,6 +125,18 @@ CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) NSPasteboard* pb = [NSPasteboard generalPasteboard]; if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) ret = [[pb dataForType:(NSString*)type] copy]; + else + { + NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; + if (bitmapType) + { + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + ret = [NSBitmapImageRep representationOfImageRepsInArray:reps + usingType:[bitmapType unsignedIntegerValue] + properties:nil]; + ret = [ret copy]; + } + } } @catch (id e) {

1 0

Alexandre Julliard : msvcrt: Export the float math functions on ARM.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 599d080220bd40a8a076a2a08cb08e64b87f54c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599d080220bd40a8a076a2a08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:06:25 2013 +0100 msvcrt: Export the float math functions on ARM. --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.spec | 54 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4570da0..a55ecb6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -68,7 +68,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#ifdef __x86_64__ +#if defined(__x86_64__) || defined(__arm__) /********************************************************************* * _chgsignf (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0bf5ab2..d5cc428 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -351,7 +351,7 @@ @ cdecl _chdir(str) MSVCRT__chdir @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign -@ cdecl -arch=x86_64 _chgsignf(float) MSVCRT__chgsignf +@ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf @ cdecl -i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize @@ -366,7 +366,7 @@ @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign(double double) MSVCRT__copysign -@ cdecl -arch=x86_64 _copysignf(float float) MSVCRT__copysignf +@ cdecl -arch=arm,x86_64 _copysignf(float float) MSVCRT__copysignf @ varargs _cprintf(str) # stub _cprintf_l(str ptr) # stub _cprintf_p(str) @@ -449,7 +449,7 @@ @ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64 @ cdecl _finite(double) MSVCRT__finite -@ cdecl -arch=x86_64 _finitef(float) MSVCRT__finitef +@ cdecl -arch=arm,x86_64 _finitef(float) MSVCRT__finitef @ cdecl _flsbuf(long ptr) MSVCRT__flsbuf @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @@ -625,7 +625,7 @@ @ cdecl _ismbstrail(ptr ptr) # stub _ismbstrail_l(long ptr) @ cdecl _isnan(double) MSVCRT__isnan -@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf +@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @@ -664,7 +664,7 @@ @ cdecl _lock_file(ptr) MSVCRT__lock_file @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb -@ cdecl -arch=x86_64 _logbf(float) MSVCRT__logbf +@ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @@ -834,7 +834,7 @@ # stub -arch=win32 _msize_debug(ptr long) # stub -arch=win64 _msize_dbg(ptr long) @ cdecl _nextafter(double double) MSVCRT__nextafter -@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf +@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf @ cdecl _onexit(ptr) MSVCRT__onexit @ varargs _open(str long) MSVCRT__open @ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle @@ -874,7 +874,7 @@ @ cdecl -arch=i386 _safe_fprem() @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb -@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf +@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf @ varargs _scanf_l(str ptr) MSVCRT__scanf_l @ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l @ varargs _scprintf(str) MSVCRT__scprintf @@ -1238,15 +1238,15 @@ @ cdecl abort() MSVCRT_abort @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos -@ cdecl -arch=x86_64 acosf(float) MSVCRT_acosf +@ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 -@ cdecl -arch=x86_64 asinf(float) MSVCRT_asinf -@ cdecl -arch=x86_64 atanf(float) MSVCRT_atanf -@ cdecl -arch=x86_64 atan2f(float float) MSVCRT_atan2f +@ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf +@ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf +@ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) ntdll.atoi @@ -1256,20 +1256,20 @@ @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil -@ cdecl -arch=x86_64 ceilf(float) MSVCRT_ceilf +@ cdecl -arch=arm,x86_64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr # stub clearerr_s(ptr) @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl cosh(double) MSVCRT_cosh -@ cdecl -arch=x86_64 cosf(float) MSVCRT_cosf -@ cdecl -arch=x86_64 coshf(float) MSVCRT_coshf +@ cdecl -arch=arm,x86_64 cosf(float) MSVCRT_cosf +@ cdecl -arch=arm,x86_64 coshf(float) MSVCRT_coshf @ cdecl ctime(ptr) MSVCRT_ctime @ cdecl difftime(long long) MSVCRT_difftime @ cdecl -ret64 div(long long) MSVCRT_div @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp -@ cdecl -arch=x86_64 expf(float) MSVCRT_expf +@ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf @ cdecl fabs(double) MSVCRT_fabs @ cdecl fclose(ptr) MSVCRT_fclose @ cdecl feof(ptr) MSVCRT_feof @@ -1281,9 +1281,9 @@ @ cdecl fgetwc(ptr) MSVCRT_fgetwc @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor -@ cdecl -arch=x86_64 floorf(float) MSVCRT_floorf +@ cdecl -arch=arm,x86_64 floorf(float) MSVCRT_floorf @ cdecl fmod(double double) MSVCRT_fmod -@ cdecl -arch=x86_64 fmodf(float float) MSVCRT_fmodf +@ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen @ cdecl fopen_s(ptr str str) MSVCRT_fopen_s @ varargs fprintf(ptr str) MSVCRT_fprintf @@ -1297,7 +1297,7 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ cdecl -arch=x86_64 frexpf(float ptr) MSVCRT_frexpf +@ cdecl -arch=arm,x86_64 frexpf(float ptr) MSVCRT_frexpf @ varargs fscanf(ptr str) MSVCRT_fscanf @ varargs fscanf_s(ptr str) MSVCRT_fscanf_s @ cdecl fseek(ptr long long) MSVCRT_fseek @@ -1349,8 +1349,8 @@ @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log @ cdecl log10(double) MSVCRT_log10 -@ cdecl -arch=x86_64 logf(float) MSVCRT_logf -@ cdecl -arch=x86_64 log10f(float) MSVCRT_log10f +@ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf +@ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen @@ -1371,10 +1371,10 @@ @ cdecl memset(ptr long long) ntdll.memset @ cdecl mktime(ptr) MSVCRT_mktime @ cdecl modf(double ptr) MSVCRT_modf -@ cdecl -arch=x86_64 modff(float ptr) MSVCRT_modff +@ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff @ cdecl perror(str) MSVCRT_perror @ cdecl pow(double double) MSVCRT_pow -@ cdecl -arch=x86_64 powf(float float) MSVCRT_powf +@ cdecl -arch=arm,x86_64 powf(float float) MSVCRT_powf @ varargs printf(str) MSVCRT_printf @ varargs printf_s(str) MSVCRT_printf_s @ cdecl putc(long ptr) MSVCRT_putc @@ -1400,12 +1400,12 @@ @ cdecl signal(long long) MSVCRT_signal @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh -@ cdecl -arch=x86_64 sinf(float) MSVCRT_sinf -@ cdecl -arch=x86_64 sinhf(float) MSVCRT_sinhf +@ cdecl -arch=arm,x86_64 sinf(float) MSVCRT_sinf +@ cdecl -arch=arm,x86_64 sinhf(float) MSVCRT_sinhf @ varargs sprintf(ptr str) MSVCRT_sprintf @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s @ cdecl sqrt(double) MSVCRT_sqrt -@ cdecl -arch=x86_64 sqrtf(float) MSVCRT_sqrtf +@ cdecl -arch=arm,x86_64 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s @@ -1444,8 +1444,8 @@ @ cdecl system(str) MSVCRT_system @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh -@ cdecl -arch=x86_64 tanf(float) MSVCRT_tanf -@ cdecl -arch=x86_64 tanhf(float) MSVCRT_tanhf +@ cdecl -arch=arm,x86_64 tanf(float) MSVCRT_tanf +@ cdecl -arch=arm,x86_64 tanhf(float) MSVCRT_tanhf @ cdecl time(ptr) MSVCRT_time @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s

1 0

Alexandre Julliard : msvcrt: Export the ARM version of some mangled names.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 5c4bce668ca0290db6ed89ca8d7eb854f4377214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4bce668ca0290db6ed89ca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 12:41:47 2013 +0100 msvcrt: Export the ARM version of some mangled names. --- dlls/msvcr100/msvcr100.spec | 3 +- dlls/msvcr110/msvcr110.spec | 54 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 78 ++++++++++++++++++++++++++++-------------- 3 files changed, 81 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c4bce668ca0290db6ed8…

1 0

André Hentschel : msvcrt: Add setjmp for ARM in spec file.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: b29e56f205727d0f9f79636e1e50efeb47527376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e56f205727d0f9f79636e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 13 20:06:44 2013 +0100 msvcrt: Add setjmp for ARM in spec file. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 019a41a..b558b06 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1769,7 +1769,7 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 720c056..209cc80 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1422,7 +1422,7 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2b01fc3..8e5cc9b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1368,7 +1368,7 @@ @ varargs scanf(str) MSVCRT_scanf @ varargs scanf_s(str) MSVCRT_scanf_s @ cdecl setbuf(ptr ptr) MSVCRT_setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @ cdecl signal(long long) MSVCRT_signal

1 0

Ken Thomases : winemac: Enable pasteboard functions to operate on arbitrary pasteboards.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 4ae5b106f80eb29ed0b05b74edf054b622fb7ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae5b106f80eb29ed0b05b74e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:04 2013 -0500 winemac: Enable pasteboard functions to operate on arbitrary pasteboards. ... not just the general pasteboard (although the general pasteboard is still the default). --- dlls/winemac.drv/clipboard.c | 12 ++++++------ dlls/winemac.drv/cocoa_clipboard.m | 22 ++++++++++++++-------- dlls/winemac.drv/macdrv_cocoa.h | 4 ++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2219df6..4a6f859 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1326,7 +1326,7 @@ INT CDECL macdrv_CountClipboardFormats(void) return 0; } - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1396,7 +1396,7 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1490,7 +1490,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1526,7 +1526,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) if (best_format) { - CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(best_type); + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(NULL, best_type); TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); @@ -1556,7 +1556,7 @@ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1758,7 +1758,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) if (!types) { - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 8d29326..b8ca796 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -53,8 +53,9 @@ int macdrv_is_pasteboard_owner(void) * the pasteboard, or NULL on error. The caller is responsible for * releasing the returned array with CFRelease(). */ -CFArrayRef macdrv_copy_pasteboard_types(void) +CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -79,8 +80,11 @@ CFArrayRef macdrv_copy_pasteboard_types(void) OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - NSArray* types = [pb types]; + NSPasteboard* local_pb = pb; + NSArray* types; + + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + types = [local_pb types]; // If there are any types understood by NSBitmapImageRep, then we // can offer all of the types that it can output, too. For example, @@ -115,22 +119,24 @@ CFArrayRef macdrv_copy_pasteboard_types(void) * if there's no such type on the pasteboard. The caller is responsible * for releasing the returned data object with CFRelease(). */ -CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) +CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block NSData* ret = nil; OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) - ret = [[pb dataForType:(NSString*)type] copy]; + NSPasteboard* local_pb = pb; + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + if ([local_pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) + ret = [[local_pb dataForType:(NSString*)type] copy]; else { NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; if (bitmapType) { - NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:local_pb]; ret = [NSBitmapImageRep representationOfImageRepsInArray:reps usingType:[bitmapType unsignedIntegerValue] properties:nil]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index bbd3424..95a3720 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -304,8 +304,8 @@ extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard /* clipboard */ -extern CFArrayRef macdrv_copy_pasteboard_types(void) DECLSPEC_HIDDEN; -extern CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) DECLSPEC_HIDDEN; +extern CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) DECLSPEC_HIDDEN; +extern CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) DECLSPEC_HIDDEN; extern int macdrv_is_pasteboard_owner(void) DECLSPEC_HIDDEN; extern void macdrv_clear_pasteboard(void) DECLSPEC_HIDDEN; extern int macdrv_set_pasteboard_data(CFStringRef type, CFDataRef data, macdrv_window w) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot: Integrate the WineTestBot with the patches website.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: tools Branch: master Commit: 62142e91529892c3d7a70b842c31158d2ca00203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=62142e91529892c3d7a70b84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:03:36 2013 +0100 testbot: Integrate the WineTestBot with the patches website. This lets the WineTestBot create jobs for each patch sent to wine-patches. However for now the part that sends the results back to the patches website is disabled to preserve compatibility with the old WineTestBot (see WineSendLog.pl). --- testbot/bin/Engine.pl | 65 -------------- testbot/bin/WinePatchesWebGet.pl | 108 ------------------------ testbot/bin/WinePatchesWebNotify.pl | 55 ------------ testbot/bin/WinePatchesWebSubmit.pl | 92 ++++++++++++++++++++ testbot/bin/WineSendLog.pl | 92 ++++++++++---------- testbot/doc/INSTALL.txt | 21 +---- testbot/lib/WineTestBot/Config.pm | 4 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 - testbot/lib/WineTestBot/Engine/Notify.pm | 20 +---- 9 files changed, 146 insertions(+), 315 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=62142e91529892c3d7a7…

1 0

Piotr Caban : wininet: Rename CACHEFILE_ENTRY to entry_header.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9d98ced7eccd200d81d625828c20ae499bca0b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d98ced7eccd200d81d625828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:23 2013 +0100 wininet: Rename CACHEFILE_ENTRY to entry_header. --- dlls/wininet/urlcache.c | 156 +++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d98ced7eccd200d81d62…

1 0

Piotr Caban : wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used .
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9d6843a8c1f0eaa041e49126f3318055976f216f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6843a8c1f0eaa041e49126f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:05:51 2013 +0100 wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used. --- dlls/wininet/tests/http.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c2607dc..eeec7c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1072,6 +1072,10 @@ static void InternetOpenUrlA_test(void) DWORD size, readbytes, totalbytes=0; BOOL ret; + ret = DeleteUrlCacheEntry(TEST_URL); + ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, + "DeleteUrlCacheEntry returned %x, GetLastError() = %d\n", ret, GetLastError()); + myhinternet = InternetOpen("Winetest",0,NULL,NULL,INTERNET_FLAG_NO_CACHE_WRITE); ok((myhinternet != 0), "InternetOpen failed, error %u\n",GetLastError()); size = 0x400; @@ -1093,6 +1097,9 @@ static void InternetOpenUrlA_test(void) InternetCloseHandle(myhttp); InternetCloseHandle(myhinternet); + + ret = DeleteUrlCacheEntry(TEST_URL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "INTERNET_FLAG_NO_CACHE_WRITE flag doesn't work\n"); } static void HttpSendRequestEx_test(void)

1 0

Piotr Caban : wininet: Don't create cache file if it's forbidden.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: bbbc6d119bd353a71dc475d61358372342a388b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbc6d119bd353a71dc475d61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:05:41 2013 +0100 wininet: Don't create cache file if it's forbidden. --- dlls/wininet/http.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a019095..a3f68ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2261,15 +2261,35 @@ static void commit_cache_entry(http_request_t *req) static void create_cache_entry(http_request_t *req) { + static const WCHAR no_cacheW[] = {'n','o','-','c','a','c','h','e',0}; + static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; + WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR file_name[MAX_PATH+1]; - BOOL b; + BOOL b = TRUE; /* FIXME: We should free previous cache file earlier */ heap_free(req->cacheFile); CloseHandle(req->hCacheFile); req->hCacheFile = NULL; + if(req->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) + b = FALSE; + + if(b) { + int header_idx = HTTP_GetCustomHeaderIndex(req, szCache_Control, 0, FALSE); + if(header_idx!=-1 && (!strcmpiW(req->custHeaders[header_idx].lpszValue, no_cacheW) + || !strcmpiW(req->custHeaders[header_idx].lpszValue, no_storeW))) + b = FALSE; + } + + if(!b) { + if(!(req->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) + return; + + FIXME("INTERNET_FLAG_NEED_FILE is not supported correctly\n"); + } + b = HTTP_GetRequestURL(req, url); if(!b) { WARN("Could not get URL\n");

1 0