October 2021 - Wine-commits

Rémi Bernon : dinput: Move CreateEffect generic implementation to device.c.
by Alexandre Julliard 21 Oct '21

21 Oct '21

Module: wine Branch: master Commit: 7c4e91f63b4dbd006af17c3f9dd03bbf86f04498 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c4e91f63b4dbd006af17c3f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 09:53:45 2021 +0200 dinput: Move CreateEffect generic implementation to device.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 41 +++++++++++++++++++++++++++++------------ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 41 +++++------------------------------------ dlls/dinput/keyboard.c | 1 + dlls/dinput/mouse.c | 1 + 5 files changed, 37 insertions(+), 48 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2a9b9aa596e..e0aa5141067 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1645,20 +1645,37 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Initialize(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } -/****************************************************************************** - * IDirectInputDevice2A - */ - -HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIEFFECT lpeff, - LPDIRECTINPUTEFFECT *ppdef, LPUNKNOWN pUnkOuter) +HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect( IDirectInputDevice8W *iface, const GUID *guid, + const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - FIXME("(%p)->(%s,%p,%p,%p): stub!\n", This, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); - if (!ppdef) return E_POINTER; + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DWORD flags = DIEP_ALLPARAMS; + HRESULT hr; - FIXME("not available in the generic implementation\n"); - *ppdef = NULL; - return DIERR_UNSUPPORTED; + TRACE( "iface %p, guid %s, params %p, out %p, outer %p\n", iface, debugstr_guid( guid ), + params, out, outer ); + + if (!out) return E_POINTER; + *out = NULL; + + if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_UNSUPPORTED; + if (!impl->vtbl->create_effect) return DIERR_UNSUPPORTED; + if (FAILED(hr = impl->vtbl->create_effect( iface, out ))) return hr; + + hr = IDirectInputEffect_Initialize( *out, DINPUT_instance, impl->dinput->dwVersion, guid ); + if (FAILED(hr)) goto failed; + + if (!params) return DI_OK; + if (!impl->acquired || !(impl->dwCoopLevel & DISCL_EXCLUSIVE)) flags |= DIEP_NODOWNLOAD; + hr = IDirectInputEffect_SetParameters( *out, params, flags ); + if (FAILED(hr)) goto failed; + return hr; + +failed: + IDirectInputEffect_Release( *out ); + *out = NULL; + return hr; } HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 0b5919c7ec6..66c51f1672a 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -69,6 +69,7 @@ struct dinput_device_vtbl HRESULT (*set_property)( IDirectInputDevice8W *iface, DWORD property, const DIPROPHEADER *header, const DIDEVICEOBJECTINSTANCEW *instance ); HRESULT (*get_effect_info)( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ); + HRESULT (*create_effect)( IDirectInputDevice8W *iface, IDirectInputEffect **out ); }; #define DEVICE_STATE_MAX_SIZE 1024 diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 2788f138216..c7e9700ed7c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -803,40 +803,7 @@ static HRESULT hid_joystick_internal_unacquire( IDirectInputDevice8W *iface ) return DI_OK; } -static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirectInputEffect **out ); - -static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, const GUID *guid, - const DIEFFECT *params, IDirectInputEffect **out, - IUnknown *outer ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - DWORD flags = DIEP_ALLPARAMS; - HRESULT hr; - - TRACE( "iface %p, guid %s, params %p, out %p, outer %p\n", iface, debugstr_guid( guid ), - params, out, outer ); - - if (!out) return E_POINTER; - *out = NULL; - - if (!(impl->base.caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_UNSUPPORTED; - if (FAILED(hr = hid_joystick_effect_create( impl, out ))) return hr; - - hr = IDirectInputEffect_Initialize( *out, DINPUT_instance, impl->base.dinput->dwVersion, guid ); - if (FAILED(hr)) goto failed; - - if (!params) return DI_OK; - if (!impl->base.acquired || !(impl->base.dwCoopLevel & DISCL_EXCLUSIVE)) - flags |= DIEP_NODOWNLOAD; - hr = IDirectInputEffect_SetParameters( *out, params, flags ); - if (FAILED(hr)) goto failed; - return hr; - -failed: - IDirectInputEffect_Release( *out ); - *out = NULL; - return hr; -} +static HRESULT hid_joystick_internal_create_effect( IDirectInputDevice8W *iface, IDirectInputEffect **out ); static HRESULT hid_joystick_internal_get_effect_info( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ) @@ -1068,7 +1035,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ - hid_joystick_CreateEffect, + IDirectInputDevice2WImpl_CreateEffect, IDirectInputDevice2WImpl_EnumEffects, IDirectInputDevice2WImpl_GetEffectInfo, IDirectInputDevice2WImpl_GetForceFeedbackState, @@ -1312,6 +1279,7 @@ static const struct dinput_device_vtbl hid_joystick_internal_vtbl = hid_joystick_internal_get_property, hid_joystick_internal_set_property, hid_joystick_internal_get_effect_info, + hid_joystick_internal_create_effect, }; static DWORD device_type_for_version( DWORD type, DWORD version ) @@ -2826,8 +2794,9 @@ static IDirectInputEffectVtbl hid_joystick_effect_vtbl = hid_joystick_effect_Escape, }; -static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirectInputEffect **out ) +static HRESULT hid_joystick_internal_create_effect( IDirectInputDevice8W *iface, IDirectInputEffect **out ) { + struct hid_joystick *joystick = impl_from_IDirectInputDevice8W( iface ); struct hid_joystick_effect *impl; ULONG report_len; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 1127ec2aaea..8e1b752f016 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -339,6 +339,7 @@ static const struct dinput_device_vtbl keyboard_internal_vtbl = keyboard_internal_get_property, keyboard_internal_set_property, NULL, + NULL, }; static const IDirectInputDevice8WVtbl SysKeyboardWvt = diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 69348ad2c7f..ec3282b267f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -652,6 +652,7 @@ static const struct dinput_device_vtbl mouse_internal_vtbl = mouse_internal_get_property, mouse_internal_set_property, NULL, + NULL, }; static const IDirectInputDevice8WVtbl SysMouseWvt =

1 0

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

20 Oct '21

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 the app deactivates.
by Alexandre Julliard 20 Oct '21

20 Oct '21

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 20 Oct '21

20 Oct '21

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

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

20 Oct '21

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 20 Oct '21

20 Oct '21

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

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

20 Oct '21

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

Paul Gofman : include: Update LDR_DATA_TABLE_ENTRY definition.
by Alexandre Julliard 20 Oct '21

20 Oct '21

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

Alexandre Julliard : msgsm32.acm: Use the bundled gsm codec and build with msvcrt.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 0e7fd41af953b2a9fa23cf6920fac229f2dd2e44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7fd41af953b2a9fa23cf69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:46:12 2021 +0200 msgsm32.acm: Use the bundled gsm codec and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 78 -------------------------------- configure.ac | 12 ----- dlls/msgsm32.acm/Makefile.in | 5 +-- dlls/msgsm32.acm/msgsm32.c | 105 ++++++------------------------------------- include/config.h.in | 9 ---- 5 files changed, 16 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7fd41af953b2a9fa23…

1 0

Alexandre Julliard : wow64win: Add missing syscall entry for NtUserGetObjectInformation().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 90a0b7c7061b514b4796f26f5679d89e867ac11a URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a0b7c7061b514b4796f26f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 13:18:16 2021 +0200 wow64win: Add missing syscall entry for NtUserGetObjectInformation(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 18435b993f0..8cf27d47aad 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -92,6 +92,7 @@ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ + SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \

1 0