October 2021 - Wine-Commits

Rémi Bernon : dinput: Replace stub EnumEffects with generic implementation.
by Alexandre Julliard Oct. 21, 2021

Oct. 21, 2021

Module: wine Branch: master Commit: 713d71c187c142b3dd889def6f9287be60d682a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=713d71c187c142b3dd889def… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 09:53:42 2021 +0200 dinput: Replace stub EnumEffects with generic implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 73 +++++++++++++++++++++++++++++++++++++++++----- dlls/dinput/joystick_hid.c | 73 +--------------------------------------------- 2 files changed, 67 insertions(+), 79 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8858bfa26bb..e5713f4713d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,14 +1661,73 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface return DIERR_UNSUPPORTED; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( - LPDIRECTINPUTDEVICE8W iface, - LPDIENUMEFFECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *context, DWORD type ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); + DIEFFECTINFOW info = {.dwSize = sizeof(info)}; + HRESULT hr; + + TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + type = DIEFT_GETTYPE( type ); + + if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_PERIODIC) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_CONDITION) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } return DI_OK; } diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 766e022ebe0..91b6020d1f1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -838,77 +838,6 @@ failed: return hr; } -static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, - void *context, DWORD type ) -{ - DIEFFECTINFOW info = {.dwSize = sizeof(info)}; - HRESULT hr; - - TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); - - if (!callback) return DIERR_INVALIDPARAM; - - type = DIEFT_GETTYPE( type ); - - if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_PERIODIC) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - if (type == DIEFT_ALL || type == DIEFT_CONDITION) - { - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - - hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); - if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; - if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; - } - - return DI_OK; -} - static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ) { @@ -1155,7 +1084,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ hid_joystick_CreateEffect, - hid_joystick_EnumEffects, + IDirectInputDevice2WImpl_EnumEffects, hid_joystick_GetEffectInfo, hid_joystick_GetForceFeedbackState, hid_joystick_SendForceFeedbackCommand,

1 0

Tim Clem : winemac.drv: Simplify cursor clipping code paths.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 325cc98d7d3e77faa195e1043e9f6790a783fd1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=325cc98d7d3e77faa195e104… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Oct 19 14:21:09 2021 -0700 winemac.drv: Simplify cursor clipping code paths. Centralizes all clipping behavior into -startClippingCursor: and -stopClippingCursor. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 52 +++++++++++++------------------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2d18da7f99a..80625265161 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1456,33 +1456,6 @@ static NSString* WineLocalizedString(unsigned int stringID) return ret; } - - (void) activateCursorClipping - { - if (cursorClippingEventTap && !CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, TRUE); - [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; - } - } - - - (void) deactivateCursorClipping - { - if (cursorClippingEventTap && CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, FALSE); - [warpRecords removeAllObjects]; - lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; - } - } - - - (void) updateCursorClippingState - { - if (clippingCursor && [NSApp isActive] && ![windowsBeingDragged count]) - [self activateCursorClipping]; - else - [self deactivateCursorClipping]; - } - - (void) updateWindowsForCursorClipping { WineWindow* window; @@ -1510,7 +1483,10 @@ static NSString* WineLocalizedString(unsigned int stringID) clippingCursor = TRUE; cursorClipRect = rect; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, TRUE); + [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1518,12 +1494,21 @@ static NSString* WineLocalizedString(unsigned int stringID) - (BOOL) stopClippingCursor { - CGError err = CGAssociateMouseAndMouseCursorPosition(true); + CGError err; + + if (!clippingCursor) + return TRUE; + + err = CGAssociateMouseAndMouseCursorPosition(true); if (err != kCGErrorSuccess) return FALSE; clippingCursor = FALSE; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, FALSE); + [warpRecords removeAllObjects]; + lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1554,7 +1539,6 @@ static NSString* WineLocalizedString(unsigned int stringID) [windowsBeingDragged addObject:window]; else [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; } - (void) windowWillOrderOut:(WineWindow*)window @@ -1584,7 +1568,6 @@ static NSString* WineLocalizedString(unsigned int stringID) [windowsBeingDragged removeObject:window]; eventType = WINDOW_DRAG_END; } - [self updateCursorClippingState]; event = macdrv_create_event(eventType, window); if (eventType == WINDOW_DRAG_BEGIN) @@ -2161,7 +2144,6 @@ static NSString* WineLocalizedString(unsigned int stringID) }); } [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; }]; if (useDragNotifications) { @@ -2305,8 +2287,6 @@ static NSString* WineLocalizedString(unsigned int stringID) [self setMode:mode forDisplay:[displayID unsignedIntValue]]; } - [self updateCursorClippingState]; - [self updateFullscreenWindows]; [self adjustWindowLevels:YES]; @@ -2349,8 +2329,6 @@ static NSString* WineLocalizedString(unsigned int stringID) macdrv_event* event; WineEventQueue* queue; - [self updateCursorClippingState]; - [self invalidateGotFocusEvents]; event = macdrv_create_event(APP_DEACTIVATED, nil);

1 0

Tim Clem : winemac.drv: Stop cursor clipping when all windows are minimized.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 5e543fee7aa0c5494d206efea7d69c63699913d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e543fee7aa0c5494d206efe… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Oct 19 14:21:12 2021 -0700 winemac.drv: Stop cursor clipping when all windows are minimized. There's no analogous state on Windows, where an app is focused but has no visible windows, but this seems like the best behavior. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 22 ++++++++++++++++++++++ dlls/winemac.drv/cocoa_window.m | 7 +++++++ dlls/winemac.drv/event.c | 3 +++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/window.c | 15 +++++++++++++++ 6 files changed, 50 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 80625265161..ff8f15553bb 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1553,6 +1553,17 @@ static NSString* WineLocalizedString(unsigned int stringID) } } + - (BOOL) isAnyWineWindowVisible + { + for (WineWindow* w in [NSApp windows]) + { + if ([w isKindOfClass:[WineWindow class]] && ![w isMiniaturized] && [w isVisible]) + return YES; + } + + return NO; + } + - (void) handleWindowDrag:(WineWindow*)window begin:(BOOL)begin { macdrv_event* event; @@ -2823,3 +2834,14 @@ void macdrv_set_cocoa_retina_mode(int new_mode) [[WineApplicationController sharedController] setRetinaMode:new_mode]; }); } + +int macdrv_is_any_wine_window_visible(void) +{ + __block int ret = FALSE; + + OnMainThread(^{ + ret = [[WineApplicationController sharedController] isAnyWineWindowVisible]; + }); + + return ret; +} diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 80cb2693409..812b46bee2c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2896,9 +2896,16 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void)windowDidMiniaturize:(NSNotification *)notification { + macdrv_event* event; + if (fullscreen && [self isOnActiveSpace]) [[WineApplicationController sharedController] updateFullscreenWindows]; + [self checkWineDisplayLink]; + + event = macdrv_create_event(WINDOW_DID_MINIMIZE, self); + [queue postEvent:event]; + macdrv_release_event(event); } - (void)windowDidMove:(NSNotification *)notification diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 7ec59c0f903..f197af0808e 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -275,6 +275,9 @@ void macdrv_handle_event(const macdrv_event *event) case WINDOW_CLOSE_REQUESTED: macdrv_window_close_requested(hwnd); break; + case WINDOW_DID_MINIMIZE: + macdrv_window_did_minimize(hwnd); + break; case WINDOW_DID_UNMINIMIZE: macdrv_window_did_unminimize(hwnd); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a7c0b4cac87..3f986901b2c 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -170,6 +170,7 @@ extern void macdrv_app_deactivated(void) DECLSPEC_HIDDEN; extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_maximize_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_minimize_requested(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_did_minimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_brought_forward(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 81840e067a9..2c903bfb12a 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -339,6 +339,7 @@ enum { STATUS_ITEM_MOUSE_MOVE, WINDOW_BROUGHT_FORWARD, WINDOW_CLOSE_REQUESTED, + WINDOW_DID_MINIMIZE, WINDOW_DID_UNMINIMIZE, WINDOW_DRAG_BEGIN, WINDOW_DRAG_END, @@ -598,6 +599,7 @@ extern void macdrv_set_view_backing_size(macdrv_view v, const int backing_size[2 extern uint32_t macdrv_window_background_color(void) DECLSPEC_HIDDEN; extern void macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, int keyc, void* data, int* done) DECLSPEC_HIDDEN; +extern int macdrv_is_any_wine_window_visible(void) DECLSPEC_HIDDEN; /* keyboard */ diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index eb23812d57c..07f04993ee8 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2438,6 +2438,21 @@ void macdrv_window_minimize_requested(HWND hwnd) } +/*********************************************************************** + * macdrv_window_did_minimize + * + * Handler for WINDOW_DID_MINIMIZE events. + */ +void macdrv_window_did_minimize(HWND hwnd) +{ + TRACE("win %p\n", hwnd); + + /* If all our windows are minimized, disable cursor clipping. */ + if (!macdrv_is_any_wine_window_visible()) + ClipCursor(NULL); +} + + /*********************************************************************** * macdrv_window_did_unminimize *

1 0

Tim Clem : winemac.drv: Remove extraneous CGEventTapIsEnabled check.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 9913f2786226ace3f586c07ff1ced9436cd0895d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9913f2786226ace3f586c07f… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Oct 19 14:21:13 2021 -0700 winemac.drv: Remove extraneous CGEventTapIsEnabled check. We no longer enable or disable the event tap manually, and it re-enables itself on kCGEventTapDisabledByTimeout, so this check is not needed. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index ff8f15553bb..c4c745ff732 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1473,8 +1473,7 @@ static NSString* WineLocalizedString(unsigned int stringID) if (!cursorClippingEventTap && ![self installEventTap]) return FALSE; - if (clippingCursor && CGRectEqualToRect(rect, cursorClipRect) && - CGEventTapIsEnabled(cursorClippingEventTap)) + if (clippingCursor && CGRectEqualToRect(rect, cursorClipRect)) return TRUE; err = CGAssociateMouseAndMouseCursorPosition(false);

1 0

Tim Clem : winemac.drv: Stop cursor clipping when the app deactivates.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 2407f9b84e52fcf7fc8779c1f3547d9c3be66fa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2407f9b84e52fcf7fc8779c1… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Oct 19 14:21:10 2021 -0700 winemac.drv: Stop cursor clipping when the app deactivates. Testing on Windows confirms this behavior. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 622f136930c..e25e142bd1a 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2406,6 +2406,8 @@ void macdrv_app_activated(void) */ void macdrv_app_deactivated(void) { + ClipCursor(NULL); + if (GetActiveWindow() == GetForegroundWindow()) { TRACE("setting fg to desktop\n");

1 0

Tim Clem : winemac.drv: Stop cursor clipping when a window is resized by dragging.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 184048042e125e26893bcf1ed9791162777304a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=184048042e125e26893bcf1e… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Oct 19 14:21:11 2021 -0700 winemac.drv: Stop cursor clipping when a window is resized by dragging. Testing on Windows confirms this behavior. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e25e142bd1a..eb23812d57c 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2873,6 +2873,8 @@ BOOL query_resize_start(HWND hwnd) { TRACE("hwnd %p\n", hwnd); + ClipCursor(NULL); + sync_window_min_max_info(hwnd); SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0);

1 0

Paul Gofman : include: Update LDR_DATA_TABLE_ENTRY definition.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: f712a98d12d091c5437159a291857dfb9f0cea7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f712a98d12d091c5437159a2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 18 15:06:47 2021 +0300 include: Update LDR_DATA_TABLE_ENTRY definition. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 6b1c5b11b4f..f1272518dbb 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3323,8 +3323,7 @@ typedef struct _LDR_DATA_TABLE_ENTRY ULONG Flags; SHORT LoadCount; SHORT TlsIndex; - HANDLE SectionHandle; - ULONG CheckSum; + LIST_ENTRY HashLinks; ULONG TimeDateStamp; HANDLE ActivationContext; void* Lock;

1 0

Paul Gofman : ntdll: Store module check sum in WINE_MODREF.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 1ab32c6b3bfff2cdfe59a42fe1d9696de65eb4f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ab32c6b3bfff2cdfe59a42f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 18 15:06:46 2021 +0300 ntdll: Store module check sum in WINE_MODREF. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 797d72aedb6..dd41d6b66d2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -136,6 +136,7 @@ typedef struct _wine_modref int alloc_deps; int nDeps; struct _wine_modref **deps; + ULONG CheckSum; } WINE_MODREF; static UINT tls_module_count; /* number of modules with TLS directory */ @@ -220,16 +221,17 @@ static RTL_UNLOAD_EVENT_TRACE unload_traces[RTL_UNLOAD_EVENT_TRACE_NUMBER]; static RTL_UNLOAD_EVENT_TRACE *unload_trace_ptr; static unsigned int unload_trace_seq; -static void module_push_unload_trace( const LDR_DATA_TABLE_ENTRY *ldr ) +static void module_push_unload_trace( const WINE_MODREF *wm ) { RTL_UNLOAD_EVENT_TRACE *ptr = &unload_traces[unload_trace_seq]; + const LDR_DATA_TABLE_ENTRY *ldr = &wm->ldr; unsigned int len = min(sizeof(ptr->ImageName) - sizeof(WCHAR), ldr->BaseDllName.Length); ptr->BaseAddress = ldr->DllBase; ptr->SizeOfImage = ldr->SizeOfImage; ptr->Sequence = unload_trace_seq; ptr->TimeDateStamp = ldr->TimeDateStamp; - ptr->CheckSum = ldr->CheckSum; + ptr->CheckSum = wm->CheckSum; memcpy(ptr->ImageName, ldr->BaseDllName.Buffer, len); ptr->ImageName[len / sizeof(*ptr->ImageName)] = 0; @@ -1222,7 +1224,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_INTERNAL : 0); wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; - wm->ldr.CheckSum = nt->OptionalHeader.CheckSum; + wm->CheckSum = nt->OptionalHeader.CheckSum; wm->ldr.TimeDateStamp = nt->FileHeader.TimeDateStamp; if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, nt_name->Length - 3 * sizeof(WCHAR) ))) @@ -2350,7 +2352,8 @@ static WINE_MODREF *find_existing_module( HMODULE module ) { mod = CONTAINING_RECORD( entry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks ); if (mod->TimeDateStamp != nt->FileHeader.TimeDateStamp) continue; - if (mod->CheckSum != nt->OptionalHeader.CheckSum) continue; + wm = CONTAINING_RECORD( mod, WINE_MODREF, ldr ); + if (wm->CheckSum != nt->OptionalHeader.CheckSum) continue; if (NtAreMappedFilesTheSame( mod->DllBase, module ) != STATUS_SUCCESS) continue; return CONTAINING_RECORD( mod, WINE_MODREF, ldr ); } @@ -3592,7 +3595,7 @@ static void MODULE_DecRefCount( WINE_MODREF *wm ) wm->ldr.Flags &= ~LDR_UNLOAD_IN_PROGRESS; - module_push_unload_trace( &wm->ldr ); + module_push_unload_trace( wm ); } }

1 0

Huw Davies : gdiplus: Switch to STRETCH_HALFTONE mode before playing a blit record.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 0d8428fbc5e876977520c00d8a87f50d81bb23d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d8428fbc5e876977520c00d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 19 08:45:33 2021 +0100 gdiplus: Switch to STRETCH_HALFTONE mode before playing a blit record. This is done even if the emf contains a previous EMR_SETSTRETCHBLTMODE record. Thanks to Sebastián Aedo for some of the testing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d79c939218c..1b4bba18048 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2486,6 +2486,9 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); + if (record->iType == EMR_BITBLT || record->iType == EMR_STRETCHBLT) + SetStretchBltMode(metafile->playback_dc, STRETCH_HALFTONE); + if(PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table, record, metafile->handle_count) == 0) ERR("PlayEnhMetaFileRecord failed\n");

1 0

Eric Pouech : msvcrt: Support I width modifier in *scanf* family.
by Alexandre Julliard Oct. 20, 2021

Oct. 20, 2021

Module: wine Branch: master Commit: 74a42c54019f28c1facc2fd8009fc0533db68207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74a42c54019f28c1facc2fd8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 20 13:39:02 2021 +0200 msvcrt: Support I width modifier in *scanf* family. Despite what msdn states, I and I32 are supported width modifiers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 10 ++++++++-- dlls/ucrtbase/tests/scanf.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3ab2efef13d..02284379854 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -279,13 +279,19 @@ _FUNCTION_ { *(format + 2) == '4') { I64_prefix = 1; format += 2; + break; } - break; + else if (*(format + 1) == '3' && + *(format + 2) == '2') { + format += 2; + break; + } + /* fall through */ #if _MSVCR_VER == 0 || _MSVCR_VER >= 140 case 'z': +#endif if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; break; -#endif default: prefix_finished = 1; } diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c index 3d77746d23b..12a08864642 100644 --- a/dlls/ucrtbase/tests/scanf.c +++ b/dlls/ucrtbase/tests/scanf.c @@ -43,6 +43,7 @@ static void test_sscanf(void) char buffer[100], buffer1[100]; int result, ret, hour, min, count; LONGLONG result64; + DWORD_PTR result_ptr; char c; void *ptr; float ret_float1, ret_float2; @@ -296,6 +297,30 @@ static void test_sscanf(void) ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); ok(ret_size == 1, "got wrong size_t %s for flags %#x\n", wine_dbgstr_longlong((LONGLONG)ret_size), tests[i]); + + result64 = 0; + ret = vsscanf_wrapper(tests[i], "12345678901234", -1, "%I64d", &result64); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result64 == 12345678901234ll, "got wrong number 0x%s for flags %#x\n", + wine_dbgstr_longlong(result64), tests[i]); + + result = 0; + ret = vsscanf_wrapper(tests[i], "12345678901234", -1, "%I32d", &result); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result == (int)12345678901234ll, /* this is always truncated to 32bit */ + "got wrong number 0x%d for flags %#x\n", result, tests[i]); + + result_ptr = 0; + ret = vsscanf_wrapper(tests[i], "0x87654321", -1, "%Ix", &result_ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result_ptr == 0x87654321, + "got wrong number %Ix for flags %#x\n", result_ptr, tests[i]); + + result_ptr = 0; + ret = vsscanf_wrapper(tests[i], "0x123456789", -1, "%Ix", &result_ptr); + ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); + ok(result_ptr == (DWORD_PTR)0x123456789ull, /* this is truncated on 32bit systems */ + "got wrong number %Ix for flags %#x\n", result_ptr, tests[i]); } }

1 0