November 2015 - Wine-commits

Jacek Caban : comctl32: Don't use comparisons to FALSE.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 67819d6ee9b7a69e1bfd4264cab110e37e582c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67819d6ee9b7a69e1bfd4264c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 16:21:17 2015 +0100 comctl32: Don't use comparisons to FALSE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9121266..890c18e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3152,7 +3152,7 @@ TOOLBAR_CheckButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) bChecked = (btnPtr->fsState & TBSTATE_CHECKED) != 0; - if (LOWORD(lParam) == FALSE) + if (!LOWORD(lParam)) btnPtr->fsState &= ~TBSTATE_CHECKED; else { if (btnPtr->fsStyle & BTNS_GROUP) { @@ -3284,7 +3284,7 @@ TOOLBAR_EnableButton (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) bState = btnPtr->fsState & TBSTATE_ENABLED; /* update the toolbar button state */ - if(LOWORD(lParam) == FALSE) { + if(!LOWORD(lParam)) { btnPtr->fsState &= ~(TBSTATE_ENABLED | TBSTATE_PRESSED); } else { btnPtr->fsState |= TBSTATE_ENABLED;

1 0

Jacek Caban : ntdll: Added a few registry stubs.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 0b33b80f6e906c674683309f65f7b892eccce7e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b33b80f6e906c674683309f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 18:14:50 2015 +0100 ntdll: Added a few registry stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 10 ++++++++-- dlls/ntdll/reg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 23261ed..d285561 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -130,6 +130,7 @@ @ stdcall NtCreateJobObject(ptr long ptr) # @ stub NtCreateJobSet @ stdcall NtCreateKey(ptr long ptr long ptr long long) +@ stdcall NtCreateKeyTransacted(ptr long ptr long ptr long long long) @ stdcall NtCreateKeyedEvent(ptr long ptr long) @ stdcall NtCreateMailslotFile(long long long long long long long long) @ stdcall NtCreateMutant(ptr long ptr long) @@ -214,6 +215,8 @@ @ stdcall NtOpenJobObject(ptr long ptr) @ stdcall NtOpenKey(ptr long ptr) @ stdcall NtOpenKeyEx(ptr long ptr long) +@ stdcall NtOpenKeyTransacted(ptr long ptr long) +@ stdcall NtOpenKeyTransactedEx(ptr long ptr long long) @ stdcall NtOpenKeyedEvent(ptr long ptr) @ stdcall NtOpenMutant(ptr long ptr) @ stub NtOpenObjectAuditAlarm @@ -292,7 +295,7 @@ @ stdcall NtReleaseSemaphore(long long ptr) @ stdcall NtRemoveIoCompletion(ptr ptr ptr ptr ptr) # @ stub NtRemoveProcessDebug -# @ stub NtRenameKey +@ stdcall NtRenameKey(long ptr) @ stdcall NtReplaceKey(ptr long ptr) @ stub NtReplyPort @ stdcall NtReplyWaitReceivePort(ptr ptr ptr ptr) @@ -1047,6 +1050,7 @@ @ stdcall ZwCreateJobObject(ptr long ptr) NtCreateJobObject # @ stub ZwCreateJobSet @ stdcall ZwCreateKey(ptr long ptr long ptr long long) NtCreateKey +@ stdcall ZwCreateKeyTransacted(ptr long ptr long ptr long long long) NtCreateKeyTransacted @ stdcall ZwCreateKeyedEvent(ptr long ptr long) NtCreateKeyedEvent @ stdcall ZwCreateMailslotFile(long long long long long long long long) NtCreateMailslotFile @ stdcall ZwCreateMutant(ptr long ptr long) NtCreateMutant @@ -1130,6 +1134,8 @@ @ stdcall ZwOpenJobObject(ptr long ptr) NtOpenJobObject @ stdcall ZwOpenKey(ptr long ptr) NtOpenKey @ stdcall ZwOpenKeyEx(ptr long ptr long) NtOpenKeyEx +@ stdcall ZwOpenKeyTransacted(ptr long ptr long) NtOpenKeyTransacted +@ stdcall ZwOpenKeyTransactedEx(ptr long ptr long long) NtOpenKeyTransactedEx @ stdcall ZwOpenKeyedEvent(ptr long ptr) NtOpenKeyedEvent @ stdcall ZwOpenMutant(ptr long ptr) NtOpenMutant @ stub ZwOpenObjectAuditAlarm @@ -1208,7 +1214,7 @@ @ stdcall ZwReleaseSemaphore(long long ptr) NtReleaseSemaphore @ stdcall ZwRemoveIoCompletion(ptr ptr ptr ptr ptr) NtRemoveIoCompletion # @ stub ZwRemoveProcessDebug -# @ stub ZwRenameKey +@ stdcall ZwRenameKey(long ptr) NtRenameKey @ stdcall ZwReplaceKey(ptr long ptr) NtReplaceKey @ stub ZwReplyPort @ stdcall ZwReplyWaitReceivePort(ptr ptr ptr ptr) NtReplyWaitReceivePort diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 5248595..0701426 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -84,6 +84,21 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT return ret; } +NTSTATUS WINAPI NtCreateKeyTransacted( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, + HANDLE transacted, ULONG *dispos ) +{ + FIXME( "(%p,%s,%s,%x,%x,%p,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), + debugstr_us(class), options, access, transacted, retkey ); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI NtRenameKey( HANDLE handle, UNICODE_STRING *name ) +{ + FIXME( "(%p %s)\n", handle, debugstr_us(name) ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************************** * RtlpNtCreateKey [NTDLL.@] * @@ -151,6 +166,19 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR return NtOpenKeyEx( retkey, access, attr, 0 ); } +NTSTATUS WINAPI NtOpenKeyTransactedEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + ULONG options, HANDLE transaction ) +{ + FIXME( "(%p %x %p %x %p)\n", retkey, access, attr, options, transaction ); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI NtOpenKeyTransacted( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + HANDLE transaction ) +{ + return NtOpenKeyTransactedEx( retkey, access, attr, 0, transaction ); +} + /****************************************************************************** * RtlpNtOpenKey [NTDLL.@] *

1 0

Nikolay Sivov : hnetcfg: Store protocol for INetFwOpenPort.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 341ddeb3c139ad9c9ee272853bf79c93bc32bf61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341ddeb3c139ad9c9ee272853… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 21:21:34 2015 +0300 hnetcfg: Store protocol for INetFwOpenPort. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 0ef2a1d..c79c997 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -39,6 +39,7 @@ typedef struct fw_port INetFwOpenPort INetFwOpenPort_iface; LONG refs; BSTR name; + NET_FW_IP_PROTOCOL protocol; } fw_port; static inline fw_port *impl_from_INetFwOpenPort( INetFwOpenPort *iface ) @@ -227,8 +228,13 @@ static HRESULT WINAPI fw_port_put_Protocol( { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %u\n", This, ipProtocol); - return E_NOTIMPL; + TRACE("%p %u\n", This, ipProtocol); + + if (ipProtocol != NET_FW_IP_PROTOCOL_TCP && ipProtocol != NET_FW_IP_PROTOCOL_UDP) + return E_INVALIDARG; + + This->protocol = ipProtocol; + return S_OK; } static HRESULT WINAPI fw_port_get_Port( @@ -361,6 +367,7 @@ HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp->INetFwOpenPort_iface.lpVtbl = &fw_port_vtbl; fp->refs = 1; fp->name = NULL; + fp->protocol = NET_FW_IP_PROTOCOL_TCP; *ppObj = &fp->INetFwOpenPort_iface;

1 0

Nikolay Sivov : hnetcfg: Store port number for INetFwOpenPort.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: b7a67eb30f314a37de77fa29d3a684226ba1e657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a67eb30f314a37de77fa29d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 21:21:35 2015 +0300 hnetcfg: Store port number for INetFwOpenPort. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index c79c997..4cc1ba6 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -40,6 +40,7 @@ typedef struct fw_port LONG refs; BSTR name; NET_FW_IP_PROTOCOL protocol; + LONG port; } fw_port; static inline fw_port *impl_from_INetFwOpenPort( INetFwOpenPort *iface ) @@ -253,8 +254,9 @@ static HRESULT WINAPI fw_port_put_Port( { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %d\n", This, portNumber); - return E_NOTIMPL; + TRACE("%p %d\n", This, portNumber); + This->port = portNumber; + return S_OK; } static HRESULT WINAPI fw_port_get_Scope( @@ -368,6 +370,7 @@ HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp->refs = 1; fp->name = NULL; fp->protocol = NET_FW_IP_PROTOCOL_TCP; + fp->port = 0; *ppObj = &fp->INetFwOpenPort_iface;

1 0

Andrew Eikum : maintainers: Add myself to a few entries.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: fab05936921661e6b99589ce4010cd1bc61216da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab05936921661e6b99589ce4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 9 13:08:44 2015 -0600 maintainers: Add myself to a few entries. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 41e2ffe..19c390d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -35,6 +35,7 @@ F: dlls/mmdevapi/ F: dlls/winealsa.drv/ F: dlls/winecoreaudio.drv/ F: dlls/wineoss.drv/ +F: dlls/winepulse.drv/ F: dlls/winmm/ F: dlls/x3daudio*/ F: dlls/xapofx*/ @@ -236,6 +237,7 @@ F: dlls/msxml*/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Alex Henrie <alexhenrie24(a)gmail.com> +P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com>

1 0

Ken Thomases : winemac: Check the window' s display link after adding it as a child of another window, which may order it on screen.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: d6574111c20d130a40c09ce0762ceb0a5461ada0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6574111c20d130a40c09ce07… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 9 20:31:21 2015 -0600 winemac: Check the window's display link after adding it as a child of another window, which may order it on screen. This fixes a problem where child windows ("owned" windows in Windows parlance) would never display their contents on OS X 10.8 or earlier. Beginning with 10.9, Cocoa calls -windowDidChangeOcclusionState: when the window becomes visible, which is why they display on that version and later. Reported by Huw Davies. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 666a953..49afd18 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1041,6 +1041,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if ([self level] > [child level]) [child setLevel:[self level]]; [self addChildWindow:child ordered:NSWindowAbove]; + [child checkWineDisplayLink]; [latentChildWindows removeObjectIdenticalTo:child]; child.latentParentWindow = nil; reordered = TRUE;

1 0

Ken Thomases : winemac: Stop the CVDisplayLink when there are no more changes to flush.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: b4fc81bdf28264c381719966ead058fcafe299ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4fc81bdf28264c381719966e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 9 20:31:22 2015 -0600 winemac: Stop the CVDisplayLink when there are no more changes to flush. The change to a CVDisplayLink-driven display mechanism introduced a problem: a Wine process never went completely idle for long periods. The display link would fire for every refresh cycle of the display, waking a CPU from idle and wasting energy. To fix that, I have the display link stop itself when it determines that none of its windows need to be displayed. When a window is subsequently marked as needing display, it either temporarily re-enables Cocoa's normal autodisplay mechanism so that it displays at the end of the current turn of the run loop, or it restarts the display link. It chooses the former if it's been a long time since the window was last displayed so that the display is done more immediately. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 116 ++++++++++++++++++++++++++++++++++------ 2 files changed, 102 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 5d581b2..19e5778 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -44,6 +44,7 @@ pthread_mutex_t* surface_mutex; CGDirectDisplayID _lastDisplayID; + NSTimeInterval _lastDisplayTime; NSBezierPath* shape; NSData* shapeData; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 49afd18..15fa16f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -161,6 +161,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif CGDirectDisplayID _displayID; CVDisplayLinkRef _link; NSMutableSet* _windows; + + NSTimeInterval _actualRefreshPeriod; + NSTimeInterval _nominalRefreshPeriod; } - (id) initWithDisplayID:(CGDirectDisplayID)displayID; @@ -168,6 +171,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) addWindow:(WineWindow*)window; - (void) removeWindow:(WineWindow*)window; + - (NSTimeInterval) refreshPeriod; + + - (void) start; + @end @implementation WineDisplayLink @@ -234,12 +241,41 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi windows = [_windows copy]; } dispatch_async(dispatch_get_main_queue(), ^{ + BOOL anyDisplayed = FALSE; for (WineWindow* window in windows) - [window displayIfNeeded]; + { + if ([window viewsNeedDisplay]) + { + [window displayIfNeeded]; + anyDisplayed = YES; + } + } + if (!anyDisplayed) + CVDisplayLinkStop(_link); }); [windows release]; } + - (NSTimeInterval) refreshPeriod + { + if (_actualRefreshPeriod || (_actualRefreshPeriod = CVDisplayLinkGetActualOutputVideoRefreshPeriod(_link))) + return _actualRefreshPeriod; + + if (_nominalRefreshPeriod) + return _nominalRefreshPeriod; + + CVTime time = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(_link); + if (time.flags & kCVTimeIsIndefinite) + return 1.0 / 60.0; + _nominalRefreshPeriod = time.timeValue / (double)time.timeScale; + return _nominalRefreshPeriod; + } + + - (void) start + { + CVDisplayLinkStart(_link); + } + static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp* inNow, const CVTimeStamp* inOutputTime, CVOptionFlags flagsIn, CVOptionFlags* flagsOut, void* displayLinkContext) { WineDisplayLink* link = displayLinkContext; @@ -690,6 +726,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi window->savedContentMinSize = NSZeroSize; window->savedContentMaxSize = NSMakeSize(FLT_MAX, FLT_MAX); window->resizable = wf->resizable; + window->_lastDisplayTime = [[NSDate distantPast] timeIntervalSinceReferenceDate]; [window registerForDraggedTypes:[NSArray arrayWithObjects:(NSString*)kUTTypeData, (NSString*)kUTTypeContent, @@ -1663,21 +1700,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } } - - (void) checkWineDisplayLink + - (NSMutableDictionary*) displayIDToDisplayLinkMap { - NSScreen* screen = self.screen; - if (![self isVisible] || ![self isOnActiveSpace] || [self isMiniaturized] || [self isEmptyShaped]) - screen = nil; -#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 - if ([self respondsToSelector:@selector(occlusionState)] && !(self.occlusionState & NSWindowOcclusionStateVisible)) - screen = nil; -#endif - - NSNumber* displayIDNumber = [screen.deviceDescription objectForKey:@"NSScreenNumber"]; - CGDirectDisplayID displayID = [displayIDNumber unsignedIntValue]; - if (displayID == _lastDisplayID) - return; - static NSMutableDictionary* displayIDToDisplayLinkMap; if (!displayIDToDisplayLinkMap) { @@ -1693,6 +1717,34 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [displayIDToDisplayLinkMap removeObjectsForKeys:[badDisplayIDs allObjects]]; }]; } + return displayIDToDisplayLinkMap; + } + + - (WineDisplayLink*) wineDisplayLink + { + if (!_lastDisplayID) + return nil; + + NSMutableDictionary* displayIDToDisplayLinkMap = [self displayIDToDisplayLinkMap]; + return [displayIDToDisplayLinkMap objectForKey:[NSNumber numberWithUnsignedInt:_lastDisplayID]]; + } + + - (void) checkWineDisplayLink + { + NSScreen* screen = self.screen; + if (![self isVisible] || ![self isOnActiveSpace] || [self isMiniaturized] || [self isEmptyShaped]) + screen = nil; +#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 + if ([self respondsToSelector:@selector(occlusionState)] && !(self.occlusionState & NSWindowOcclusionStateVisible)) + screen = nil; +#endif + + NSNumber* displayIDNumber = [screen.deviceDescription objectForKey:@"NSScreenNumber"]; + CGDirectDisplayID displayID = [displayIDNumber unsignedIntValue]; + if (displayID == _lastDisplayID) + return; + + NSMutableDictionary* displayIDToDisplayLinkMap = [self displayIDToDisplayLinkMap]; if (_lastDisplayID) { @@ -2026,6 +2078,40 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super toggleFullScreen:sender]; } + - (void) setViewsNeedDisplay:(BOOL)value + { + if (value && ![self viewsNeedDisplay]) + { + WineDisplayLink* link = [self wineDisplayLink]; + if (link) + { + NSTimeInterval now = [[NSProcessInfo processInfo] systemUptime]; + if (_lastDisplayTime + [link refreshPeriod] < now) + [self setAutodisplay:YES]; + else + { + [link start]; + _lastDisplayTime = now; + } + } + } + [super setViewsNeedDisplay:value]; + } + + - (void) display + { + _lastDisplayTime = [[NSProcessInfo processInfo] systemUptime]; + [super display]; + [self setAutodisplay:NO]; + } + + - (void) displayIfNeeded + { + _lastDisplayTime = [[NSProcessInfo processInfo] systemUptime]; + [super displayIfNeeded]; + [self setAutodisplay:NO]; + } + - (NSArray*) childWineWindows { NSArray* childWindows = self.childWindows;

1 0

Alexandre Julliard : makedep: Don' t store install rules in the makefile object.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: bf6af2825c25e812645ad9bb91265766f362baf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6af2825c25e812645ad9bb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:03:52 2015 +0900 makedep: Don't store install rules in the makefile object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 82 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6af2825c25e812645ad…

1 0

Alexandre Julliard : makedep: Constify the makefile parameter where possible.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 5a1067adee6760ad1a0e8519a83c50eac65daa6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1067adee6760ad1a0e8519a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:07:37 2015 +0900 makedep: Constify the makefile parameter where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 70 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a1067adee6760ad1a0e8…

1 0

Alexandre Julliard : makedep: Release extra string storage.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 8a2545e487d439633da834f07b110b68b4eafca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2545e487d439633da834f07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:21:21 2015 +0900 makedep: Release extra string storage. Also consistently use size_t type for string sizes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index fb32fa2..e4ba7c4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -316,7 +316,7 @@ static char *strmake( const char* fmt, ... ) va_end(ap); if (n == -1) size *= 2; else if ((size_t)n >= size) size = n + 1; - else return p; + else return xrealloc( p, n + 1 ); free(p); } } @@ -327,8 +327,8 @@ static char *strmake( const char* fmt, ... ) */ static int strendswith( const char* str, const char* end ) { - int l = strlen(str); - int m = strlen(end); + size_t l = strlen( str ); + size_t m = strlen( end ); return l >= m && strcmp(str + l - m, end) == 0; } @@ -477,8 +477,8 @@ static char *get_extension( char *filename ) static char *replace_extension( const char *name, const char *old_ext, const char *new_ext ) { char *ret; - int name_len = strlen( name ); - int ext_len = strlen( old_ext ); + size_t name_len = strlen( name ); + size_t ext_len = strlen( old_ext ); if (name_len >= ext_len && !strcmp( name + name_len - ext_len, old_ext )) name_len -= ext_len; ret = xmalloc( name_len + strlen( new_ext ) + 1 ); @@ -507,9 +507,9 @@ static struct strarray strarray_replace_extension( const struct strarray *array, /******************************************************************* * replace_substr */ -static char *replace_substr( const char *str, const char *start, unsigned int len, const char *replace ) +static char *replace_substr( const char *str, const char *start, size_t len, const char *replace ) { - unsigned int pos = start - str; + size_t pos = start - str; char *ret = xmalloc( pos + strlen(replace) + strlen(start + len) + 1 ); memcpy( ret, str, pos ); strcpy( ret + pos, replace ); @@ -657,7 +657,7 @@ static char *tools_path( const struct makefile *make, const char *name ) static char *get_line( FILE *file ) { static char *buffer; - static unsigned int size; + static size_t size; if (!size) { @@ -1385,7 +1385,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ /* try in src file directory */ if ((p = strrchr(pFile->included_by->filename, '/'))) { - int l = p - pFile->included_by->filename + 1; + size_t l = p - pFile->included_by->filename + 1; filename = xmalloc(l + strlen(pFile->name) + 1); memcpy( filename, pFile->included_by->filename, l ); strcpy( filename + l, pFile->name );

1 0