December 2021 - Wine-Commits

Zhiyi Zhang : uxtheme: Use StretchBlt() when resizing a source image for tiling.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: bcbe1bcff33d9c49e3c20adcc00c84c179a5e7cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcbe1bcff33d9c49e3c20adc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 30 14:50:33 2021 +0800 uxtheme: Use StretchBlt() when resizing a source image for tiling. For example, when a theme part has a source image with 0xff00ff as transparent pixels and the sizing margin is larger than the destination, the source image is first resized to fit the destination, during which, StretchBlt() should be used instead of TransparentBlt() because the image should not be blended with the temporary memory device context. Fix group box background may be drawn in black. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index bf294ed3cc8..04ea1e79df9 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -779,8 +779,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); SelectObject(hdcSrc, bmpSrcResized); + /* Use ALPHABLEND_NONE because the image is getting resized, rather than blended with the target */ UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, ALPHABLEND_NONE, 0); rcSrc.left = 0; rcSrc.top = 0;

1 0

Jinoh Kang : kernelbase: Fix infinite loop in Internal_EnumCalendarInfo.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 9c5fa40ebdb1fc0616839560d318bea7e40c63a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c5fa40ebdb1fc0616839560… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Nov 30 11:36:36 2021 +0900 kernelbase: Fix infinite loop in Internal_EnumCalendarInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52129 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 24 ------------------------ dlls/kernelbase/locale.c | 13 ++++++------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a5c2ad1068d..94c9ce3ad1b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7045,12 +7045,6 @@ static void test_EnumCalendarInfoA(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoA( calinfo_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7079,12 +7073,6 @@ static void test_EnumCalendarInfoW(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoW( calinfo_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7114,12 +7102,6 @@ static void test_EnumCalendarInfoExA(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoExA( calinfoex_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7149,12 +7131,6 @@ static void test_EnumCalendarInfoExW(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoExW( calinfoex_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 10f3b2698b5..667d1a4dc65 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2727,8 +2727,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, BOOL exex, LPARAM lparam ) { WCHAR buffer[256]; - DWORD optional = 0; - INT ret; + CALID calendars[2] = { id }; + INT ret, i; if (!proc) { @@ -2739,13 +2739,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, if (id == ENUM_ALL_CALENDARS) { if (!GetLocaleInfoW( lcid, LOCALE_ICALENDARTYPE | LOCALE_RETURN_NUMBER, - (WCHAR *)&id, sizeof(id) / sizeof(WCHAR) )) return FALSE; + (WCHAR *)&calendars[0], sizeof(calendars[0]) / sizeof(WCHAR) )) return FALSE; if (!GetLocaleInfoW( lcid, LOCALE_IOPTIONALCALENDAR | LOCALE_RETURN_NUMBER, - (WCHAR *)&optional, sizeof(optional) / sizeof(WCHAR) )) optional = 0; + (WCHAR *)&calendars[1], sizeof(calendars[1]) / sizeof(WCHAR) )) calendars[1] = 0; } - for (;;) + for (i = 0; i < ARRAY_SIZE(calendars) && calendars[i]; i++) { + id = calendars[i]; if (type & CAL_RETURN_NUMBER) ret = GetCalendarInfoW( lcid, id, type, NULL, 0, (LPDWORD)buffer ); else if (unicode) @@ -2764,8 +2765,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, else ret = proc( buffer ); } if (!ret) break; - if (!optional) break; - id = optional; } return TRUE; }

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.201.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 2b4d1bd0aeb5dc1efe6da6a797e4e87e91479db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b4d1bd0aeb5dc1efe6da6a7… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Dec 1 13:04:55 2021 +0100 winevulkan: Update to VK spec version 1.2.201. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 19 +++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 168 ++++++++++++++++++++++------------------ 4 files changed, 115 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b4d1bd0aeb5dc1efe6d…

1 0

Ivo Ivanov : dinput: Send Device Gain Reports only on DISFFC_RESET command.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 99ddfc8496a262d3b583b119b4ae02300fb3fdd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ddfc8496a262d3b583b119… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Wed Dec 1 12:44:57 2021 +0100 dinput: Send Device Gain Reports only on DISFFC_RESET command. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- dlls/dinput8/tests/hid.c | 45 --------------------------------------------- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 06be759b685..a1e8e30bc29 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1065,7 +1065,7 @@ static HRESULT hid_joystick_send_force_feedback_command( IDirectInputDevice8W *i if (status != HIDP_STATUS_SUCCESS) return status; if (!WriteFile( impl->device, report_buf, report_len, NULL, NULL )) return DIERR_INPUTLOST; - if (!unacquire) hid_joystick_send_device_gain( iface, impl->base.device_gain ); + if (!unacquire && command == DISFFC_RESET) hid_joystick_send_device_gain( iface, impl->base.device_gain ); return DI_OK; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index b57c5e9e841..bfd0185303d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8628,15 +8628,6 @@ static void test_device_managed_effect(void) .report_len = 2, .report_buf = {1, 0x04}, }, - /* device gain */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 6, - .report_len = 2, - .report_buf = {6, 0xff}, - .todo = TRUE, - .wine_only = TRUE, - }, }; struct hid_expect expect_disable_actuators[] = { @@ -8647,15 +8638,6 @@ static void test_device_managed_effect(void) .report_len = 2, .report_buf = {1, 0x05}, }, - /* device gain */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 6, - .report_len = 2, - .report_buf = {6, 0xff}, - .todo = TRUE, - .wine_only = TRUE, - }, }; struct hid_expect expect_stop_all[] = { @@ -8666,15 +8648,6 @@ static void test_device_managed_effect(void) .report_len = 2, .report_buf = {1, 0x06}, }, - /* device gain */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 6, - .report_len = 2, - .report_buf = {6, 0xff}, - .todo = TRUE, - .wine_only = TRUE, - }, }; struct hid_expect expect_device_pause[] = { @@ -8685,15 +8658,6 @@ static void test_device_managed_effect(void) .report_len = 2, .report_buf = {1, 0x02}, }, - /* device gain */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 6, - .report_len = 2, - .report_buf = {6, 0xff}, - .todo = TRUE, - .wine_only = TRUE, - }, }; struct hid_expect expect_device_continue[] = { @@ -8704,15 +8668,6 @@ static void test_device_managed_effect(void) .report_len = 2, .report_buf = {1, 0x03}, }, - /* device gain */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 6, - .report_len = 2, - .report_buf = {6, 0xff}, - .todo = TRUE, - .wine_only = TRUE, - }, }; struct hid_expect expect_create[] = {

1 0

Ivo Ivanov : dinput8/tests: Add a device gain report to test_device_managed_effect.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 38dbf21f1c402ee7c98b3fed247c4a6bab872f7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38dbf21f1c402ee7c98b3fed… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Wed Dec 1 12:44:54 2021 +0100 dinput8/tests: Add a device gain report to test_device_managed_effect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index c0bfc8e8b30..57e5672bd92 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8462,6 +8462,20 @@ static void test_device_managed_effect(void) OUTPUT(1, Data|Var|Abs), END_COLLECTION, + USAGE(1, PID_USAGE_DEVICE_GAIN_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 6), + + USAGE(1, PID_USAGE_DEVICE_GAIN), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x2710), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + USAGE(1, PID_USAGE_POOL_REPORT), COLLECTION(1, Logical), REPORT_ID(1, 1), @@ -8558,6 +8572,23 @@ static void test_device_managed_effect(void) { .InputReportByteLength = 5, }; + struct hid_expect expect_acquire[] = + { + /* device reset */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 1, + .report_len = 2, + .report_buf = {1, 0x01}, + }, + /* device gain */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 6, + .report_len = 2, + .report_buf = {6, 0xff}, + }, + }; struct hid_expect expect_reset[] = { /* device reset */ @@ -8835,7 +8866,7 @@ static void test_device_managed_effect(void) hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "SendForceFeedbackCommand returned %#x\n", hr ); - set_hid_expect( file, expect_reset, sizeof(expect_reset) ); + set_hid_expect( file, expect_acquire, sizeof(expect_acquire) ); hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); wait_hid_expect( file, 100 ); @@ -8901,7 +8932,7 @@ static void test_device_managed_effect(void) hr = IDirectInputEffect_GetEffectStatus( effect, &res ); ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetEffectStatus returned %#x\n", hr ); - set_hid_expect( file, expect_reset, sizeof(expect_reset) ); + set_hid_expect( file, expect_acquire, sizeof(expect_acquire) ); hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); wait_hid_expect( file, 100 );

1 0

Henri Verbeet : wined3d: Respect the BO memory offset in wined3d_context_gl_map_bo_address().
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: c590681e71c444116db71d57243708188e42f70c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c590681e71c444116db71d57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 17:55:22 2021 -0600 wined3d: Respect the BO memory offset in wined3d_context_gl_map_bo_address(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0c8ee0f605b..f02a0f400a6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2739,7 +2739,7 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return NULL; } - return (uint8_t *)map_ptr + (uintptr_t)data->addr; + return (uint8_t *)map_ptr + bo->buffer_offset + (uintptr_t)data->addr; } static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct wined3d_const_bo_address *data, @@ -2771,7 +2771,7 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct for (i = 0; i < range_count; ++i) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, - (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); + bo->b.buffer_offset + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } }

1 0

Jinoh Kang : kernel32/tests: Add tests for EnumCalendarInfo(Ex).
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 4010876a424ca99b324d2ebd4417df1d168bb39a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4010876a424ca99b324d2ebd… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Nov 30 11:35:45 2021 +0900 kernel32/tests: Add tests for EnumCalendarInfo(Ex). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 169 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index cad2577379b..a5c2ad1068d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7008,6 +7008,171 @@ static void test_geo_name(void) RegCloseKey(key); } +static const LCID locales_with_optional_calendars[] = { + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_LEBANON), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_EGYPT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_ALGERIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_IRAQ), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_JORDAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_KUWAIT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_LIBYA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_MOROCCO), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_OMAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_QATAR), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_SYRIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_TUNISIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_UAE), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_YEMEN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_DIVEHI, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_PERSIAN, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_THAI, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_URDU, SUBLANG_URDU_PAKISTAN), SORT_DEFAULT) +}; + +static BOOL CALLBACK calinfo_procA(LPSTR calinfo) +{ + (void)calinfo; + return TRUE; +} + +static void test_EnumCalendarInfoA(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoA( calinfo_procA, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoA( calinfo_procA, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoA for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfo_procW(LPWSTR calinfo) +{ + (void)calinfo; + return TRUE; +} + +static void test_EnumCalendarInfoW(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoW( calinfo_procW, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoW( calinfo_procW, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoW for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfoex_procA(LPSTR calinfo, LCID calid) +{ + (void)calinfo; + (void)calid; + return TRUE; +} + +static void test_EnumCalendarInfoExA(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoExA( calinfoex_procA, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoExA( calinfoex_procA, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoExA for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfoex_procW(LPWSTR calinfo, LCID calid) +{ + (void)calinfo; + (void)calid; + return TRUE; +} + +static void test_EnumCalendarInfoExW(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoExW( calinfoex_procW, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoExW( calinfoex_procW, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoExW for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -7060,4 +7225,8 @@ START_TEST(locale) test_NLSVersion(); test_geo_name(); test_sorting(); + test_EnumCalendarInfoA(); + test_EnumCalendarInfoW(); + test_EnumCalendarInfoExA(); + test_EnumCalendarInfoExW(); }

1 0

Rémi Bernon : dinput8/tests: Add a check_buffer helper to print buffer data.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 9d10c55b946b99636237b36cef4d09fc532c66e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d10c55b946b99636237b36c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 1 12:44:53 2021 +0100 dinput8/tests: Add a check_buffer helper to print buffer data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 9a58b1c7d44..545dff0c2dc 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -467,6 +467,25 @@ static NTSTATUS WINAPI driver_power( DEVICE_OBJECT *device, IRP *irp ) return PoCallDriver( ext->NextDeviceObject, irp ); } +#define check_buffer( a, b ) check_buffer_( __LINE__, a, b ) +static void check_buffer_( int line, HID_XFER_PACKET *packet, struct hid_expect *expect ) +{ + ULONG match_len, i; + + match_len = RtlCompareMemory( packet->reportBuffer, expect->report_buf, expect->report_len ); + ok( match_len == expect->report_len, "unexpected data:\n" ); + if (match_len == expect->report_len) return; + + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf( buf, "%08x ", i ); + do buf += sprintf( buf, " %02x", packet->reportBuffer[i] ); + while (++i % 16 && i < packet->reportBufferLen); + ok( 0, " %s\n", buffer ); + } +} + static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -574,8 +593,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); - ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, - "unexpected data\n" ); + check_buffer( packet, &expect ); winetest_pop_context(); irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; @@ -621,8 +639,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); - ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, - "unexpected data\n" ); + check_buffer( packet, &expect ); winetest_pop_context(); irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; @@ -668,8 +685,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( code == expect.code, "got %#x, expected %#x\n", code, expect.code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); - ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, - "unexpected data\n" ); + check_buffer( packet, &expect ); winetest_pop_context(); irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len;

1 0

Gabriel Ivăncescu : mshtml: Don't populate the props at all on IE9+ modes.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 39a8701dfdb7ba5b858d96d38f7935b5bee3ac3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=39a8701dfdb7ba5b858d96d3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 29 18:31:24 2021 +0200 mshtml: Don't populate the props at all on IE9+ modes. For IE9 and up we use proper attribute nodes without associated props. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3f7c60b0172..0a7755bea7f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6466,6 +6466,9 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) if(!This->dom_element) return S_FALSE; + if(dispex_compat_mode(dispex) >= COMPAT_MODE_IE9) + return S_OK; + nsres = nsIDOMElement_GetAttributes(This->dom_element, &attrs); if(NS_FAILED(nsres)) return E_FAIL;

1 0

Alexandre Julliard : wow64: Implement Wow64PrepareForException().
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 971480aaccc3d96bd471f50b23479c6acdf7fe2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=971480aaccc3d96bd471f50b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 11:25:00 2021 +0100 wow64: Implement Wow64PrepareForException(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/wow64.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 952b862a37d..74fc8d9905e 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -79,6 +79,7 @@ static const SYSTEM_SERVICE_TABLE *psdwhwin32; static void * (WINAPI *pBTCpuGetBopCode)(void); static void (WINAPI *pBTCpuProcessInit)(void); static void (WINAPI *pBTCpuSimulate)(void); +static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); void *dummy = RtlUnwind; @@ -534,6 +535,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex module = load_64bit_module( get_cpu_dll_name() ); GET_PTR( BTCpuGetBopCode ); GET_PTR( BTCpuProcessInit ); + GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSimulate ); module = load_64bit_module( L"wow64win.dll" ); @@ -769,3 +771,14 @@ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) thread_init(); pBTCpuSimulate(); } + + +/********************************************************************** + * Wow64PrepareForException (wow64.@) + */ +void WINAPI Wow64PrepareForException( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + EXCEPTION_POINTERS ptrs = { rec, context }; + + pBTCpuResetToConsistentState( &ptrs ); +} diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 69275b2580f..5c3f39c50f1 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -15,7 +15,7 @@ @ stub Wow64NotifyUnsimulateComplete @ stdcall Wow64PassExceptionToGuest(ptr) @ stub Wow64PrepareForDebuggerAttach -@ stub Wow64PrepareForException +@ stdcall Wow64PrepareForException(ptr ptr) @ stub Wow64RaiseException @ stub Wow64ShallowThunkAllocObjectAttributes32TO64_FNC @ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC

1 0