January 2014 - Wine-commits

Dmitry Timoshkov : crypt32: Add another root store path to the certificate location list.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: f97d68f454c8961f6735aa3c604341d00707bd0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97d68f454c8961f6735aa3c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 16:10:26 2013 +0900 crypt32: Add another root store path to the certificate location list. (cherry picked from commit 84029a836f3dadd147b7e9149d725073ee00ec67) --- dlls/crypt32/rootstore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 4e4e4e4..9f3efcf 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -485,6 +485,7 @@ static const char * const CRYPT_knownLocations[] = { "/etc/ssl/certs/ca-certificates.crt", "/etc/ssl/certs", "/etc/pki/tls/certs/ca-bundle.crt", + "/usr/share/ca-certificates/ca-bundle.crt", "/usr/local/share/certs/", "/etc/sfw/openssl/certs", };

1 0

Ken Thomases : winemac: Don' t coalesce events which might be in multiple queues.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 030abf335ae80278ae0df1a482fa3be2c7e3a5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=030abf335ae80278ae0df1a48… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:43:31 2013 -0500 winemac: Don't coalesce events which might be in multiple queues. (cherry picked from commit 9deb00bfdcb827510dc99fa640b2fefef066733e) --- dlls/winemac.drv/cocoa_event.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 8d997d0..63cf0e7 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -159,9 +159,11 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea if ((event->event->type == MOUSE_MOVED || event->event->type == MOUSE_MOVED_ABSOLUTE) && + event->event->deliver == INT_MAX && (lastEvent = [events lastObject]) && (lastEvent->event->type == MOUSE_MOVED || lastEvent->event->type == MOUSE_MOVED_ABSOLUTE) && + lastEvent->event->deliver == INT_MAX && lastEvent->event->window == event->event->window && lastEvent->event->mouse_moved.drag == event->event->mouse_moved.drag) {

1 0

Ken Thomases : winemac: Clean up fully-delivered events in queues which aren't being drained.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: d8d8c1a2a759813b289a5444fcbc7cf5039175f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d8c1a2a759813b289a5444f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:43:49 2013 -0500 winemac: Clean up fully-delivered events in queues which aren't being drained. Some events get queued for all GUI-connected threads but are only processed by the first to dequeue them. Other threads which tend their event queue discard such already-processed events. However, some threads may be connected to the GUI but never tend their event queue. To prevent such threads from accumulating zombie events, the zombies are cleared each time a new event is queued. (cherry picked from commit 761092a2fec5dea6dcbceff5d8dd022f8b1925d3) --- dlls/winemac.drv/cocoa_event.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 63cf0e7..621729f 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -153,10 +153,16 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea - (void) postEventObject:(MacDrvEvent*)event { + NSIndexSet* indexes; MacDrvEvent* lastEvent; [eventsLock lock]; + indexes = [events indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop){ + return ((MacDrvEvent*)obj)->event->deliver <= 0; + }]; + [events removeObjectsAtIndexes:indexes]; + if ((event->event->type == MOUSE_MOVED || event->event->type == MOUSE_MOVED_ABSOLUTE) && event->event->deliver == INT_MAX &&

1 0

Ken Thomases : winemac: Treat mouse moves in a window title bar as outside the window.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 8d0b683fcb9d11f73c50edefb47f791785890401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0b683fcb9d11f73c50edefb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:44:43 2013 -0500 winemac: Treat mouse moves in a window title bar as outside the window. Don't queue mouse-moved events. Reset the cursor. (cherry picked from commit 8747df094d7470afac80a43c7e63adfc595b4252) --- dlls/winemac.drv/cocoa_app.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4f54d93..3d89082 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1352,6 +1352,8 @@ int macdrv_err_on; windowUnderNumber = [NSWindow windowNumberAtPoint:point belowWindowWithWindowNumber:0]; targetWindow = (WineWindow*)[NSApp windowWithWindowNumber:windowUnderNumber]; + if (!NSMouseInRect(point, [targetWindow contentRectForFrameRect:[targetWindow frame]], NO)) + targetWindow = nil; } if ([targetWindow isKindOfClass:[WineWindow class]])

1 0

Ken Thomases : winemac: Restore app cursor settings when cursor moves back into an app window.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 64fdb8ab0f763c9295064d24f24b1e40d4d6af6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fdb8ab0f763c9295064d24f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 23:45:52 2013 -0500 winemac: Restore app cursor settings when cursor moves back into an app window. The code had previously set the cursor back to the standard arrow and unhid it when it left all app windows. Now it restores the cursor image that the app set and re-hides it if necessary when it moves back over any app window. (cherry picked from commit 1c049e5031ff6ca3dc2ee874493aa6e685e8e9c2) --- dlls/winemac.drv/cocoa_app.h | 3 ++ dlls/winemac.drv/cocoa_app.m | 80 ++++++++++++++++++++++++++++++++---------- 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index a398bf1..07a4bc8 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -73,7 +73,10 @@ enum { NSArray* cursorFrames; int cursorFrame; NSTimer* cursorTimer; + NSCursor* cursor; + BOOL cursorIsCurrent; BOOL cursorHidden; + BOOL clientWantsCursorHidden; BOOL clippingCursor; CGRect cursorClipRect; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3d89082..1cc8d2d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -80,6 +80,7 @@ int macdrv_err_on; @property (readwrite, copy, nonatomic) NSEvent* lastFlagsChanged; @property (copy, nonatomic) NSArray* cursorFrames; @property (retain, nonatomic) NSTimer* cursorTimer; +(a)property (retain, nonatomic) NSCursor* cursor; @property (retain, nonatomic) NSImage* applicationIcon; @property (readonly, nonatomic) BOOL inputSourceIsInputMethod; @property (retain, nonatomic) WineWindow* mouseCaptureWindow; @@ -96,7 +97,7 @@ int macdrv_err_on; @synthesize keyboardType, lastFlagsChanged; @synthesize applicationIcon; - @synthesize cursorFrames, cursorTimer; + @synthesize cursorFrames, cursorTimer, cursor; @synthesize mouseCaptureWindow; + (void) initialize @@ -172,6 +173,7 @@ int macdrv_err_on; - (void) dealloc { + [cursor release]; [screenFrameCGRects release]; [applicationIcon release]; [warpRecords release]; @@ -785,21 +787,69 @@ int macdrv_err_on; return ([originalDisplayModes count] > 0 || displaysCapturedForFullscreen); } + - (void) updateCursor + { + if (lastTargetWindow) + { + if (clientWantsCursorHidden && !cursorHidden) + { + [NSCursor hide]; + cursorHidden = TRUE; + } + + if (!cursorIsCurrent) + { + [cursor set]; + cursorIsCurrent = TRUE; + } + + if (!clientWantsCursorHidden && cursorHidden) + { + [NSCursor unhide]; + cursorHidden = FALSE; + } + } + else + { + if (cursorIsCurrent) + { + [[NSCursor arrowCursor] set]; + cursorIsCurrent = FALSE; + } + if (cursorHidden) + { + [NSCursor unhide]; + cursorHidden = FALSE; + } + } + } + - (void) hideCursor { - if (!cursorHidden) + if (!clientWantsCursorHidden) { - [NSCursor hide]; - cursorHidden = TRUE; + clientWantsCursorHidden = TRUE; + [self updateCursor]; } } - (void) unhideCursor { - if (cursorHidden) + if (clientWantsCursorHidden) { - [NSCursor unhide]; - cursorHidden = FALSE; + clientWantsCursorHidden = FALSE; + [self updateCursor]; + } + } + + - (void) setCursor:(NSCursor*)newCursor + { + if (newCursor != cursor) + { + [cursor release]; + cursor = [newCursor retain]; + cursorIsCurrent = FALSE; + [self updateCursor]; } } @@ -810,15 +860,12 @@ int macdrv_err_on; NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize]; CFDictionaryRef hotSpotDict = (CFDictionaryRef)[frame objectForKey:@"hotSpot"]; CGPoint hotSpot; - NSCursor* cursor; if (!CGPointMakeWithDictionaryRepresentation(hotSpotDict, &hotSpot)) hotSpot = CGPointZero; - cursor = [[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)]; + self.cursor = [[[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)] autorelease]; [image release]; - [cursor set]; [self unhideCursor]; - [cursor release]; } - (void) nextCursorFrame:(NSTimer*)theTimer @@ -1466,12 +1513,10 @@ int macdrv_err_on; lastTargetWindow = targetWindow; } - else if (lastTargetWindow) - { - [[NSCursor arrowCursor] set]; - [self unhideCursor]; + else lastTargetWindow = nil; - } + + [self updateCursor]; } - (void) handleMouseButton:(NSEvent*)theEvent @@ -2245,9 +2290,8 @@ void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) { OnMainThreadAsync(^{ WineApplicationController* controller = [WineApplicationController sharedController]; - NSCursor* cursor = [NSCursor performSelector:sel]; [controller setCursorWithFrames:nil]; - [cursor set]; + controller.cursor = [NSCursor performSelector:sel]; [controller unhideCursor]; }); }

1 0

Ken Thomases : winemac: Fix some bytes-vs-WCHARs length computation bugs in the UTF-16 clipboard support.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 30dbd70dd5cb95021f5de05522ff81a6f52c6e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30dbd70dd5cb95021f5de0552… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:54:49 2013 -0500 winemac: Fix some bytes-vs-WCHARs length computation bugs in the UTF-16 clipboard support. (cherry picked from commit c7f8e71ab6e766003faaf0bde9edee64c1f1b3e4) --- dlls/winemac.drv/clipboard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 80fd689..9cfe283 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1007,7 +1007,7 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data) HANDLE unicode_handle; src = (const WCHAR *)CFDataGetBytePtr(data); - data_len = CFDataGetLength(data); + data_len = CFDataGetLength(data) / sizeof(WCHAR); for (i = 0; i < data_len; i++) { if (src[i] == '\n') @@ -1358,13 +1358,13 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) dst_len = GlobalSize(data) / sizeof(WCHAR); if (dst_len) dst_len--; /* Leave off null terminator. */ - ret = CFDataCreateMutable(NULL, dst_len); + ret = CFDataCreateMutable(NULL, dst_len * sizeof(WCHAR)); if (ret) { LPWSTR dst; int i, j; - CFDataSetLength(ret, dst_len); + CFDataSetLength(ret, dst_len * sizeof(WCHAR)); dst = (LPWSTR)CFDataGetMutableBytePtr(ret); /* Remove carriage returns */ @@ -1375,7 +1375,7 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) continue; dst[j++] = src[i]; } - CFDataSetLength(ret, j); + CFDataSetLength(ret, j * sizeof(WCHAR)); } GlobalUnlock(data);

1 0

Ken Thomases : winemac: Rename some confusingly-named variables.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 5e372cdaee65b7a12027aaaef246c834d2d8e660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e372cdaee65b7a12027aaaef… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:00 2013 -0500 winemac: Rename some confusingly-named variables. (cherry picked from commit 49197e811bb1f1cbf5f0a669db464060a1bcec91) --- dlls/winemac.drv/clipboard.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 9cfe283..73c4dfa 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -918,25 +918,25 @@ static HANDLE import_utf8_to_text(CFDataRef data) static HANDLE import_utf8_to_unicodetext(CFDataRef data) { const BYTE *src; - unsigned long data_len; + unsigned long src_len; unsigned long new_lines = 0; LPSTR dst; unsigned long i, j; HANDLE unicode_handle = NULL; src = CFDataGetBytePtr(data); - data_len = CFDataGetLength(data); - for (i = 0; i < data_len; i++) + src_len = CFDataGetLength(data); + for (i = 0; i < src_len; i++) { if (src[i] == '\n') new_lines++; } - if ((dst = HeapAlloc(GetProcessHeap(), 0, data_len + new_lines + 1))) + if ((dst = HeapAlloc(GetProcessHeap(), 0, src_len + new_lines + 1))) { UINT count; - for (i = 0, j = 0; i < data_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\n') dst[j++] = '\r'; @@ -1000,25 +1000,25 @@ static HANDLE import_utf16_to_text(CFDataRef data) static HANDLE import_utf16_to_unicodetext(CFDataRef data) { const WCHAR *src; - unsigned long data_len; + unsigned long src_len; unsigned long new_lines = 0; LPWSTR dst; unsigned long i, j; HANDLE unicode_handle; src = (const WCHAR *)CFDataGetBytePtr(data); - data_len = CFDataGetLength(data) / sizeof(WCHAR); - for (i = 0; i < data_len; i++) + src_len = CFDataGetLength(data) / sizeof(WCHAR); + for (i = 0; i < src_len; i++) { if (src[i] == '\n') new_lines++; } - if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (data_len + new_lines + 1) * sizeof(WCHAR)))) + if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (src_len + new_lines + 1) * sizeof(WCHAR)))) { dst = GlobalLock(unicode_handle); - for (i = 0, j = 0; i < data_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\n') dst[j++] = '\r'; @@ -1351,27 +1351,27 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) { CFMutableDataRef ret; const WCHAR *src; - INT dst_len; + INT src_len; src = GlobalLock(data); if (!src) return NULL; - dst_len = GlobalSize(data) / sizeof(WCHAR); - if (dst_len) dst_len--; /* Leave off null terminator. */ - ret = CFDataCreateMutable(NULL, dst_len * sizeof(WCHAR)); + src_len = GlobalSize(data) / sizeof(WCHAR); + if (src_len) src_len--; /* Leave off null terminator. */ + ret = CFDataCreateMutable(NULL, src_len * sizeof(WCHAR)); if (ret) { LPWSTR dst; int i, j; - CFDataSetLength(ret, dst_len * sizeof(WCHAR)); + CFDataSetLength(ret, src_len * sizeof(WCHAR)); dst = (LPWSTR)CFDataGetMutableBytePtr(ret); /* Remove carriage returns */ - for (i = 0, j = 0; i < dst_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\r' && - (i + 1 >= dst_len || src[i + 1] == '\n' || src[i + 1] == '\0')) + (i + 1 >= src_len || src[i + 1] == '\n' || src[i + 1] == '\0')) continue; dst[j++] = src[i]; }

1 0

Ken Thomases : winemac: Fix a leak in macdrv_CountClipboardFormats(). ( Clang).
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 4f6faca93282bf6199265f178e7c7e6a81c1addd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6faca93282bf6199265f178… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:21 2013 -0500 winemac: Fix a leak in macdrv_CountClipboardFormats(). (Clang). (cherry picked from commit 3ececfd2a5dd5d183511425f24cfbd0aeb9e58f8) --- dlls/winemac.drv/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 73c4dfa..ee63c10 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1716,6 +1716,7 @@ INT CDECL macdrv_CountClipboardFormats(void) } } + CFRelease(types); CFRelease(seen_formats); TRACE(" -> %d\n", ret); return ret;

1 0

Ken Thomases : winecoreaudio: Fix a potential leak. (Clang).
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 4023330c4481c2e1e291091d91e612bafbaa73b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4023330c4481c2e1e291091d9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:39 2013 -0500 winecoreaudio: Fix a potential leak. (Clang). (cherry picked from commit 9a7993045e968ce33fdc51cccef0b3fa5bff1a7a) --- dlls/winecoreaudio.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 491fc7e..8593e9c 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -810,8 +810,8 @@ void MIDIIn_SendMessage(MIDIMessage msg) { CFMessagePortSendRequest(messagePort, 0, data, 0.0, 0.0, NULL, NULL); CFRelease(data); - CFRelease(messagePort); } + CFRelease(messagePort); } static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info)

1 0

Ken Thomases : libwine: Fix a potential write through a null pointer. ( Clang).
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: acc524066b5a6cce6bbef354f0594f105a8803ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc524066b5a6cce6bbef354f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:47 2013 -0500 libwine: Fix a potential write through a null pointer. (Clang). (cherry picked from commit e577e4b3e646b0a296ce9bbd73f728cc3f92c20e) --- libs/wine/loader.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 4e78116..42cd6f5 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -880,10 +880,13 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize { if (pread( fd, magic, 2, 0 ) == 2 && magic[0] == 'M' && magic[1] == 'Z') { - static const char msg[] = "MZ format"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; + if (error && errorsize) + { + static const char msg[] = "MZ format"; + size_t len = min( errorsize, sizeof(msg) ); + memcpy( error, msg, len ); + error[len - 1] = 0; + } close( fd ); return NULL; }

1 0