- Wine-Devel - list.winehq.org

[PATCH v3 1/4] dinput/tests: Add some tests for DIERR_INPUTLOST conditions.
by Rémi Bernon Jan. 13, 2022

Jan. 13, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: * Keep STATUS_UNPLUGGED after all, window foreground loss doesn't cause DIERR_INPUTLOST to be returned (as mouse tests suggest). * Set STATUS_UNPLUGGED and return DIERR_INPUTLOST only when device read fails, split the patch to make it more obvious that only the HID joystick logic is changed. dlls/dinput/tests/joystick8.c | 126 ++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d06b56cbf8c..7590835fe55 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stddef.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2741,6 +2742,127 @@ done: return device != NULL; } +static void test_input_lost( DWORD version ) +{ +#include "psh_hid_macros.h" + static const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 6), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 1, + }; + static const DIPROPDWORD buffer_size = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }, + .dwData = UINT_MAX, + }; + + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + DIDEVICEOBJECTDATA objdata[32] = {{0}}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IDirectInputDevice8W *device = NULL; + ULONG ref, count, size; + DIJOYSTATE2 state; + HRESULT hr; + + winetest_push_context( "%#x", version ); + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + if (FAILED(hr = dinput_test_create_device( version, &devinst, &device ))) goto done; + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, 0, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND ); + ok( hr == DI_OK, "SetCooperativeLevel returned %#x\n", hr ); + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &buffer_size.diph ); + ok( hr == DI_OK, "SetProperty returned %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DI_OK, "GetDeviceState returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + count = 1; + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( count == 0, "got %u expected %u\n", count, 0 ); + + pnp_driver_stop(); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Poll( device ); + todo_wine + ok( hr == DIERR_INPUTLOST, "Poll returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "Unacquire returned: %#x\n", hr ); + + dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %d\n", ref ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + winetest_pop_context(); +} + START_TEST( joystick8 ) { if (!dinput_test_init()) return; @@ -2758,6 +2880,10 @@ START_TEST( joystick8 ) test_simple_joystick( 0x500 ); test_simple_joystick( 0x700 ); test_simple_joystick( 0x800 ); + + test_input_lost( 0x500 ); + test_input_lost( 0x700 ); + test_input_lost( 0x800 ); } CoUninitialize(); -- 2.34.1

1 3

[PATCH v2 1/3] dinput/tests: Add some tests for DIERR_INPUTLOST conditions.
by Rémi Bernon Jan. 13, 2022

Jan. 13, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 126 ++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d06b56cbf8c..7590835fe55 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stddef.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2741,6 +2742,127 @@ done: return device != NULL; } +static void test_input_lost( DWORD version ) +{ +#include "psh_hid_macros.h" + static const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 6), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 1, + }; + static const DIPROPDWORD buffer_size = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }, + .dwData = UINT_MAX, + }; + + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + DIDEVICEOBJECTDATA objdata[32] = {{0}}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IDirectInputDevice8W *device = NULL; + ULONG ref, count, size; + DIJOYSTATE2 state; + HRESULT hr; + + winetest_push_context( "%#x", version ); + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + if (FAILED(hr = dinput_test_create_device( version, &devinst, &device ))) goto done; + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, 0, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND ); + ok( hr == DI_OK, "SetCooperativeLevel returned %#x\n", hr ); + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &buffer_size.diph ); + ok( hr == DI_OK, "SetProperty returned %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DI_OK, "GetDeviceState returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + count = 1; + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( count == 0, "got %u expected %u\n", count, 0 ); + + pnp_driver_stop(); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Poll( device ); + todo_wine + ok( hr == DIERR_INPUTLOST, "Poll returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "Unacquire returned: %#x\n", hr ); + + dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %d\n", ref ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + winetest_pop_context(); +} + START_TEST( joystick8 ) { if (!dinput_test_init()) return; @@ -2758,6 +2880,10 @@ START_TEST( joystick8 ) test_simple_joystick( 0x500 ); test_simple_joystick( 0x700 ); test_simple_joystick( 0x800 ); + + test_input_lost( 0x500 ); + test_input_lost( 0x700 ); + test_input_lost( 0x800 ); } CoUninitialize(); -- 2.34.1

2 4

[PATCH 1/3] dinput/tests: Add some tests for DIERR_INPUTLOST conditions.
by Rémi Bernon Jan. 13, 2022

Jan. 13, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 126 ++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d06b56cbf8c..7590835fe55 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stddef.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2741,6 +2742,127 @@ done: return device != NULL; } +static void test_input_lost( DWORD version ) +{ +#include "psh_hid_macros.h" + static const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 6), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 1, + }; + static const DIPROPDWORD buffer_size = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }, + .dwData = UINT_MAX, + }; + + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + DIDEVICEOBJECTDATA objdata[32] = {{0}}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IDirectInputDevice8W *device = NULL; + ULONG ref, count, size; + DIJOYSTATE2 state; + HRESULT hr; + + winetest_push_context( "%#x", version ); + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + if (FAILED(hr = dinput_test_create_device( version, &devinst, &device ))) goto done; + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, 0, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND ); + ok( hr == DI_OK, "SetCooperativeLevel returned %#x\n", hr ); + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &buffer_size.diph ); + ok( hr == DI_OK, "SetProperty returned %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DI_OK, "GetDeviceState returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + count = 1; + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( count == 0, "got %u expected %u\n", count, 0 ); + + pnp_driver_stop(); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Poll( device ); + todo_wine + ok( hr == DIERR_INPUTLOST, "Poll returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "Unacquire returned: %#x\n", hr ); + + dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %d\n", ref ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + winetest_pop_context(); +} + START_TEST( joystick8 ) { if (!dinput_test_init()) return; @@ -2758,6 +2880,10 @@ START_TEST( joystick8 ) test_simple_joystick( 0x500 ); test_simple_joystick( 0x700 ); test_simple_joystick( 0x800 ); + + test_input_lost( 0x500 ); + test_input_lost( 0x700 ); + test_input_lost( 0x800 ); } CoUninitialize(); -- 2.34.1

2 4

[PATCH] mfplat: Add MECapture* events to tracing.
by Nikolay Sivov Jan. 13, 2022

Jan. 13, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 6 ++++++ include/mfobjects.idl | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 978340a7ece..f36c960f852 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2134,6 +2134,12 @@ static const char *debugstr_eventid(DWORD event) X(MEAudioSessionFormatChanged), X(MEAudioSessionDisconnected), X(MEAudioSessionExclusiveModeOverride), + X(MECaptureAudioSessionVolumeChanged), + X(MECaptureAudioSessionDeviceRemoved), + X(MECaptureAudioSessionFormatChanged), + X(MECaptureAudioSessionDisconnected), + X(MECaptureAudioSessionExclusiveModeOverride), + X(MECaptureAudioSessionServerShutdown), X(METrustUnknown), X(MEPolicyChanged), X(MEContentProtectionMessage), diff --git a/include/mfobjects.idl b/include/mfobjects.idl index b2d0e5d06ec..640cae88af6 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -579,6 +579,13 @@ enum { MEAudioSessionDisconnected = 320, MEAudioSessionExclusiveModeOverride = 321, MESinkV1Anchor = MEAudioSessionExclusiveModeOverride, + MECaptureAudioSessionVolumeChanged = 322, + MECaptureAudioSessionDeviceRemoved = 323, + MECaptureAudioSessionFormatChanged = 324, + MECaptureAudioSessionDisconnected = 325, + MECaptureAudioSessionExclusiveModeOverride = 326, + MECaptureAudioSessionServerShutdown = 327, + MESinkV2Anchor = MECaptureAudioSessionServerShutdown, METrustUnknown = 400, MEPolicyChanged = 401, MEContentProtectionMessage = 402, -- 2.34.1

1 0

[PATCH] wininet/tests: Add more tests for InternetTimeToSystemTime().
by Ziqing Hui Jan. 13, 2022

Jan. 13, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/wininet/tests/internet.c | 105 +++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8513aabe174..4c2facb635a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -28,6 +28,7 @@ #include "winineti.h" #include "winerror.h" #include "winreg.h" +#include "winnls.h" #include "wine/test.h" @@ -896,60 +897,73 @@ static void InternetTimeFromSystemTimeW_test(void) error ); } -static void InternetTimeToSystemTimeA_test(void) +static void test_InternetTimeToSystemTime(void) { BOOL ret; + unsigned int i; SYSTEMTIME time; - static const SYSTEMTIME expect = { 2005, 1, 5, 7, 12, 6, 35, 0 }; - static const char string[] = "Fri, 07 Jan 2005 12:06:35 GMT"; - static const char string2[] = " fri 7 jan 2005 12 06 35"; + WCHAR buffer[64]; + static const SYSTEMTIME expect1 = { 2005, 1, 5, 7, 12, 6, 35, 0 }; + static const SYSTEMTIME expect2 = { 2022, 1, 2, 11, 11, 13, 5, 0 }; - ret = pInternetTimeToSystemTimeA( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); + static const struct test_data + { + const char *string; + const SYSTEMTIME *expect; + BOOL match; + BOOL todo; + } + test_data[] = + { + { "Fri, 07 Jan 2005 12:06:35 GMT", &expect1, TRUE }, + { " fri, 7 jan 2005 12 06 35", &expect1, TRUE }, + { "Fri, 07-01-2005 12:06:35", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE, TRUE }, + { "2, 11 01 2022 11 13 05", &expect2, TRUE, TRUE }, + { "2, 11-01-2022 11#13^05", &expect2, TRUE, TRUE }, + { "2, 11*01/2022 11+13=05", &expect2, TRUE, TRUE }, + { "2, 11-Jan-2022 11:13:05", &expect2, TRUE, TRUE }, + { "Fr", NULL, FALSE }, + }; - ret = pInternetTimeToSystemTimeA( string2, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); -} + ret = pInternetTimeToSystemTimeA(NULL, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeA(NULL, &time, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeW(NULL, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); + ret = pInternetTimeToSystemTimeW(NULL, &time, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); -static void InternetTimeToSystemTimeW_test(void) -{ - BOOL ret; - SYSTEMTIME time; - static const SYSTEMTIME expect = { 2005, 1, 5, 7, 12, 6, 35, 0 }; - static const WCHAR string[] = { 'F','r','i',',',' ','0','7',' ','J','a','n',' ','2','0','0','5',' ', - '1','2',':','0','6',':','3','5',' ','G','M','T',0 }; - static const WCHAR string2[] = { ' ','f','r','i',' ','7',' ','j','a','n',' ','2','0','0','5',' ', - '1','2',' ','0','6',' ','3','5',0 }; - static const WCHAR string3[] = { 'F','r',0 }; - - ret = pInternetTimeToSystemTimeW( NULL, NULL, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - - ret = pInternetTimeToSystemTimeW( NULL, &time, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - - ret = pInternetTimeToSystemTimeW( string, NULL, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + const struct test_data *test = &test_data[i]; + winetest_push_context("Test %u", i); - ret = pInternetTimeToSystemTimeW( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + memset(&time, 0, sizeof(time)); + ret = pInternetTimeToSystemTimeA(test->string, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeA(test->string, &time, 0); + ok(ret, "InternetTimeToSystemTimeA failed: %u.\n", GetLastError()); + todo_wine_if(test->todo) + ok(!test->match || !memcmp(&time, test->expect, sizeof(*test->expect)), + "Got unexpected system time.\n"); - ret = pInternetTimeToSystemTimeW( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + MultiByteToWideChar(CP_ACP, 0, test->string, -1, buffer, ARRAY_SIZE(buffer)); - ret = pInternetTimeToSystemTimeW( string2, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + memset(&time, 0, sizeof(time)); + ret = pInternetTimeToSystemTimeW(buffer, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); + ret = pInternetTimeToSystemTimeW(buffer, &time, 0); + ok(ret, "InternetTimeToSystemTimeW failed: %u.\n", GetLastError()); + todo_wine_if(test->todo) + ok(!test->match || !memcmp(&time, test->expect, sizeof(*test->expect)), + "Got unexpected system time.\n"); - ret = pInternetTimeToSystemTimeW( string3, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + winetest_pop_context(); + } } static void test_IsDomainLegalCookieDomainW(void) @@ -1922,8 +1936,7 @@ START_TEST(internet) { InternetTimeFromSystemTimeA_test(); InternetTimeFromSystemTimeW_test(); - InternetTimeToSystemTimeA_test(); - InternetTimeToSystemTimeW_test(); + test_InternetTimeToSystemTime(); } if (pIsDomainLegalCookieDomainW && ((void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerA || -- 2.25.1

1 0

[PATCH] opencl: Use types with consistent alignment for unixlib params structures.
by Zebediah Figura Jan. 13, 2022

Jan. 13, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52389 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/opencl/make_opencl | 54 +++++--- dlls/opencl/unixlib.h | 278 ++++++++++++++++++++-------------------- 2 files changed, 173 insertions(+), 159 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 7e88b6daaaf..088120c8081 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -37,21 +37,22 @@ my %core_categories = (); my %arg_types = ( - "cl_bitfield" => [ "int64", "wine_dbgstr_longlong(%s)" ], - "double" => [ "double", "%.16e" ], - "float" => [ "float", "%.8e" ], - "int" => [ "long", "%d" ], - "int8_t" => [ "long", "%d" ], - "int16_t" => [ "long", "%d" ], - "int32_t" => [ "long", "%d" ], - "int64_t" => [ "int64", "wine_dbgstr_longlong(%s)" ], - "intptr_t" => [ "long", "%Id" ], - "size_t" => [ "long", "%Iu" ], - "uint8_t" => [ "long", "%u" ], - "uint16_t" => [ "long", "%u" ], - "uint32_t" => [ "long", "%u" ], - "uint64_t" => [ "int64", "wine_dbgstr_longlong(%s)" ], - "unsigned int" => [ "long", "%u" ], + # spec unixlib format + "cl_bitfield" => [ "int64", "ULONGLONG", "wine_dbgstr_longlong(%s)" ], + "double" => [ "double", "DOUBLE", "%.16e" ], + "float" => [ "float", "float", "%.8e" ], + "int" => [ "long", "int", "%d" ], + "int8_t" => [ "long", "int8_t", "%d" ], + "int16_t" => [ "long", "int16_t", "%d" ], + "int32_t" => [ "long", "int32_t", "%d" ], + "int64_t" => [ "int64", "LONGLONG", "wine_dbgstr_longlong(%s)" ], + "intptr_t" => [ "long", "INT_PTR", "%Id" ], + "size_t" => [ "long", "SIZE_T", "%Iu" ], + "uint8_t" => [ "long", "uint8_t", "%u" ], + "uint16_t" => [ "long", "uint16_t", "%u" ], + "uint32_t" => [ "long", "uint32_t", "%u" ], + "uint64_t" => [ "int64", "ULONGLONG", "wine_dbgstr_longlong(%s)" ], + "unsigned int" => [ "long", "unsigned int", "%u" ], ); my %unsupported_extensions = @@ -99,7 +100,7 @@ sub generate_pe_thunk($$) } elsif (defined $arg_types{$ptype}) { - my $format = ${$arg_types{$ptype}}[1]; + my $format = ${$arg_types{$ptype}}[2]; $trace_arg .= ", " . ($format =~ /^%/ ? $format : "%s"); $trace_call_arg .= ", " . sprintf $format =~ /^%/ ? "%s" : $format, $pname; } @@ -220,10 +221,23 @@ sub get_func_params($$) $params .= " $proto* __retval;\n" unless $proto eq "cl_int"; foreach my $arg (@{$func->[1]}) { + my $ptype = get_arg_type( $arg ); next unless $arg->findnodes("./name"); - (my $argtext = $arg->textContent()) =~ s/ +/ /g; - $argtext =~ s/CL_CALLBACK/WINAPI/g; - $params .= " $argtext;\n"; + my $pname = get_arg_name( $arg ); + (my $param = $arg->textContent()) =~ s/ +/ /g; + $param =~ s/CL_CALLBACK/WINAPI/g; + if ($param =~ /[[*]/) + { + $params .= " $param;\n"; + } + elsif (defined $arg_types{$ptype}) + { + $params .= " ${$arg_types{$ptype}}[1] $pname;\n"; + } + else + { + die "Unknown type %s in %s\n", $param, $name; + } } return $params . "};\n"; } @@ -398,7 +412,7 @@ sub parse_file($) my $basetype = @{$type->findnodes("./type")}[0]; if ($type->textContent() =~ /[[*]/) { - $arg_types{$name} = ["ptr", "%p"]; + $arg_types{$name} = ["ptr", $name, "%p"]; } elsif (defined($basetype) and defined($arg_types{$basetype->textContent})) { diff --git a/dlls/opencl/unixlib.h b/dlls/opencl/unixlib.h index 79968a4daf1..5a9b1556a04 100644 --- a/dlls/opencl/unixlib.h +++ b/dlls/opencl/unixlib.h @@ -3,7 +3,7 @@ struct clBuildProgram_params { cl_program program; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const char* options; void (WINAPI* pfn_notify)(cl_program program, void* user_data); @@ -13,10 +13,10 @@ struct clBuildProgram_params struct clCompileProgram_params { cl_program program; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const char* options; - cl_uint num_input_headers; + uint32_t num_input_headers; const cl_program* input_headers; const char** header_include_names; void (WINAPI* pfn_notify)(cl_program program, void* user_data); @@ -27,8 +27,8 @@ struct clCreateBuffer_params { cl_mem* __retval; cl_context context; - cl_mem_flags flags; - size_t size; + ULONGLONG flags; + SIZE_T size; void* host_ptr; cl_int* errcode_ret; }; @@ -38,7 +38,7 @@ struct clCreateCommandQueue_params cl_command_queue* __retval; cl_context context; cl_device_id device; - cl_command_queue_properties properties; + ULONGLONG properties; cl_int* errcode_ret; }; @@ -46,7 +46,7 @@ struct clCreateContext_params { cl_context* __retval; const cl_context_properties* properties; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* devices; void (WINAPI* pfn_notify)(const char* errinfo, const void* private_info, size_t cb, void* user_data); void* user_data; @@ -57,7 +57,7 @@ struct clCreateContextFromType_params { cl_context* __retval; const cl_context_properties* properties; - cl_device_type device_type; + ULONGLONG device_type; void (WINAPI* pfn_notify)(const char* errinfo, const void* private_info, size_t cb, void* user_data); void* user_data; cl_int* errcode_ret; @@ -67,7 +67,7 @@ struct clCreateImage_params { cl_mem* __retval; cl_context context; - cl_mem_flags flags; + ULONGLONG flags; const cl_image_format* image_format; const cl_image_desc* image_desc; void* host_ptr; @@ -78,11 +78,11 @@ struct clCreateImage2D_params { cl_mem* __retval; cl_context context; - cl_mem_flags flags; + ULONGLONG flags; const cl_image_format* image_format; - size_t image_width; - size_t image_height; - size_t image_row_pitch; + SIZE_T image_width; + SIZE_T image_height; + SIZE_T image_row_pitch; void* host_ptr; cl_int* errcode_ret; }; @@ -91,13 +91,13 @@ struct clCreateImage3D_params { cl_mem* __retval; cl_context context; - cl_mem_flags flags; + ULONGLONG flags; const cl_image_format* image_format; - size_t image_width; - size_t image_height; - size_t image_depth; - size_t image_row_pitch; - size_t image_slice_pitch; + SIZE_T image_width; + SIZE_T image_height; + SIZE_T image_depth; + SIZE_T image_row_pitch; + SIZE_T image_slice_pitch; void* host_ptr; cl_int* errcode_ret; }; @@ -113,7 +113,7 @@ struct clCreateKernel_params struct clCreateKernelsInProgram_params { cl_program program; - cl_uint num_kernels; + uint32_t num_kernels; cl_kernel* kernels; cl_uint* num_kernels_ret; }; @@ -122,7 +122,7 @@ struct clCreateProgramWithBinary_params { cl_program* __retval; cl_context context; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const size_t* lengths; const unsigned char** binaries; @@ -134,7 +134,7 @@ struct clCreateProgramWithBuiltInKernels_params { cl_program* __retval; cl_context context; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const char* kernel_names; cl_int* errcode_ret; @@ -144,7 +144,7 @@ struct clCreateProgramWithSource_params { cl_program* __retval; cl_context context; - cl_uint count; + uint32_t count; const char** strings; const size_t* lengths; cl_int* errcode_ret; @@ -154,9 +154,9 @@ struct clCreateSampler_params { cl_sampler* __retval; cl_context context; - cl_bool normalized_coords; - cl_addressing_mode addressing_mode; - cl_filter_mode filter_mode; + uint32_t normalized_coords; + uint32_t addressing_mode; + uint32_t filter_mode; cl_int* errcode_ret; }; @@ -164,8 +164,8 @@ struct clCreateSubBuffer_params { cl_mem* __retval; cl_mem buffer; - cl_mem_flags flags; - cl_buffer_create_type buffer_create_type; + ULONGLONG flags; + uint32_t buffer_create_type; const void* buffer_create_info; cl_int* errcode_ret; }; @@ -174,7 +174,7 @@ struct clCreateSubDevices_params { cl_device_id in_device; const cl_device_partition_property* properties; - cl_uint num_devices; + uint32_t num_devices; cl_device_id* out_devices; cl_uint* num_devices_ret; }; @@ -194,7 +194,7 @@ struct clEnqueueBarrier_params struct clEnqueueBarrierWithWaitList_params { cl_command_queue command_queue; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -204,10 +204,10 @@ struct clEnqueueCopyBuffer_params cl_command_queue command_queue; cl_mem src_buffer; cl_mem dst_buffer; - size_t src_offset; - size_t dst_offset; - size_t size; - cl_uint num_events_in_wait_list; + SIZE_T src_offset; + SIZE_T dst_offset; + SIZE_T size; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -220,11 +220,11 @@ struct clEnqueueCopyBufferRect_params const size_t* src_origin; const size_t* dst_origin; const size_t* region; - size_t src_row_pitch; - size_t src_slice_pitch; - size_t dst_row_pitch; - size_t dst_slice_pitch; - cl_uint num_events_in_wait_list; + SIZE_T src_row_pitch; + SIZE_T src_slice_pitch; + SIZE_T dst_row_pitch; + SIZE_T dst_slice_pitch; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -234,10 +234,10 @@ struct clEnqueueCopyBufferToImage_params cl_command_queue command_queue; cl_mem src_buffer; cl_mem dst_image; - size_t src_offset; + SIZE_T src_offset; const size_t* dst_origin; const size_t* region; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -250,7 +250,7 @@ struct clEnqueueCopyImage_params const size_t* src_origin; const size_t* dst_origin; const size_t* region; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -262,8 +262,8 @@ struct clEnqueueCopyImageToBuffer_params cl_mem dst_buffer; const size_t* src_origin; const size_t* region; - size_t dst_offset; - cl_uint num_events_in_wait_list; + SIZE_T dst_offset; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -273,10 +273,10 @@ struct clEnqueueFillBuffer_params cl_command_queue command_queue; cl_mem buffer; const void* pattern; - size_t pattern_size; - size_t offset; - size_t size; - cl_uint num_events_in_wait_list; + SIZE_T pattern_size; + SIZE_T offset; + SIZE_T size; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -288,7 +288,7 @@ struct clEnqueueFillImage_params const void* fill_color; const size_t* origin; const size_t* region; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -298,11 +298,11 @@ struct clEnqueueMapBuffer_params void** __retval; cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_map; - cl_map_flags map_flags; - size_t offset; - size_t size; - cl_uint num_events_in_wait_list; + uint32_t blocking_map; + ULONGLONG map_flags; + SIZE_T offset; + SIZE_T size; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; cl_int* errcode_ret; @@ -313,13 +313,13 @@ struct clEnqueueMapImage_params void** __retval; cl_command_queue command_queue; cl_mem image; - cl_bool blocking_map; - cl_map_flags map_flags; + uint32_t blocking_map; + ULONGLONG map_flags; const size_t* origin; const size_t* region; size_t* image_row_pitch; size_t* image_slice_pitch; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; cl_int* errcode_ret; @@ -334,7 +334,7 @@ struct clEnqueueMarker_params struct clEnqueueMarkerWithWaitList_params { cl_command_queue command_queue; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -342,10 +342,10 @@ struct clEnqueueMarkerWithWaitList_params struct clEnqueueMigrateMemObjects_params { cl_command_queue command_queue; - cl_uint num_mem_objects; + uint32_t num_mem_objects; const cl_mem* mem_objects; - cl_mem_migration_flags flags; - cl_uint num_events_in_wait_list; + ULONGLONG flags; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -354,11 +354,11 @@ struct clEnqueueNDRangeKernel_params { cl_command_queue command_queue; cl_kernel kernel; - cl_uint work_dim; + uint32_t work_dim; const size_t* global_work_offset; const size_t* global_work_size; const size_t* local_work_size; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -368,11 +368,11 @@ struct clEnqueueNativeKernel_params cl_command_queue command_queue; void (WINAPI* user_func)(void*); void* args; - size_t cb_args; - cl_uint num_mem_objects; + SIZE_T cb_args; + uint32_t num_mem_objects; const cl_mem* mem_list; const void** args_mem_loc; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -381,11 +381,11 @@ struct clEnqueueReadBuffer_params { cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_read; - size_t offset; - size_t size; + uint32_t blocking_read; + SIZE_T offset; + SIZE_T size; void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -394,16 +394,16 @@ struct clEnqueueReadBufferRect_params { cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_read; + uint32_t blocking_read; const size_t* buffer_origin; const size_t* host_origin; const size_t* region; - size_t buffer_row_pitch; - size_t buffer_slice_pitch; - size_t host_row_pitch; - size_t host_slice_pitch; + SIZE_T buffer_row_pitch; + SIZE_T buffer_slice_pitch; + SIZE_T host_row_pitch; + SIZE_T host_slice_pitch; void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -412,13 +412,13 @@ struct clEnqueueReadImage_params { cl_command_queue command_queue; cl_mem image; - cl_bool blocking_read; + uint32_t blocking_read; const size_t* origin; const size_t* region; - size_t row_pitch; - size_t slice_pitch; + SIZE_T row_pitch; + SIZE_T slice_pitch; void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -427,7 +427,7 @@ struct clEnqueueTask_params { cl_command_queue command_queue; cl_kernel kernel; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -437,7 +437,7 @@ struct clEnqueueUnmapMemObject_params cl_command_queue command_queue; cl_mem memobj; void* mapped_ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -445,7 +445,7 @@ struct clEnqueueUnmapMemObject_params struct clEnqueueWaitForEvents_params { cl_command_queue command_queue; - cl_uint num_events; + uint32_t num_events; const cl_event* event_list; }; @@ -453,11 +453,11 @@ struct clEnqueueWriteBuffer_params { cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_write; - size_t offset; - size_t size; + uint32_t blocking_write; + SIZE_T offset; + SIZE_T size; const void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -466,16 +466,16 @@ struct clEnqueueWriteBufferRect_params { cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_write; + uint32_t blocking_write; const size_t* buffer_origin; const size_t* host_origin; const size_t* region; - size_t buffer_row_pitch; - size_t buffer_slice_pitch; - size_t host_row_pitch; - size_t host_slice_pitch; + SIZE_T buffer_row_pitch; + SIZE_T buffer_slice_pitch; + SIZE_T host_row_pitch; + SIZE_T host_slice_pitch; const void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -484,13 +484,13 @@ struct clEnqueueWriteImage_params { cl_command_queue command_queue; cl_mem image; - cl_bool blocking_write; + uint32_t blocking_write; const size_t* origin; const size_t* region; - size_t input_row_pitch; - size_t input_slice_pitch; + SIZE_T input_row_pitch; + SIZE_T input_slice_pitch; const void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -508,8 +508,8 @@ struct clFlush_params struct clGetCommandQueueInfo_params { cl_command_queue command_queue; - cl_command_queue_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -517,8 +517,8 @@ struct clGetCommandQueueInfo_params struct clGetContextInfo_params { cl_context context; - cl_context_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -526,8 +526,8 @@ struct clGetContextInfo_params struct clGetDeviceIDs_params { cl_platform_id platform; - cl_device_type device_type; - cl_uint num_entries; + ULONGLONG device_type; + uint32_t num_entries; cl_device_id* devices; cl_uint* num_devices; }; @@ -535,8 +535,8 @@ struct clGetDeviceIDs_params struct clGetDeviceInfo_params { cl_device_id device; - cl_device_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -544,8 +544,8 @@ struct clGetDeviceInfo_params struct clGetEventInfo_params { cl_event event; - cl_event_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -553,8 +553,8 @@ struct clGetEventInfo_params struct clGetEventProfilingInfo_params { cl_event event; - cl_profiling_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -562,8 +562,8 @@ struct clGetEventProfilingInfo_params struct clGetImageInfo_params { cl_mem image; - cl_image_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -571,9 +571,9 @@ struct clGetImageInfo_params struct clGetKernelArgInfo_params { cl_kernel kernel; - cl_uint arg_index; - cl_kernel_arg_info param_name; - size_t param_value_size; + uint32_t arg_index; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -581,8 +581,8 @@ struct clGetKernelArgInfo_params struct clGetKernelInfo_params { cl_kernel kernel; - cl_kernel_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -591,8 +591,8 @@ struct clGetKernelWorkGroupInfo_params { cl_kernel kernel; cl_device_id device; - cl_kernel_work_group_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -600,15 +600,15 @@ struct clGetKernelWorkGroupInfo_params struct clGetMemObjectInfo_params { cl_mem memobj; - cl_mem_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; struct clGetPlatformIDs_params { - cl_uint num_entries; + uint32_t num_entries; cl_platform_id* platforms; cl_uint* num_platforms; }; @@ -616,8 +616,8 @@ struct clGetPlatformIDs_params struct clGetPlatformInfo_params { cl_platform_id platform; - cl_platform_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -626,8 +626,8 @@ struct clGetProgramBuildInfo_params { cl_program program; cl_device_id device; - cl_program_build_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -635,8 +635,8 @@ struct clGetProgramBuildInfo_params struct clGetProgramInfo_params { cl_program program; - cl_program_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -644,8 +644,8 @@ struct clGetProgramInfo_params struct clGetSamplerInfo_params { cl_sampler sampler; - cl_sampler_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -653,9 +653,9 @@ struct clGetSamplerInfo_params struct clGetSupportedImageFormats_params { cl_context context; - cl_mem_flags flags; - cl_mem_object_type image_type; - cl_uint num_entries; + ULONGLONG flags; + uint32_t image_type; + uint32_t num_entries; cl_image_format* image_formats; cl_uint* num_image_formats; }; @@ -664,10 +664,10 @@ struct clLinkProgram_params { cl_program* __retval; cl_context context; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const char* options; - cl_uint num_input_programs; + uint32_t num_input_programs; const cl_program* input_programs; void (WINAPI* pfn_notify)(cl_program program, void* user_data); void* user_data; @@ -757,7 +757,7 @@ struct clRetainSampler_params struct clSetEventCallback_params { cl_event event; - cl_int command_exec_callback_type; + int32_t command_exec_callback_type; void (WINAPI* pfn_notify)(cl_event event, cl_int event_command_status, void *user_data); void* user_data; }; @@ -765,8 +765,8 @@ struct clSetEventCallback_params struct clSetKernelArg_params { cl_kernel kernel; - cl_uint arg_index; - size_t arg_size; + uint32_t arg_index; + SIZE_T arg_size; const void* arg_value; }; @@ -780,7 +780,7 @@ struct clSetMemObjectDestructorCallback_params struct clSetUserEventStatus_params { cl_event event; - cl_int execution_status; + int32_t execution_status; }; struct clUnloadCompiler_params @@ -794,7 +794,7 @@ struct clUnloadPlatformCompiler_params struct clWaitForEvents_params { - cl_uint num_events; + uint32_t num_events; const cl_event* event_list; }; -- 2.34.1

1 0

[PATCH 1/2] d3d10core/tests: Run test_generate_mips separately.
by Stefan Dösinger Jan. 12, 2022

Jan. 12, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Similar problem as test_instanced_draw, but much less reliable. I suspect it is behind test failures like http://test.winehq.org/data/695c320507f89539378b93bcf8221b1bc8965325/win200… --- dlls/d3d10core/tests/d3d10core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 287292ebb5f..ffab5cbfca3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19319,7 +19319,6 @@ START_TEST(d3d10core) queue_test(test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); - queue_test(test_generate_mips); queue_test(test_alpha_to_coverage); queue_test(test_unbound_multisample_texture); queue_test(test_multiple_viewports); @@ -19338,11 +19337,10 @@ START_TEST(d3d10core) run_queued_tests(); - /* There should be no reason this test can't be run in parallel with the - * others, yet it fails when doing so. (AMD Radeon HD 6310, Windows 7) */ + /* There should be no reason these tests can't be run in parallel with the + * others, yet they randomly fail or crash when doing so. + * (AMD Radeon HD 6310, Radeon 560, Windows 7 and Windows 10) */ test_stream_output_vs(); - /* Same here, this test fails randomly on Win10 when run together with - * others on Radeon GPUs. Radeon 560 (0x1002:0x67ef), both on the testbot - * and Stefan's macbook. */ test_instanced_draw(); + test_generate_mips(); } -- 2.34.1

3 4

[PATCH v2 0/8] Fix infinite loop for END_OPEN figures with coincident last/first vertex
by Stefan Brüns Jan. 12, 2022

Jan. 12, 2022

This is an attempt to fix https://bugs.winehq.org/show_bug.cgi?id=51139 The first two patches just increase the coverage for stroking and StrokeContains, and proved helpful during development of the actual fix. The third patch fixes a small issue in the segment comparision helper. The fourth patch adds the test case triggering bug 51139. As the test causes a hang, the critical part is commented out instead of using the regular wine_todo. The fifth patch is preparative refactoring, so the bugfix itself is more self-contained. The sixth patch is the actual fix, and patch 7 reenables the critical test case parts. The last patch is just some minor, final cleanup. This patch series obsoletes the previous attempt: "d2d: Suppress last empty segment also for D2D1_FIGURE_END_OPEN", which avoided the infinite loop, but also caused several regressions. --- v2: Patch 2: Update reference to Windows CI output, add some slack for minor rendering differences between Wine and Windows Patch 4: Remove leftover debug trace, add some tolerance for GetBounds on bezier segment Patch 6: Remove a spurious whitespace change Stefan Brüns (8): d2d1/tests: Test StrokeContains when last segment is bezier and closes the path d2d1/tests: Add test for single quadratic bezier segment d2d1/tests: Avoid out-of-bounds access when comparing segments d2d1/tests: Test coincident last/first vertex for both OPEN and CLOSED d2d1: Refactor outline generation as preparation for new TYPE_END vertex d2d1: Use special vertex TYPE_END when last/first coincede d2d1/tests: Reenable tests formerly causing infinite loop d2d1: remove extraneous checks for last vertex dlls/d2d1/geometry.c | 215 +++++++++++++++-------------------------- dlls/d2d1/tests/d2d1.c | 170 ++++++++++++++++++++++++++++++-- 2 files changed, 242 insertions(+), 143 deletions(-) -- 2.34.1

4 18

[PATCH v2 1/4] dinput/tests: Check that InputReportByteLength bytes are read.
by Rémi Bernon Jan. 12, 2022

Jan. 12, 2022

Regardless of how long the driver packet is. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/hid.c | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index f8e8a275b09..d6232d578ca 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2110,6 +2110,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; send_hid_input( file, expect, sizeof(expect) ); @@ -2190,6 +2200,21 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle value, (report_id ? 3 : 4) ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + send_hid_input( file, expect_small, sizeof(expect_small) ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == report_id ? 2 : caps.InputReportByteLength - 1, + "got length %u, expected %u\n", value, report_id ? 2 : caps.InputReportByteLength - 1 ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } @@ -2212,6 +2237,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; overlapped.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); overlapped2.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2269,6 +2304,19 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( !memcmp( buffer + off, buffer + caps.InputReportByteLength, caps.InputReportByteLength - off ), "expected identical reports\n" ); + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + send_hid_input( file, expect_small, sizeof(expect_small) ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + todo_wine_if( report_id ) + ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } -- 2.34.1

2 4

Missing v7.0-rc5 tag in wine-staging git repository?
by Olivier F. R. Dierick Jan. 12, 2022

Jan. 12, 2022

Hello, I updated my local wine-staging repository today. There is a release commit for v7.0-rc5 but the tags stops at v7.0-rc4. Can you check that? Regards. -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

3 4