March 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Move apply_window_pos implementation from user32.
by Alexandre Julliard March 18, 2022

March 18, 2022

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 ArrangeIconicWindows implementation from user32.
by Alexandre Julliard March 18, 2022

March 18, 2022

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

Eric Pouech : d3d12/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: 636b2d92201fde49e8881e09bbba1ea05c836664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=636b2d92201fde49e8881e09… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 16:59:32 2022 +0100 d3d12/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/Makefile.in | 1 - dlls/d3d12/tests/d3d12.c | 158 +++++++++++++++++++++---------------------- 2 files changed, 79 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=636b2d92201fde49e888…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in error.c.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: 44d604f57e8b4da93f5b267c9d6cc3afa0473298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d604f57e8b4da93f5b267c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:59 2022 +0100 ntdll/tests: Enable compilation with long types in error.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/error.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 8f099e6903a..7784886c79b 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdio.h> @@ -75,7 +76,7 @@ static void cmp_call(NTSTATUS win_nt, ULONG win32, const char* message) err = pRtlNtStatusToDosError(win_nt); ok(err == win32, - "%s (%x): got %u, expected %u\n", + "%s (%lx): got %lu, expected %lu\n", message, win_nt, err, win32); } @@ -86,7 +87,7 @@ static void cmp_call2(NTSTATUS win_nt, ULONG win32, const char* message) err = pRtlNtStatusToDosError(win_nt); ok(err == win32 || (!strict && err == ERROR_MR_MID_NOT_FOUND), - "%s (%x): got %u, expected %u (or MID_NOT_FOUND)\n", + "%s (%lx): got %lu, expected %lu (or MID_NOT_FOUND)\n", message, win_nt, err, win32); } @@ -96,7 +97,7 @@ static void cmp_call3(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && err == win32_2), - "%s (%x): got %u, expected %u or %u\n", + "%s (%lx): got %lu, expected %lu or %lu\n", message, win_nt, err, win32_1, win32_2); } @@ -107,7 +108,7 @@ static void cmp_call4(NTSTATUS win_nt, ULONG win32_1, ULONG win32_2, const char* err = pRtlNtStatusToDosError(win_nt); ok(err == win32_1 || (!strict && (err == win32_2 || err == ERROR_MR_MID_NOT_FOUND)), - "%s (%x): got %u, expected %u or %u\n", + "%s (%lx): got %lu, expected %lu or %lu\n", message, win_nt, err, win32_1, win32_2); }

1 0

Jacek Caban : user32: Move MDI child coordinates fixup out of WIN_FixCoordinates.
by Alexandre Julliard March 18, 2022

March 18, 2022

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

Alexandre Julliard : mlang: Use EnumSystemLocalesEx() to enumerate locales.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: d55233cc7f128b3146223d904290193404b360e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d55233cc7f128b3146223d90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 13:46:51 2022 +0100 mlang: Use EnumSystemLocalesEx() to enumerate locales. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 35ae7aabec9..a34c0749ecf 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -48,8 +48,6 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); -static DWORD MLANG_tls_index; /* to store various per thead data */ - /* FIXME: * Under what circumstances HKEY_CLASSES_ROOT\MIME\Database\Codepage and * HKEY_CLASSES_ROOT\MIME\Database\Charset are used? @@ -930,21 +928,6 @@ static void UnlockModule(void) InterlockedDecrement(&dll_count); } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) { - case DLL_PROCESS_ATTACH: - MLANG_tls_index = TlsAlloc(); - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - if (lpv) break; - TlsFree(MLANG_tls_index); - break; - } - return TRUE; -} - HRESULT WINAPI ConvertINetMultiByteToUnicode( LPDWORD pdwMode, DWORD dwEncoding, @@ -2403,26 +2386,24 @@ struct enum_locales_data DWORD total, allocated; }; -static BOOL CALLBACK enum_locales_proc(LPWSTR locale) +static BOOL CALLBACK enum_locales_proc(LPWSTR locale, DWORD flags, LPARAM lparam) { - WCHAR *end; - struct enum_locales_data *data = TlsGetValue(MLANG_tls_index); + struct enum_locales_data *data = (struct enum_locales_data *)lparam; RFC1766INFO *info; TRACE("%s\n", debugstr_w(locale)); if (data->total >= data->allocated) { - data->allocated += 32; + data->allocated *= 2; data->info = HeapReAlloc(GetProcessHeap(), 0, data->info, data->allocated * sizeof(RFC1766INFO)); if (!data->info) return FALSE; } info = &data->info[data->total]; - info->lcid = wcstol(locale, &end, 16); - if (*end) /* invalid number */ - return FALSE; + info->lcid = LocaleNameToLCID( locale, 0 ); + if (info->lcid == LOCALE_CUSTOM_UNSPECIFIED) return TRUE; info->wszRfc1766[0] = 0; lcid_to_rfc1766W( info->lcid, info->wszRfc1766, MAX_RFC1766_NAME ); @@ -2458,9 +2439,7 @@ static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum) return E_OUTOFMEMORY; } - TlsSetValue(MLANG_tls_index, &data); - EnumSystemLocalesW(enum_locales_proc, 0/*LOCALE_SUPPORTED*/); - TlsSetValue(MLANG_tls_index, NULL); + EnumSystemLocalesEx(enum_locales_proc, LOCALE_WINDOWS, (LPARAM)&data, NULL); TRACE("enumerated %ld rfc1766 structures\n", data.total);

1 0

Rémi Bernon : winebus.sys: Assume SDL device effects are running by default.
by Alexandre Julliard March 18, 2022

March 18, 2022

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 March 18, 2022

March 18, 2022

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

Alexandre Julliard : mlang/tests: Don't test all possible invalid codepages.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: 9f1762e8310522d1f3a4c22003f4946fb0c4adec URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f1762e8310522d1f3a4c220… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:24:39 2022 +0100 mlang/tests: Don't test all possible invalid codepages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index c9e22adfd4e..da0b87ed729 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2214,7 +2214,7 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) UINT i; HRESULT hr; - for (i = 0; i < 0xffff; i++) + for (i = 0; i < 1000; i++) { hr = IMultiLanguage2_IsCodePageInstallable(ml2, i);

1 0

Alexandre Julliard : mlang: Use a registry script to register codepages.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: 8adebaaab73d67386ba05f0677523ead4e185f6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8adebaaab73d67386ba05f06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 13:46:30 2022 +0100 mlang: Use a registry script to register codepages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/Makefile.in | 8 +- dlls/mlang/mlang.c | 63 --------- dlls/mlang/mlang.rc | 20 +++ dlls/mlang/mlang.rgs | 372 +++++++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 1 - 5 files changed, 396 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8adebaaab73d67386ba0…

1 0