wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Jacek Caban : win32u: Don't use designated initializers for lazy_load_driver.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 8345d21b3a650bbc279989e05803b067db40ca55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8345d21b3a650bbc279989e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 18 14:29:44 2022 +0100 win32u: Don't use designated initializers for lazy_load_driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/driver.c | 86 +++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 4f77d1eb731..d1062cb5f3a 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1171,56 +1171,60 @@ static const struct vulkan_funcs * CDECL loaderdrv_wine_get_vulkan_driver( UINT static const struct user_driver_funcs lazy_load_driver = { + { NULL }, /* keyboard functions */ - .pActivateKeyboardLayout = loaderdrv_ActivateKeyboardLayout, - .pBeep = loaderdrv_Beep, - .pGetKeyNameText = loaderdrv_GetKeyNameText, - .pGetKeyboardLayoutList = loaderdrv_GetKeyboardLayoutList, - .pMapVirtualKeyEx = loaderdrv_MapVirtualKeyEx, - .pToUnicodeEx = loaderdrv_ToUnicodeEx, - .pRegisterHotKey = loaderdrv_RegisterHotKey, - .pUnregisterHotKey = loaderdrv_UnregisterHotKey, - .pVkKeyScanEx = loaderdrv_VkKeyScanEx, + loaderdrv_ActivateKeyboardLayout, + loaderdrv_Beep, + loaderdrv_GetKeyNameText, + loaderdrv_GetKeyboardLayoutList, + loaderdrv_MapVirtualKeyEx, + loaderdrv_RegisterHotKey, + loaderdrv_ToUnicodeEx, + loaderdrv_UnregisterHotKey, + loaderdrv_VkKeyScanEx, /* cursor/icon functions */ - .pDestroyCursorIcon = nulldrv_DestroyCursorIcon, - .pSetCursor = loaderdrv_SetCursor, - .pGetCursorPos = loaderdrv_GetCursorPos, - .pSetCursorPos = loaderdrv_SetCursorPos, - .pClipCursor = loaderdrv_ClipCursor, + nulldrv_DestroyCursorIcon, + loaderdrv_SetCursor, + loaderdrv_GetCursorPos, + loaderdrv_SetCursorPos, + loaderdrv_ClipCursor, /* clipboard functions */ - .pUpdateClipboard = loaderdrv_UpdateClipboard, + loaderdrv_UpdateClipboard, /* display modes */ - .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, - .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, - .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + loaderdrv_ChangeDisplaySettingsEx, + loaderdrv_EnumDisplaySettingsEx, + loaderdrv_UpdateDisplayDevices, /* windowing functions */ - .pCreateDesktopWindow = loaderdrv_CreateDesktopWindow, - .pCreateWindow = loaderdrv_CreateWindow, - .pDestroyWindow = nulldrv_DestroyWindow, - .pFlashWindowEx = loaderdrv_FlashWindowEx, - .pGetDC = loaderdrv_GetDC, - .pSetCapture = nulldrv_SetCapture, - .pSetLayeredWindowAttributes = loaderdrv_SetLayeredWindowAttributes, - .pSetParent = nulldrv_SetParent, - .pSetWindowRgn = loaderdrv_SetWindowRgn, - .pSetWindowStyle = nulldrv_SetWindowStyle, - .pMsgWaitForMultipleObjectsEx = nulldrv_MsgWaitForMultipleObjectsEx, - .pReleaseDC = nulldrv_ReleaseDC, - .pScrollDC = nulldrv_ScrollDC, - .pSetFocus = nulldrv_SetFocus, - .pShowWindow = nulldrv_ShowWindow, - .pUpdateLayeredWindow = loaderdrv_UpdateLayeredWindow, - .pWindowMessage = nulldrv_WindowMessage, - .pWindowPosChanging = nulldrv_WindowPosChanging, - .pWindowPosChanged = nulldrv_WindowPosChanged, + loaderdrv_CreateDesktopWindow, + loaderdrv_CreateWindow, + nulldrv_DestroyWindow, + loaderdrv_FlashWindowEx, + loaderdrv_GetDC, + nulldrv_MsgWaitForMultipleObjectsEx, + nulldrv_ReleaseDC, + nulldrv_ScrollDC, + nulldrv_SetCapture, + nulldrv_SetFocus, + loaderdrv_SetLayeredWindowAttributes, + nulldrv_SetParent, + loaderdrv_SetWindowRgn, + nulldrv_SetWindowIcon, + nulldrv_SetWindowStyle, + nulldrv_SetWindowText, + nulldrv_ShowWindow, + nulldrv_SysCommand, + loaderdrv_UpdateLayeredWindow, + nulldrv_WindowMessage, + nulldrv_WindowPosChanging, + nulldrv_WindowPosChanged, /* system parameters */ - .pSystemParametersInfo = nulldrv_SystemParametersInfo, + nulldrv_SystemParametersInfo, /* vulkan support */ - .pwine_get_vulkan_driver = loaderdrv_wine_get_vulkan_driver, + loaderdrv_wine_get_vulkan_driver, /* opengl support */ - .pwine_get_wgl_driver = nulldrv_wine_get_wgl_driver, + nulldrv_wine_get_wgl_driver, /* thread management */ - .pThreadDetach = nulldrv_ThreadDetach, + nulldrv_ThreadDetach, }; const struct user_driver_funcs *user_driver = &lazy_load_driver;

1 0

Jacek Caban : win32u: Move ArrangeIconicWindows implementation from user32.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 8e3fef2627d0bfd6c7912fab77a794941518983c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e3fef2627d0bfd6c7912fab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 18 14:29:17 2022 +0100 win32u: Move ArrangeIconicWindows implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 123 +-------------------------------------------------- dlls/win32u/window.c | 44 ++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 46 insertions(+), 122 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6f0dfec23ac..fa074e9f7c8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -31,19 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -#define SWP_AGG_NOGEOMETRYCHANGE \ - (SWP_NOSIZE | SWP_NOCLIENTSIZE | SWP_NOZORDER) -#define SWP_AGG_NOPOSCHANGE \ - (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) -#define SWP_AGG_STATUSFLAGS \ - (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW) -#define SWP_AGG_NOCLIENTCHANGE \ - (SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE) - -#define HAS_DLGFRAME(style,exStyle) \ - (((exStyle) & WS_EX_DLGMODALFRAME) || \ - (((style) & WS_DLGFRAME) && !((style) & WS_BORDER))) - #define HAS_THICKFRAME(style) \ (((style) & WS_THICKFRAME) && \ !(((style) & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME)) @@ -551,78 +538,6 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) return info; } - -static POINT get_first_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm, - int width, int height ) -{ - POINT ret; - - if (mm->iArrange & ARW_STARTRIGHT) - ret.x = parent->right - mm->iHorzGap - width; - else - ret.x = parent->left + mm->iHorzGap; - if (mm->iArrange & ARW_STARTTOP) - ret.y = parent->top + mm->iVertGap; - else - ret.y = parent->bottom - mm->iVertGap - height; - - return ret; -} - -static void get_next_minimized_child_pos( const RECT *parent, const MINIMIZEDMETRICS *mm, - int width, int height, POINT *pos ) -{ - BOOL next; - - if (mm->iArrange & ARW_UP) /* == ARW_DOWN */ - { - if (mm->iArrange & ARW_STARTTOP) - { - pos->y += height + mm->iVertGap; - if ((next = pos->y + height > parent->bottom)) - pos->y = parent->top + mm->iVertGap; - } - else - { - pos->y -= height + mm->iVertGap; - if ((next = pos->y < parent->top)) - pos->y = parent->bottom - mm->iVertGap - height; - } - - if (next) - { - if (mm->iArrange & ARW_STARTRIGHT) - pos->x -= width + mm->iHorzGap; - else - pos->x += width + mm->iHorzGap; - } - } - else - { - if (mm->iArrange & ARW_STARTRIGHT) - { - pos->x -= width + mm->iHorzGap; - if ((next = pos->x < parent->left)) - pos->x = parent->right - mm->iHorzGap - width; - } - else - { - pos->x += width + mm->iHorzGap; - if ((next = pos->x + width > parent->right)) - pos->x = parent->left + mm->iHorzGap; - } - - if (next) - { - if (mm->iArrange & ARW_STARTTOP) - pos->y += height + mm->iVertGap; - else - pos->y -= height + mm->iVertGap; - } - } -} - - /*********************************************************************** * GetInternalWindowPos (USER32.@) */ @@ -992,43 +907,7 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) */ UINT WINAPI ArrangeIconicWindows( HWND parent ) { - int width, height, count = 0; - RECT rectParent; - HWND hwndChild; - POINT pt; - MINIMIZEDMETRICS metrics; - - metrics.cbSize = sizeof(metrics); - SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); - width = GetSystemMetrics( SM_CXMINIMIZED ); - height = GetSystemMetrics( SM_CYMINIMIZED ); - - if (parent == GetDesktopWindow()) - { - MONITORINFO mon_info; - HMONITOR monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); - - mon_info.cbSize = sizeof( mon_info ); - GetMonitorInfoW( monitor, &mon_info ); - rectParent = mon_info.rcWork; - } - else GetClientRect( parent, &rectParent ); - - pt = get_first_minimized_child_pos( &rectParent, &metrics, width, height ); - - hwndChild = GetWindow( parent, GW_CHILD ); - while (hwndChild) - { - if( IsIconic( hwndChild ) ) - { - NtUserSetWindowPos( hwndChild, 0, pt.x, pt.y, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); - get_next_minimized_child_pos( &rectParent, &metrics, width, height, &pt ); - count++; - } - hwndChild = GetWindow( hwndChild, GW_HWNDNEXT ); - } - return count; + return NtUserCallHwnd( parent, NtUserArrangeIconicWindows ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 521523dc2b5..8c7a5950a78 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3830,6 +3830,48 @@ static UINT window_min_maximize( HWND hwnd, UINT cmd, RECT *rect ) return swp_flags; } +/* see ArrangeIconicWindows */ +static UINT arrange_iconic_windows( HWND parent ) +{ + int width, height, count = 0; + MINIMIZEDMETRICS metrics; + RECT parent_rect; + HWND child; + POINT pt; + + metrics.cbSize = sizeof(metrics); + NtUserSystemParametersInfo( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); + width = get_system_metrics( SM_CXMINIMIZED ); + height = get_system_metrics( SM_CYMINIMIZED ); + + if (parent == get_desktop_window()) + { + MONITORINFO mon_info; + HMONITOR monitor = monitor_from_window( 0, MONITOR_DEFAULTTOPRIMARY, get_thread_dpi() ); + + mon_info.cbSize = sizeof( mon_info ); + get_monitor_info( monitor, &mon_info ); + parent_rect = mon_info.rcWork; + } + else get_client_rect( parent, &parent_rect ); + + pt = get_first_minimized_child_pos( &parent_rect, &metrics, width, height ); + + child = get_window_relative( parent, GW_CHILD ); + while (child) + { + if (is_iconic( child )) + { + NtUserSetWindowPos( child, 0, pt.x, pt.y, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + get_next_minimized_child_pos( &parent_rect, &metrics, width, height, &pt ); + count++; + } + child = get_window_relative( child, GW_HWNDNEXT ); + } + return count; +} + /******************************************************************* * update_window_state * @@ -4905,6 +4947,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { + case NtUserArrangeIconicWindows: + return arrange_iconic_windows( hwnd ); case NtUserGetDpiForWindow: return get_dpi_for_window( hwnd ); case NtUserGetParent: diff --git a/include/ntuser.h b/include/ntuser.h index 03b48747665..b327dbc87f0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -142,6 +142,7 @@ enum /* NtUserCallHwnd codes, not compatible with Windows */ enum { + NtUserArrangeIconicWindows, NtUserGetDpiForWindow, NtUserGetParent, NtUserGetWindowContextHelpId,

1 0

Jacek Caban : win32u: Move apply_window_pos implementation from user32.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 44f667fa14c308b489be123c5ed6153010e8e430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f667fa14c308b489be123c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 18 14:28:42 2022 +0100 win32u: Move apply_window_pos implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 20 +--- dlls/user32/painting.c | 150 -------------------------- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 6 -- dlls/user32/win.c | 142 ------------------------- dlls/user32/win.h | 5 - dlls/user32/winpos.c | 227 --------------------------------------- dlls/win32u/dce.c | 211 +++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 2 + dlls/win32u/ntuser_private.h | 3 - dlls/win32u/sysparams.c | 6 -- dlls/win32u/win32u_private.h | 8 ++ dlls/win32u/window.c | 246 ++++++++++++++++++++++++++++++++++++++++--- include/ntuser.h | 4 - 14 files changed, 455 insertions(+), 576 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44f667fa14c308b489be…

1 0

Jacek Caban : win32u: Move NtUserCreateWindowEx implementation from user32.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: d765edc411a6844f6322dd9da280aa0436391828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d765edc411a6844f6322dd9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 18 14:27:55 2022 +0100 win32u: Move NtUserCreateWindowEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 11 - dlls/user32/controls.h | 1 - dlls/user32/driver.c | 13 +- dlls/user32/user_main.c | 12 +- dlls/user32/user_private.h | 3 - dlls/user32/win.c | 544 ++----------------------------------------- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 176 -------------- dlls/user32/winproc.c | 39 ---- dlls/win32u/class.c | 29 +++ dlls/win32u/dce.c | 11 + dlls/win32u/driver.c | 6 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 8 + dlls/win32u/message.c | 19 +- dlls/win32u/ntuser_private.h | 39 +--- dlls/win32u/sysparams.c | 5 +- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 10 +- dlls/win32u/window.c | 488 +++++++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 12 + include/ntuser.h | 10 +- 22 files changed, 616 insertions(+), 824 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d765edc411a6844f6322…

1 0

Jacek Caban : user32: Move MDI child coordinates fixup out of WIN_FixCoordinates.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: f2f07d5ba7950c377da392c5ca840a3fca1894e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2f07d5ba7950c377da392c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 18 14:27:19 2022 +0100 user32: Move MDI child coordinates fixup out of WIN_FixCoordinates. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 22227c23280..db5158c0b6f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -716,35 +716,10 @@ other_process: static void WIN_FixCoordinates( CREATESTRUCTW *cs, INT *sw) { #define IS_DEFAULT(x) ((x) == CW_USEDEFAULT || (x) == (SHORT)0x8000) - POINT pos[2]; - - if (cs->dwExStyle & WS_EX_MDICHILD) - { - UINT id = 0; - - MDI_CalcDefaultChildPos(cs->hwndParent, -1, pos, 0, &id); - if (!(cs->style & WS_POPUP)) cs->hMenu = ULongToHandle(id); - - TRACE("MDI child id %04x\n", id); - } - if (cs->style & (WS_CHILD | WS_POPUP)) { - if (cs->dwExStyle & WS_EX_MDICHILD) - { - if (IS_DEFAULT(cs->x)) - { - cs->x = pos[0].x; - cs->y = pos[0].y; - } - if (IS_DEFAULT(cs->cx) || !cs->cx) cs->cx = pos[1].x; - if (IS_DEFAULT(cs->cy) || !cs->cy) cs->cy = pos[1].y; - } - else - { - if (IS_DEFAULT(cs->x)) cs->x = cs->y = 0; - if (IS_DEFAULT(cs->cx)) cs->cx = cs->cy = 0; - } + if (IS_DEFAULT(cs->x)) cs->x = cs->y = 0; + if (IS_DEFAULT(cs->cx)) cs->cx = cs->cy = 0; } else /* overlapped window */ { @@ -905,6 +880,11 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) #undef DUMPED_EX_STYLES } +static BOOL is_default_coord( int x ) +{ + return x == CW_USEDEFAULT || x == 0x8000; +} + /*********************************************************************** * map_dpi_create_struct */ @@ -971,6 +951,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* Fix the styles for MDI children */ if (cs->dwExStyle & WS_EX_MDICHILD) { + POINT pos[2]; + UINT id = 0; + if (!(win_get_flags( cs->hwndParent ) & WIN_ISMDICLIENT)) { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", cs->hwndParent); @@ -1029,6 +1012,22 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, else NtUserShowWindow( top_child, SW_SHOWNORMAL ); } } + + MDI_CalcDefaultChildPos( cs->hwndParent, -1, pos, 0, &id ); + if (!(cs->style & WS_POPUP)) cs->hMenu = ULongToHandle(id); + + TRACE( "MDI child id %04x\n", id ); + + if (cs->style & (WS_CHILD | WS_POPUP)) + { + if (is_default_coord( cs->x )) + { + cs->x = pos[0].x; + cs->y = pos[0].y; + } + if (is_default_coord( cs->cx ) || !cs->cx) cs->cx = pos[1].x; + if (is_default_coord( cs->cy ) || !cs->cy) cs->cy = pos[1].y; + } } /* Find the parent window */

1 0

Rémi Bernon : winebus.sys: Assume SDL device effects are running by default.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 338438ecef6d48d5df6d465863fdc1272cf4f508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=338438ecef6d48d5df6d4658… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 18 10:23:29 2022 +0100 winebus.sys: Assume SDL device effects are running by default. If we cannot read their status with SDL_HapticGetEffectStatus. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 07fdd9d3fa2..a1e7942fe59 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -752,12 +752,13 @@ static void check_device_effects_state(struct sdl_device *impl) unsigned int i, ret; if (!impl->sdl_haptic) return; - if (!(impl->effect_support & SDL_HAPTIC_STATUS)) return; + if (!(impl->effect_support & EFFECT_SUPPORT_PHYSICAL)) return; for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) { if (impl->effect_ids[i] == -1) continue; - ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]); + if (!(impl->effect_support & SDL_HAPTIC_STATUS)) ret = 1; + else ret = pSDL_HapticGetEffectStatus(impl->sdl_haptic, impl->effect_ids[i]); if (impl->effect_state[i] == ret) continue; impl->effect_state[i] = ret; hid_device_set_effect_state(iface, i, effect_flags | (ret == 1 ? EFFECT_STATE_EFFECT_PLAYING : 0));

1 0

Rémi Bernon : dinput: Allow setting DIPROP_AUTOCENTER when exclusively acquired.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 62d40eb0c852bbf66f68bd3e4f22965119b70dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d40eb0c852bbf66f68bd3e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 18 10:23:03 2022 +0100 dinput: Allow setting DIPROP_AUTOCENTER when exclusively acquired. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 ++ dlls/dinput/tests/force_feedback.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6cc190ee7fb..d881669c06f 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1009,6 +1009,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_AUTOCENTER: + if (impl->status == STATUS_ACQUIRED && !is_exclusively_acquired( impl )) return DIERR_ACQUIRED; + break; case (DWORD_PTR)DIPROP_AXISMODE: case (DWORD_PTR)DIPROP_BUFFERSIZE: case (DWORD_PTR)DIPROP_PHYSICALRANGE: diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 97aed4c993b..ce460147f9d 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -2924,6 +2924,9 @@ static BOOL test_force_feedback_joystick( DWORD version ) ok( hr == DI_OK, "Unacquire returned: %#lx\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); + prop_dword.dwData = DIPROPAUTOCENTER_ON; + hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); + ok( hr == DI_OK, "SetProperty DIPROP_AUTOCENTER returned %#lx\n", hr ); set_hid_expect( file, expect_acquire, sizeof(expect_acquire) ); hr = IDirectInputDevice8_Acquire( device );

1 0

Rémi Bernon : windows.gaming.input: Fix vector InsertAt / RemoveAt copy sizes.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: d99101977d93f772ceb6ab8d05d2b33c00078788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99101977d93f772ceb6ab8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 18 10:22:27 2022 +0100 windows.gaming.input: Fix vector InsertAt / RemoveAt copy sizes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/vector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index c98c89195d1..db1a9057682 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -515,7 +515,7 @@ static HRESULT WINAPI vector_InsertAt( IVector_IInspectable *iface, UINT32 index } } - memmove( impl->elements + index + 1, impl->elements + index, impl->size++ * sizeof(*impl->elements) ); + memmove( impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements) ); IInspectable_AddRef( (impl->elements[index] = value) ); return S_OK; } @@ -528,7 +528,7 @@ static HRESULT WINAPI vector_RemoveAt( IVector_IInspectable *iface, UINT32 index if (index >= impl->size) return E_BOUNDS; IInspectable_Release( impl->elements[index] ); - memmove( impl->elements + index, impl->elements + index + 1, --impl->size * sizeof(*impl->elements) ); + memmove( impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements) ); return S_OK; }

1 0

Brendan Shanks : win32u: Remove workaround for Mac OS X 10.4 and 10.5.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: b6b0f7411c8bc561c424f47c419fb4fa39a16661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b0f7411c8bc561c424f47c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Mar 17 20:07:20 2022 -0700 win32u: Remove workaround for Mac OS X 10.4 and 10.5. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/freetype.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 77f4ef8eab3..b6063a14570 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1773,35 +1773,7 @@ static void load_mac_fonts(void) CFStringRef path; desc = CFArrayGetValueAtIndex(descs, i); - -#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute); -#else - /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so - we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */ - { - CTFontRef font; - ATSFontRef atsFont; - OSStatus status; - FSRef fsref; - - font = CTFontCreateWithFontDescriptor(desc, 0, NULL); - if (!font) continue; - - atsFont = CTFontGetPlatformFont(font, NULL); - if (!atsFont) - { - CFRelease(font); - continue; - } - - status = ATSFontGetFileReference(atsFont, &fsref); - CFRelease(font); - if (status != noErr) continue; - - url = CFURLCreateFromFSRef(NULL, &fsref); - } -#endif if (!url) continue; ext = CFURLCopyPathExtension(url);

1 0

Alexandre Julliard : mlang: Store the codepage data in Unicode.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 55dc240fa801a533726afc6a8714df2687b6d9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55dc240fa801a533726afc6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:58:57 2022 +0100 mlang: Store the codepage data in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 426 +++++++++++++++++++++++++---------------------------- 1 file changed, 201 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55dc240fa801a533726a…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022