January 2014 - Wine-Commits

Piotr Caban : comctl32: Fix UDM_GETPOS behaviour on out of range values.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 282205e06c882a7b714eba49d5ac77a182d66737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282205e06c882a7b714eba49d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:51 2013 +0200 comctl32: Fix UDM_GETPOS behaviour on out of range values. (cherry picked from commit e58af930ff2b54e543fceaa35148596e864be220) --- dlls/comctl32/updown.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 2373031..0761774 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -482,6 +482,25 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) return 0; } +static int UPDOWN_GetPos(UPDOWN_INFO *infoPtr, BOOL *err) +{ + BOOL succ = UPDOWN_GetBuddyInt(infoPtr); + int val = infoPtr->CurVal; + + if(!UPDOWN_InBounds(infoPtr, val)) { + if((infoPtr->MinVal < infoPtr->MaxVal && val < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && val > infoPtr->MinVal)) + val = infoPtr->MinVal; + else + val = infoPtr->MaxVal; + + succ = FALSE; + } + + if(err) *err = !succ; + return val; +} + static int UPDOWN_SetPos(UPDOWN_INFO *infoPtr, int pos) { int ret = infoPtr->CurVal; @@ -1090,8 +1109,11 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case UDM_GETPOS: { - BOOL ret = UPDOWN_GetBuddyInt (infoPtr); - return MAKELONG(infoPtr->CurVal, ret ? 0 : 1); + BOOL err; + int pos; + + pos = UPDOWN_GetPos(infoPtr, &err); + return MAKELONG(pos, err); } case UDM_SETPOS: { @@ -1119,9 +1141,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case UDM_GETPOS32: { - BOOL ret = UPDOWN_GetBuddyInt (infoPtr); - if ((LPBOOL)lParam) *((LPBOOL)lParam) = !ret; - return infoPtr->CurVal; + return UPDOWN_GetPos(infoPtr, (BOOL*)lParam); } case UDM_SETPOS32: {

1 0

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

Jan. 10, 2014

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 Jan. 10, 2014

Jan. 10, 2014

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 : libwine: Fix a potential write through a null pointer. ( Clang).
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

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

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

Jan. 10, 2014

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

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 6c2bb5cdaa4e19d5564d003773918fd073c9dcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2bb5cdaa4e19d5564d00377… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Oct 16 11:29:52 2013 +0300 readme: Update Finnish translation. (cherry picked from commit 623230b3ccc0591eef2791fa846c216d22a653cd) --- documentation/README.fi | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/README.fi b/documentation/README.fi index 780cf43..15b8302 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -52,6 +52,7 @@ Tietoa NetBSD:lle: Tietoa Mac OS X:lle: Winen onnistuneeseen kääntämiseen x86:lla tarvitaan Xcode 2.4 tai uudempi. + Mac-ajuri vaatii OS X 10.6:n tai uudemman, ja sitä ei käännetä 10.5:ssä. Tuetut tiedostojärjestelmät:

1 0

Andrew Eikum : oleaut32: Also register typelibs in the opposite registry mode.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: b3f73b46b3c559d77251cc3f96e3b2da69d0f68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f73b46b3c559d77251cc3f9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 16 08:21:10 2013 -0500 oleaut32: Also register typelibs in the opposite registry mode. (cherry picked from commit fbffa8935e8c2c392418e6d91fa5424fc157a25b) --- dlls/oleaut32/typelib.c | 105 +++++++++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 44 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 73f2ec4..18522a0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -511,6 +511,57 @@ static const WCHAR HELPDIRW[] = {'H','E','L','P','D','I','R',0}; static const WCHAR ProxyStubClsidW[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d',0}; static const WCHAR ProxyStubClsid32W[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; +static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *tattr, DWORD flag) +{ + WCHAR keyName[60]; + HKEY key, subKey; + + static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + + get_interface_key( &tattr->guid, keyName ); + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, + KEY_WRITE | flag, NULL, &key, NULL) == ERROR_SUCCESS) + { + if (name) + RegSetValueExW(key, NULL, 0, REG_SZ, + (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); + + if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (const BYTE *)PSOA, sizeof PSOA); + RegCloseKey(subKey); + } + + if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (const BYTE *)PSOA, sizeof PSOA); + RegCloseKey(subKey); + } + + if (RegCreateKeyExW(key, TypeLibW, 0, NULL, 0, + KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) + { + WCHAR buffer[40]; + static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; + static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; + + StringFromGUID2(&libattr->guid, buffer, 40); + RegSetValueExW(subKey, NULL, 0, REG_SZ, + (BYTE *)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); + sprintfW(buffer, fmtver, libattr->wMajorVerNum, libattr->wMinorVerNum); + RegSetValueExW(subKey, VersionW, 0, REG_SZ, + (BYTE*)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); + RegCloseKey(subKey); + } + + RegCloseKey(key); + } +} + /****************************************************************************** * RegisterTypeLib [OLEAUT32.163] * Adds information about a type library to the System Registry @@ -529,9 +580,6 @@ HRESULT WINAPI RegisterTypeLib( OLECHAR * szHelpDir) /* [in] dir to the helpfile for the library, may be NULL*/ { - static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; HRESULT res; TLIBATTR *attr; WCHAR keyName[60]; @@ -706,47 +754,16 @@ HRESULT WINAPI RegisterTypeLib( if ((kind == TKIND_INTERFACE && (tattr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || kind == TKIND_DISPATCH) { - /* register interface<->typelib coupling */ - get_interface_key( &tattr->guid, keyName ); - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) - { - if (name) - RegSetValueExW(key, NULL, 0, REG_SZ, - (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); - - if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); - RegCloseKey(subKey); - } - - if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); - RegCloseKey(subKey); - } - - if (RegCreateKeyExW(key, TypeLibW, 0, NULL, 0, - KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) - { - WCHAR buffer[40]; - static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; - static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; - - StringFromGUID2(&attr->guid, buffer, 40); - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (BYTE *)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); - sprintfW(buffer, fmtver, attr->wMajorVerNum, attr->wMinorVerNum); - RegSetValueExW(subKey, VersionW, 0, REG_SZ, - (BYTE*)buffer, (strlenW(buffer)+1) * sizeof(WCHAR)); - RegCloseKey(subKey); - } - - RegCloseKey(key); - } + BOOL is_wow64; + DWORD opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); + + /* register interface<->typelib coupling */ + TLB_register_interface(attr, name, tattr, 0); + + /* register TLBs into the opposite registry view, too */ + if(opposite == KEY_WOW64_32KEY || + (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)) + TLB_register_interface(attr, name, tattr, opposite); } ITypeInfo_ReleaseTypeAttr(tinfo, tattr);

1 0

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

Jan. 10, 2014

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 Jan. 10, 2014

Jan. 10, 2014

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: Restore app cursor settings when cursor moves back into an app window.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

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