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

Rémi Bernon : dinput: Call enum_objects to initialize the device object format.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 44cb6c8444e8b0030b80c6b7953e9fc9f460461d URL: https://gitlab.winehq.org/wine/wine/-/commit/44cb6c8444e8b0030b80c6b7953e9f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 08:38:53 2023 +0100 dinput: Call enum_objects to initialize the device object format. --- dlls/dinput/device.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index df19f615a55..407e4f52a38 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2183,11 +2183,15 @@ static const GUID *object_instance_guid( const DIDEVICEOBJECTINSTANCEW *instance return &GUID_Unknown; } -static BOOL CALLBACK enum_objects_count( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) +static BOOL enum_objects_count( struct dinput_device *impl, UINT index, struct hid_value_caps *caps, + const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); DIDATAFORMAT *format = &impl->device_format; + if (index == -1) return DIENUM_STOP; + format->dwNumObjs++; + if (instance->wUsagePage == HID_USAGE_PAGE_PID) return DIENUM_CONTINUE; + format->dwDataSize = max( format->dwDataSize, instance->dwOfs + sizeof(LONG) ); if (instance->dwType & DIDFT_BUTTON) impl->caps.dwButtons++; if (instance->dwType & DIDFT_AXIS) impl->caps.dwAxes++; @@ -2200,36 +2204,46 @@ static BOOL CALLBACK enum_objects_count( const DIDEVICEOBJECTINSTANCEW *instance FIXME( "multiple device state reports found!\n" ); } - format->dwNumObjs++; return DIENUM_CONTINUE; } -static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) +static BOOL enum_objects_init( struct dinput_device *impl, UINT index, struct hid_value_caps *caps, + const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); DIDATAFORMAT *format = &impl->device_format; DIOBJECTDATAFORMAT *object_format; - object_format = format->rgodf + format->dwNumObjs; + if (index == -1) return DIENUM_STOP; + if (instance->wUsagePage == HID_USAGE_PAGE_PID) return DIENUM_CONTINUE; + + object_format = format->rgodf + index; object_format->pguid = object_instance_guid( instance ); object_format->dwOfs = instance->dwOfs; object_format->dwType = instance->dwType; object_format->dwFlags = instance->dwFlags; if (impl->object_properties && (instance->dwType & (DIDFT_AXIS | DIDFT_POV))) - reset_object_value( impl, format->dwNumObjs, NULL, instance, NULL ); + reset_object_value( impl, index, caps, instance, NULL ); - format->dwNumObjs++; return DIENUM_CONTINUE; } HRESULT dinput_device_init_device_format( IDirectInputDevice8W *iface ) { + static const DIPROPHEADER filter = + { + .dwSize = sizeof(filter), + .dwHeaderSize = sizeof(filter), + .dwHow = DIPH_DEVICE, + }; struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); DIDATAFORMAT *format = &impl->device_format; ULONG i, size; + HRESULT hr; + + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_ALL, enum_objects_count, NULL ); + if (FAILED(hr)) return hr; - IDirectInputDevice8_EnumObjects( iface, enum_objects_count, iface, DIDFT_ALL ); if (format->dwDataSize > DEVICE_STATE_MAX_SIZE) { FIXME( "unable to create device, state is too large\n" ); @@ -2242,8 +2256,15 @@ HRESULT dinput_device_init_device_format( IDirectInputDevice8W *iface ) format->dwSize = sizeof(*format); format->dwObjSize = sizeof(*format->rgodf); format->dwFlags = DIDF_ABSAXIS; - format->dwNumObjs = 0; - IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); + + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, enum_objects_init, NULL ); + if (FAILED(hr)) return hr; + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_POV, enum_objects_init, NULL ); + if (FAILED(hr)) return hr; + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_BUTTON, enum_objects_init, NULL ); + if (FAILED(hr)) return hr; + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_NODATA, enum_objects_init, NULL ); + if (FAILED(hr)) return hr; if (TRACE_ON( dinput )) {

1 0

Rémi Bernon : dinput: Split enum_objects_count helper from enum_objects_init.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 570e183b4153db8e701ea1ed1c6ec468b527cb4d URL: https://gitlab.winehq.org/wine/wine/-/commit/570e183b4153db8e701ea1ed1c6ec4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Mar 19 14:48:18 2023 +0100 dinput: Split enum_objects_count helper from enum_objects_init. --- dlls/dinput/device.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 7fa2a89cf35..df19f615a55 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2183,35 +2183,39 @@ static const GUID *object_instance_guid( const DIDEVICEOBJECTINSTANCEW *instance return &GUID_Unknown; } -static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) +static BOOL CALLBACK enum_objects_count( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); DIDATAFORMAT *format = &impl->device_format; - DIOBJECTDATAFORMAT *obj_format; - if (!format->rgodf) + format->dwDataSize = max( format->dwDataSize, instance->dwOfs + sizeof(LONG) ); + if (instance->dwType & DIDFT_BUTTON) impl->caps.dwButtons++; + if (instance->dwType & DIDFT_AXIS) impl->caps.dwAxes++; + if (instance->dwType & DIDFT_POV) impl->caps.dwPOVs++; + if (instance->dwType & (DIDFT_BUTTON|DIDFT_AXIS|DIDFT_POV)) { - format->dwDataSize = max( format->dwDataSize, instance->dwOfs + sizeof(LONG) ); - if (instance->dwType & DIDFT_BUTTON) impl->caps.dwButtons++; - if (instance->dwType & DIDFT_AXIS) impl->caps.dwAxes++; - if (instance->dwType & DIDFT_POV) impl->caps.dwPOVs++; - if (instance->dwType & (DIDFT_BUTTON|DIDFT_AXIS|DIDFT_POV)) - { - if (!impl->device_state_report_id) - impl->device_state_report_id = instance->wReportId; - else if (impl->device_state_report_id != instance->wReportId) - FIXME( "multiple device state reports found!\n" ); - } - } - else - { - obj_format = format->rgodf + format->dwNumObjs; - obj_format->pguid = object_instance_guid( instance ); - obj_format->dwOfs = instance->dwOfs; - obj_format->dwType = instance->dwType; - obj_format->dwFlags = instance->dwFlags; + if (!impl->device_state_report_id) + impl->device_state_report_id = instance->wReportId; + else if (impl->device_state_report_id != instance->wReportId) + FIXME( "multiple device state reports found!\n" ); } + format->dwNumObjs++; + return DIENUM_CONTINUE; +} + +static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); + DIDATAFORMAT *format = &impl->device_format; + DIOBJECTDATAFORMAT *object_format; + + object_format = format->rgodf + format->dwNumObjs; + object_format->pguid = object_instance_guid( instance ); + object_format->dwOfs = instance->dwOfs; + object_format->dwType = instance->dwType; + object_format->dwFlags = instance->dwFlags; + if (impl->object_properties && (instance->dwType & (DIDFT_AXIS | DIDFT_POV))) reset_object_value( impl, format->dwNumObjs, NULL, instance, NULL ); @@ -2225,7 +2229,7 @@ HRESULT dinput_device_init_device_format( IDirectInputDevice8W *iface ) DIDATAFORMAT *format = &impl->device_format; ULONG i, size; - IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); + IDirectInputDevice8_EnumObjects( iface, enum_objects_count, iface, DIDFT_ALL ); if (format->dwDataSize > DEVICE_STATE_MAX_SIZE) { FIXME( "unable to create device, state is too large\n" );

1 0

Rémi Bernon : dinput: Pass additional information to enum_object callback.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 1cda1509731a42b6c0913a3eaa47d584135057cb URL: https://gitlab.winehq.org/wine/wine/-/commit/1cda1509731a42b6c0913a3eaa47d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 15:27:48 2023 +0100 dinput: Pass additional information to enum_object callback. --- dlls/dinput/device.c | 51 +++++++++++++++-------- dlls/dinput/device_private.h | 8 +++- dlls/dinput/joystick_hid.c | 96 ++++++++++++++++++-------------------------- dlls/dinput/keyboard.c | 18 ++++----- dlls/dinput/mouse.c | 15 +++---- 5 files changed, 97 insertions(+), 91 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for udiv instruction.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 19b799fd628a404ca8977cac7caf08fce2ebffaf URL: https://gitlab.winehq.org/wine/wine/-/commit/19b799fd628a404ca8977cac7caf08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 21:14:52 2023 +0100 d3d10/effect: Add support for udiv instruction. --- dlls/d3d10/effect.c | 25 ++++ dlls/d3d10/tests/effect.c | 300 +++++++++++++++++++++++++--------------------- 2 files changed, 186 insertions(+), 139 deletions(-)

1 0

Rémi Bernon : dinput: Rewrite IDirectInputDevice8W_BuildActionMap.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 7b3f3d60782c63edd621353a635616f4cea029da URL: https://gitlab.winehq.org/wine/wine/-/commit/7b3f3d60782c63edd621353a635616… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 16:07:36 2023 +0100 dinput: Rewrite IDirectInputDevice8W_BuildActionMap. --- dlls/dinput/device.c | 139 +++++++++++++++++++++--------------------- dlls/dinput/tests/joystick8.c | 79 +++++------------------- 2 files changed, 84 insertions(+), 134 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for itof instruction.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: cbc25006388af5c729ff459792630d2598549450 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbc25006388af5c729ff459792630d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 20:53:50 2023 +0100 d3d10/effect: Add support for itof instruction. --- dlls/d3d10/effect.c | 10 ++ dlls/d3d10/tests/effect.c | 305 ++++++++++++++++++++++++++-------------------- 2 files changed, 185 insertions(+), 130 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for ineg instruction.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 8e2412fcc3feea85c71d2274cf2a6eab05b3d3f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e2412fcc3feea85c71d2274cf2a6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 20:59:37 2023 +0100 d3d10/effect: Add support for ineg instruction. --- dlls/d3d10/effect.c | 14 ++++++++++++++ dlls/d3d10/tests/effect.c | 29 +++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 142ba7bec72..d61c94c982f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -252,6 +252,19 @@ static void pres_cos(float **args, unsigned int n, const struct preshader_instr retval[i] = cos(args[0][i]); } +static void pres_ineg(float **args, unsigned int n, const struct preshader_instr *instr) +{ + int *arg1 = (int *)args[0]; + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + { + int v = -arg1[i]; + retval[i] = *(float *)&v; + } +} + static void pres_itof(float **args, unsigned int n, const struct preshader_instr *instr) { float *retval = args[1]; @@ -344,6 +357,7 @@ static const struct preshader_op_info preshader_ops[] = { 0x104, "frc", pres_frc }, { 0x108, "sin", pres_sin }, { 0x109, "cos", pres_cos }, + { 0x120, "ineg", pres_ineg }, { 0x130, "itof", pres_itof }, { 0x133, "ftou", pres_ftou }, { 0x137, "ftob", pres_ftob }, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5a265adc07a..a39c15601c1 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8182,15 +8182,15 @@ technique10 tech } pass p8 { - SetBlendState( NULL, 0.1 * g_var3.x, 0 ); + SetBlendState( NULL, 0.1 * -g_var3.x, 0 ); } } #endif static DWORD fx_test_value_expression[] = { - 0x43425844, 0xd57994e8, 0xc1f47b80, 0x5ab836c5, 0x02ff0a6e, 0x00000001, 0x000012c0, 0x00000001, - 0x00000024, 0x30315846, 0x00001294, 0xfeff1001, 0x00000001, 0x00000003, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000f8c, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x43425844, 0xa151a4d6, 0x36eec21c, 0xfbe6ea0f, 0xb267f68f, 0x00000001, 0x000012e0, 0x00000001, + 0x00000024, 0x30315846, 0x000012b4, 0xfeff1001, 0x00000001, 0x00000003, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000fac, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x746e6900, 0x003d0034, 0x00010000, @@ -8301,20 +8301,21 @@ static DWORD fx_test_value_expression[] = 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00000434, 0x00000000, 0x4c584600, 0x00003043, 0x00000100, 0x40000400, 0x00000110, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, - 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00387000, 0x000001ac, - 0x43425844, 0x56d4ee7a, 0x14d0efda, 0x7f2a38e0, 0x183b28f2, 0x00000001, 0x000001ac, 0x00000003, + 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00387000, 0x000001cc, + 0x43425844, 0xe22c15f6, 0xc12fca9e, 0x201275ad, 0x6952a463, 0x00000001, 0x000001cc, 0x00000003, 0x0000002c, 0x000000a8, 0x000000c4, 0x42415443, 0x00000074, 0x0000001c, 0x0000004b, 0x46580400, 0x00000001, 0x0000001c, 0x00000100, 0x00000048, 0x00000030, 0x00000002, 0x00000001, 0x00000038, 0x00000000, 0x61765f67, 0xab003372, 0x00020001, 0x00040001, 0x00000001, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000014, 0x00000004, 0x3dcccccd, 0x00000000, 0x00000000, - 0x00000000, 0x434c5846, 0x000000e0, 0x00000005, 0x13000001, 0x00000001, 0x00000000, 0x00000002, - 0x00000000, 0x00000000, 0x00000007, 0x00000000, 0x20500001, 0x00000002, 0x00000000, 0x00000007, - 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x20500001, - 0x00000002, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, - 0x00000004, 0x00000001, 0x20500001, 0x00000002, 0x00000000, 0x00000007, 0x00000000, 0x00000000, + 0x00000000, 0x434c5846, 0x00000100, 0x00000006, 0x12000001, 0x00000001, 0x00000000, 0x00000002, + 0x00000000, 0x00000000, 0x00000007, 0x00000000, 0x13000001, 0x00000001, 0x00000000, 0x00000007, + 0x00000000, 0x00000000, 0x00000007, 0x00000004, 0x20500001, 0x00000002, 0x00000000, 0x00000007, + 0x00000004, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x20500001, + 0x00000002, 0x00000000, 0x00000007, 0x00000004, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000004, 0x00000001, 0x20500001, 0x00000002, 0x00000000, 0x00000007, 0x00000004, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000002, 0x20500001, 0x00000002, 0x00000000, - 0x00000007, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, + 0x00000007, 0x00000004, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000004, 0x00000030, 0x00000000, 0x00000003, 0xffffffff, 0x00000000, 0x00000030, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000036, 0x00000014, @@ -8337,7 +8338,7 @@ static DWORD fx_test_value_expression[] = 0x00000001, 0x00000caa, 0x00000cb6, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x00000cb9, 0x0000000b, 0x00000000, 0x00000001, 0x00000da9, 0x00000002, 0x00000000, 0x00000001, 0x00000db5, 0x00000dc1, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x00000dc4, - 0x0000000b, 0x00000000, 0x00000001, 0x00000f74, 0x00000002, 0x00000000, 0x00000001, 0x00000f80, + 0x0000000b, 0x00000000, 0x00000001, 0x00000f94, 0x00000002, 0x00000000, 0x00000001, 0x00000fa0, }; static float get_frc(float v) @@ -8525,7 +8526,7 @@ static void test_effect_value_expression(void) pass = t->lpVtbl->GetPassByName(t, "p8"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); - f[0] = 2.0f; + f[0] = -2.0f; hr = g_var3->lpVtbl->SetFloatVector(g_var3, f); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : d3d10/effect: Add support for imax instruction.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: c96c6b9826a9f8807441ac3ef8da2016eb9ca55d URL: https://gitlab.winehq.org/wine/wine/-/commit/c96c6b9826a9f8807441ac3ef8da20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 18 21:09:08 2023 +0100 d3d10/effect: Add support for imax instruction. --- dlls/d3d10/effect.c | 14 ++++++++ dlls/d3d10/tests/effect.c | 87 ++++++++++++++++++++++++----------------------- 2 files changed, 59 insertions(+), 42 deletions(-)

1 0

Francois Gouget : mscoree/tests: Avoid temporary directory name collisions.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: c11e923422f40ab0ee5e512d81cb14c85faff6a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c11e923422f40ab0ee5e512d81cb14… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 19 20:07:33 2023 +0100 mscoree/tests: Avoid temporary directory name collisions. test_loadpaths_execute() was sometimes getting ERROR_ALREADY_EXISTS when creating its temporary directoryi. That was probably because GetTempFileNameW() only uses the low 16-bits of the 'random' LUID which goes over a wider range, potentially leading to collisions in the lower 16-bits. Avoid AllocateLocallyUniqueId() entirely and add a helper function to create a guaranteed new directory. Also try to use the current directory first as it is assumed to have been configured to ward off anti-virus programs (specifically Microsoft Defender) which is especially important when writing executables to that location. Only switch to the system's temporary directory if the current directory is not a writable location. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54560 --- dlls/mscoree/tests/mscoree.c | 55 +++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index e5065a41d88..adac72e5f4c 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -592,25 +592,55 @@ static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *ty return ret; } +static BOOL create_new_dir(WCHAR newdir[MAX_PATH], const WCHAR* parent, + const WCHAR* prefix) +{ + WCHAR path[MAX_PATH]; + BOOL try_tmpdir = TRUE; + static unsigned i = 0; + + if (!parent) + { + GetCurrentDirectoryW(ARRAY_SIZE(path), path); + parent = path; + } + while (1) + { + swprintf(newdir, MAX_PATH, L"%s\\%s%04d", path, prefix, i); + if (CreateDirectoryW(newdir, NULL)) + return TRUE; + switch (GetLastError()) + { + case ERROR_ACCESS_DENIED: + if (!try_tmpdir) + return FALSE; + try_tmpdir = FALSE; + GetTempPathW(ARRAY_SIZE(path), path); + path[wcslen(path) - 1] = 0; /* redundant trailing backslash */ + parent = path; + break; + case ERROR_ALREADY_EXISTS: + i++; + break; + default: + return FALSE; + } + } +} + static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, const WCHAR *cfg_name, const WCHAR *dll_dest, BOOL expect_failure, BOOL todo) { - WCHAR tmp[MAX_PATH], tmpdir[MAX_PATH], tmpexe[MAX_PATH], tmpcfg[MAX_PATH], tmpdll[MAX_PATH]; + WCHAR tmpdir[MAX_PATH], tmpexe[MAX_PATH], tmpcfg[MAX_PATH], tmpdll[MAX_PATH]; PROCESS_INFORMATION pi; STARTUPINFOW si = { 0 }; WCHAR *ptr, *end; DWORD exit_code = 0xdeadbeef; - LUID id; BOOL ret; - GetTempPathW(MAX_PATH, tmp); - ret = AllocateLocallyUniqueId(&id); - ok(ret, "AllocateLocallyUniqueId failed: %lu\n", GetLastError()); - ret = GetTempFileNameW(tmp, L"loadpaths", id.LowPart, tmpdir); - ok(ret, "GetTempFileNameW failed: %lu\n", GetLastError()); - - ret = CreateDirectoryW(tmpdir, NULL); - ok(ret, "CreateDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError()); + ok(create_new_dir(tmpdir, NULL, L"loadpaths"), + "failed to create a new dir %lu\n", GetLastError()); + end = tmpdir + wcslen(tmpdir); wcscpy(tmpexe, tmpdir); PathAppendW(tmpexe, exe_name); @@ -673,9 +703,8 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, ret = DeleteFileW(tmpexe); ok(ret, "DeleteFileW(%s) failed: %lu\n", debugstr_w(tmpexe), GetLastError()); - end = tmpdir + wcslen(tmp); - ptr = tmpdir + wcslen(tmpdir) - 1; - while (ptr > end && (ptr = wcsrchr(tmpdir, '\\'))) + ptr = end; + while (ptr >= end && (ptr = wcsrchr(tmpdir, '\\'))) { ret = RemoveDirectoryW(tmpdir); ok(ret, "RemoveDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError());

1 0

Rémi Bernon : dinput: Pass device object format index to queue_event.
by Alexandre Julliard March 20, 2023

March 20, 2023

Module: wine Branch: master Commit: 1e594b1c0fd23c1aedc13b3c2d8c91c1fc00f8ee URL: https://gitlab.winehq.org/wine/wine/-/commit/1e594b1c0fd23c1aedc13b3c2d8c91… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 20 15:07:46 2023 +0100 dinput: Pass device object format index to queue_event. --- dlls/dinput/device.c | 61 +++++++++++++++++++---------- dlls/dinput/device_private.h | 3 +- dlls/dinput/joystick_hid.c | 10 +++-- dlls/dinput/keyboard.c | 8 ++-- dlls/dinput/mouse.c | 91 +++++++++++++++++++------------------------- 5 files changed, 92 insertions(+), 81 deletions(-)

1 0