September 2021 - Wine-commits

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_GetDeviceData tests.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 878dff8dae3b2d00fd05f1777836686e24158d2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=878dff8dae3b2d00fd05f177… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 09:06:25 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetDeviceData tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 15e2c838a23..166ca805937 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3378,6 +3378,23 @@ static void test_simple_joystick(void) {.lX = 0, .lY = 0, .rgdwPOV = {-1, -1, -1, -1}, .rgbButtons = {0x80, 0x80}}, {.lX = 32767, .lY = 5594, .rgdwPOV = {13500, -1, -1, -1}, .rgbButtons = {0x80}}, }; + static const DIDEVICEOBJECTDATA expect_objdata[] = + { + {.dwOfs = 0x4, .dwData = 0xffff, .dwSequence = 0xa}, + {.dwOfs = 0x4, .dwData = 0xffff, .dwSequence = 0xa}, + {.dwOfs = 0, .dwData = 0xffff, .dwSequence = 0xa}, + {.dwOfs = 0x20, .dwData = 31500, .dwSequence = 0xa}, + {.dwOfs = 0x30, .dwData = 0x80, .dwSequence = 0xa}, + {.dwOfs = 0x4, .dwData = 0x512b, .dwSequence = 0xd}, + {.dwOfs = 0, .dwData = 0x512b, .dwSequence = 0xd}, + {.dwOfs = 0x20, .dwData = -1, .dwSequence = 0xd}, + {.dwOfs = 0x30, .dwData = 0, .dwSequence = 0xd}, + {.dwOfs = 0x31, .dwData = 0, .dwSequence = 0xd}, + {.dwOfs = 0x4, .dwData = 0, .dwSequence = 0xf}, + {.dwOfs = 0, .dwData = 0, .dwSequence = 0xf}, + {.dwOfs = 0x30, .dwData = 0x80, .dwSequence = 0xf}, + {.dwOfs = 0x31, .dwData = 0x80, .dwSequence = 0xf}, + }; const DIDEVICEINSTANCEW expect_devinst = { @@ -3437,6 +3454,7 @@ static void test_simple_joystick(void) }, }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + DIDEVICEOBJECTDATA objdata[32] = {{0}}; DIDEVICEINSTANCEW devinst = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; @@ -3838,6 +3856,116 @@ static void test_simple_joystick(void) check_member( state, expect_state[i], "%#x", rgbButtons[2] ); winetest_pop_context(); + res = 1; + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA) - 1, objdata, &res, DIGDD_PEEK ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + res = 1; + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + ok( hr == DIERR_NOTBUFFERED, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + prop_dword.diph.dwHow = DIPH_DEVICE; + prop_dword.diph.dwObj = 0; + prop_dword.dwData = 1; + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + + res = 1; + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( res == 0, "got %u expected %u\n", res, 0 ); + + send_hid_input( file, &injected_input[0], sizeof(*injected_input) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + ResetEvent( event ); + + res = 1; + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + ok( hr == DI_BUFFEROVERFLOW, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( res == 0, "got %u expected %u\n", res, 0 ); + res = 1; + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( res == 0, "got %u expected %u\n", res, 0 ); + + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + prop_dword.diph.dwHow = DIPH_DEVICE; + prop_dword.diph.dwObj = 0; + prop_dword.dwData = 10; + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + + send_hid_input( file, &injected_input[1], sizeof(*injected_input) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + ResetEvent( event ); + + res = 1; + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( res == 1, "got %u expected %u\n", res, 1 ); + check_member( objdata[0], expect_objdata[0], "%#x", dwOfs ); + check_member( objdata[0], expect_objdata[0], "%#x", dwData ); + todo_wine + check_member( objdata[0], expect_objdata[0], "%#x", dwSequence ); + ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); + res = 4; + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( res == 4, "got %u expected %u\n", res, 4 ); + for (i = 0; i < 4; ++i) + { + winetest_push_context( "objdata[%d]", i ); + check_member( objdata[i], expect_objdata[1 + i], "%#x", dwOfs ); + check_member( objdata[i], expect_objdata[1 + i], "%#x", dwData ); + todo_wine + check_member( objdata[i], expect_objdata[1 + i], "%#x", dwSequence ); + ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); + winetest_pop_context(); + } + + send_hid_input( file, &injected_input[2], sizeof(*injected_input) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + ResetEvent( event ); + send_hid_input( file, &injected_input[4], sizeof(*injected_input) ); + res = WaitForSingleObject( event, 100 ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + ResetEvent( event ); + + res = 1; + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + ok( hr == DI_BUFFEROVERFLOW, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( res == 1, "got %u expected %u\n", res, 1 ); + todo_wine + check_member( objdata[0], expect_objdata[5], "%#x", dwOfs ); + todo_wine + check_member( objdata[0], expect_objdata[5], "%#x", dwData ); + ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); + res = ARRAY_SIZE(objdata); + hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( res == 8, "got %u expected %u\n", res, 8 ); + for (i = 0; i < 8; ++i) + { + winetest_push_context( "objdata[%d]", i ); + todo_wine + check_member( objdata[i], expect_objdata[6 + i], "%#x", dwOfs ); + todo_wine_if( i != 3 && i != 4 && i != 7 ) + check_member( objdata[i], expect_objdata[6 + i], "%#x", dwData ); + ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); + winetest_pop_context(); + } + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_SetProperty tests.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 10ac8095cd2535edc73b579898407ef56028674c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ac8095cd2535edc73b5798… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 09:06:26 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SetProperty tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 391 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 391 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10ac8095cd2535edc73b…

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_EnumObjects tests.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 4b28a061ea106356e38b3dec1a64b62a40c279c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b28a061ea106356e38b3dec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 09:06:27 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_EnumObjects tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index ff23836e125..4316f2f8bb8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -52,6 +52,7 @@ #include "ddk/hidsdi.h" #include "ddk/hidpi.h" #include "ddk/hidport.h" +#include "hidusage.h" #include "devguid.h" #include "wine/test.h" @@ -60,6 +61,7 @@ #include "driver_hid.h" static HINSTANCE instance; +static BOOL localized; /* object names get translated */ #define EXPECT_VIDPID MAKELONG( 0x1209, 0x0001 ) static const WCHAR expect_vidpid_str[] = L"VID_1209&PID_0001"; @@ -3281,6 +3283,65 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c return DIENUM_CONTINUE; } +struct check_objects_todos +{ + BOOL ofs; + BOOL type; + BOOL collection_number; +}; + +struct check_objects_params +{ + UINT index; + UINT expect_count; + const DIDEVICEOBJECTINSTANCEW *expect_objs; + const struct check_objects_todos *todo_objs; +}; + +static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *args ) +{ + static const DIDEVICEOBJECTINSTANCEW unexpected_obj = {0}; + struct check_objects_params *params = args; + const DIDEVICEOBJECTINSTANCEW *exp = params->expect_objs + params->index; + const struct check_objects_todos *todo = params->todo_objs + params->index; + + winetest_push_context( "obj[%d]", params->index ); + + ok( params->index < params->expect_count, "unexpected extra object\n" ); + if (params->index >= params->expect_count) exp = &unexpected_obj; + + check_member( *obj, *exp, "%u", dwSize ); + check_member_guid( *obj, *exp, guidType ); + todo_wine_if( todo->ofs ) + check_member( *obj, *exp, "%#x", dwOfs ); + todo_wine_if( todo->type ) + check_member( *obj, *exp, "%#x", dwType ); + check_member( *obj, *exp, "%#x", dwFlags ); + if (!localized) todo_wine check_member_wstr( *obj, *exp, tszName ); + check_member( *obj, *exp, "%u", dwFFMaxForce ); + check_member( *obj, *exp, "%u", dwFFForceResolution ); + todo_wine_if( todo->collection_number ) + check_member( *obj, *exp, "%u", wCollectionNumber ); + check_member( *obj, *exp, "%u", wDesignatorIndex ); + check_member( *obj, *exp, "%#04x", wUsagePage ); + check_member( *obj, *exp, "%#04x", wUsage ); + check_member( *obj, *exp, "%#04x", dwDimension ); + check_member( *obj, *exp, "%#04x", wExponent ); + check_member( *obj, *exp, "%u", wReportId ); + + winetest_pop_context(); + + params->index++; + return DIENUM_CONTINUE; +} + +static BOOL CALLBACK check_object_count( const DIDEVICEOBJECTINSTANCEW *obj, void *args ) +{ + DWORD *count = args; + *count = *count + 1; + return DIENUM_CONTINUE; +} + static void test_simple_joystick(void) { #include "psh_hid_macros.h" @@ -3428,7 +3489,98 @@ static void test_simple_joystick(void) .wUsagePage = HID_USAGE_PAGE_GENERIC, .wUsage = HID_USAGE_GENERIC_JOYSTICK, }; + const DIDEVICEOBJECTINSTANCEW expect_objects[] = + { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(1), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Y Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Y, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = 0x4, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"X Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_X, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_POV, + .dwOfs = 0x8, + .dwType = DIDFT_POV|DIDFT_MAKEINSTANCE(0), + .tszName = L"Hat Switch", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_HATSWITCH, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = 0xc, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(0), + .tszName = L"Button 0", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x1, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = 0xd, + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(1), + .tszName = L"Button 1", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x2, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_COLLECTION|DIDFT_NODATA|DIDFT_MAKEINSTANCE(0), + .tszName = L"Collection 0 - Joystick", + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_COLLECTION|DIDFT_NODATA|DIDFT_MAKEINSTANCE(1), + .tszName = L"Collection 1 - Joystick", + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, + }; + const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = + { + {.ofs = TRUE, .type = TRUE, .collection_number = TRUE}, + {.ofs = TRUE, .type = TRUE, .collection_number = TRUE}, + {.ofs = TRUE, .collection_number = TRUE}, + {.ofs = TRUE, .collection_number = TRUE}, + {.ofs = TRUE, .collection_number = TRUE}, + {}, + {.type = TRUE}, + }; + struct check_objects_params check_objects_params = + { + .expect_count = ARRAY_SIZE(expect_objects), + .expect_objs = expect_objects, + .todo_objs = objects_todos, + }; DIPROPGUIDANDPATH prop_guid_path = { .diph = @@ -3755,6 +3907,20 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_NOTINITIALIZED, "IDirectInputDevice8_GetProperty DIPROP_APPDATA returned %#x\n", hr ); + hr = IDirectInputDevice8_EnumObjects( device, NULL, NULL, DIDFT_ALL ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, 0x20 ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + res = 0; + hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); + ok( hr == DI_OK, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + ok( res == 4, "got %u expected %u\n", res, 4 ); + hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); + ok( hr == DI_OK, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", + check_objects_params.expect_count - check_objects_params.index ); + hr = IDirectInputDevice8_SetDataFormat( device, NULL ); ok( hr == E_POINTER, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); @@ -4384,6 +4550,7 @@ START_TEST( hid ) BOOL is_wow64; instance = GetModuleHandleW( NULL ); + localized = GetUserDefaultLCID() != MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); pSignerSign = (void *)GetProcAddress( LoadLibraryW( L"mssign32" ), "SignerSign" ); if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64)

1 0

Alexandre Julliard : winebus.sys: Fix a typo in find_device_from_iohid().
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: aff08c7e14236d9cbcdaafd1e644aabd718acc4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff08c7e14236d9cbcdaafd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 12:51:18 2021 +0200 winebus.sys: Fix a typo in find_device_from_iohid(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 15f37dd2188..d44f7ae257d 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -127,7 +127,7 @@ static struct platform_private *find_device_from_iohid(IOHIDDeviceRef IOHIDDevic struct platform_private *private; LIST_FOR_EACH_ENTRY(private, &device_list, struct platform_private, unix_device.entry) - if (!private->device == IOHIDDevice) return private; + if (private->device == IOHIDDevice) return private; return NULL; }

1 0

Alexandre Julliard : winebus.sys: Remove the no longer used CFStringToWSTR function.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 80a57c617bd0f90c0fa584de08ac512447181cb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a57c617bd0f90c0fa584de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 12:56:49 2021 +0200 winebus.sys: Remove the no longer used CFStringToWSTR function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index d44f7ae257d..b1c11ee22ec 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -132,13 +132,6 @@ static struct platform_private *find_device_from_iohid(IOHIDDeviceRef IOHIDDevic return NULL; } -static void CFStringToWSTR(CFStringRef cstr, LPWSTR wstr, int length) -{ - int len = min(CFStringGetLength(cstr), length-1); - CFStringGetCharacters(cstr, CFRangeMake(0, len), (UniChar*)wstr); - wstr[len] = 0; -} - static DWORD CFNumberToDWORD(CFNumberRef num) { int dwNum = 0;

1 0

Alexandre Julliard : wineboot: Add a generic mechanism for pre-installing things before the main wine.inf section.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 0f284520ec45fcbed25e01399107c1df8c7de91a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f284520ec45fcbed25e0139… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 12:45:46 2021 +0200 wineboot: Add a generic mechanism for pre-installing things before the main wine.inf section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 9 --------- loader/wine.inf.in | 8 ++++++-- programs/wineboot/wineboot.c | 19 +++++++++---------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 23f0fbdd4f1..df39fd440b3 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1076,15 +1076,6 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, BOOL ret; int i; - if (flags & SPINST_REGISTRY) - { - struct registry_callback_info info; - - info.default_root = key_root; - info.delete = FALSE; - if (!iterate_section_fields( hinf, section, L"WinePreInstall", registry_callback, &info )) - return FALSE; - } if (flags & SPINST_REGSVR) { if (iterate_section_fields( hinf, section, L"WineFakeDlls", fake_dlls_callback, NULL )) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ac30d9560c6..e600ee82b37 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -26,6 +26,12 @@ [version] signature="$CHICAGO$" +[PreInstall.ntamd64] +AddReg=Wow64 + +[PreInstall.ntarm64] +AddReg=Wow64 + [DefaultInstall] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls @@ -78,7 +84,6 @@ AddReg=\ [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls -WinePreInstall=Wow64 UpdateInis=SystemIni CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ @@ -105,7 +110,6 @@ AddReg=\ [DefaultInstall.ntarm64] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls -WinePreInstall=Wow64 UpdateInis=SystemIni CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 92276fcbe76..4a18265c1de 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1327,7 +1327,7 @@ static HWND show_wait_window(void) return hwnd; } -static HANDLE start_rundll32( const WCHAR *inf_path, WORD machine ) +static HANDLE start_rundll32( const WCHAR *inf_path, const WCHAR *install, WORD machine ) { WCHAR app[MAX_PATH + ARRAY_SIZE(L"\\rundll32.exe" )]; STARTUPINFOW si; @@ -1345,12 +1345,7 @@ static HANDLE start_rundll32( const WCHAR *inf_path, WORD machine ) len = lstrlenW(app) + ARRAY_SIZE(L" setupapi,InstallHinfSection DefaultInstall 128 ") + lstrlenW(inf_path); if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return 0; - - lstrcpyW( buffer, app ); - lstrcatW( buffer, L" setupapi,InstallHinfSection" ); - lstrcatW( buffer, machine != IMAGE_FILE_MACHINE_TARGET_HOST ? L" Wow64Install" : L" DefaultInstall" ); - lstrcatW( buffer, L" 128 " ); - lstrcatW( buffer, inf_path ); + swprintf( buffer, len, L"%s setupapi,InstallHinfSection %s 128 %s", app, install, inf_path ); if (CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) CloseHandle( pi.hThread ); @@ -1480,7 +1475,7 @@ static void update_wineprefix( BOOL force ) if (NtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), machines, sizeof(machines), NULL )) machines[0] = 0; - if ((process = start_rundll32( inf_path, IMAGE_FILE_MACHINE_TARGET_HOST ))) + if ((process = start_rundll32( inf_path, L"PreInstall", IMAGE_FILE_MACHINE_TARGET_HOST ))) { HWND hwnd = show_wait_window(); for (;;) @@ -1490,9 +1485,13 @@ static void update_wineprefix( BOOL force ) if (res == WAIT_OBJECT_0) { CloseHandle( process ); - if (HIWORD(machines[count]) & 4 /* native machine */) count++; if (!machines[count]) break; - if (!(process = start_rundll32( inf_path, LOWORD(machines[count++]) ))) break; + if (HIWORD(machines[count]) & 4 /* native machine */) + process = start_rundll32( inf_path, L"DefaultInstall", IMAGE_FILE_MACHINE_TARGET_HOST ); + else + process = start_rundll32( inf_path, L"Wow64Install", LOWORD(machines[count]) ); + count++; + if (!process) break; } else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); }

1 0

Alexandre Julliard : loader: Start the mount manager before registering dlls.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: cd37863832f54f38ba734b86b2bbc392d87a67c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd37863832f54f38ba734b86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 12:53:04 2021 +0200 loader: Start the mount manager before registering dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e600ee82b37..ce68069a9a2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -26,12 +26,30 @@ [version] signature="$CHICAGO$" +[PreInstall] +WineFakeDlls=FakeDllsPreInstall + [PreInstall.ntamd64] +WineFakeDlls=FakeDllsPreInstall AddReg=Wow64 [PreInstall.ntarm64] +WineFakeDlls=FakeDllsPreInstall AddReg=Wow64 +[PreInstall.Services] +AddService=MountMgr,0x800,MountMgrService + +[PreInstall.ntamd64.Services] +AddService=MountMgr,0x800,MountMgrService + +[PreInstall.ntarm64.Services] +AddService=MountMgr,0x800,MountMgrService + +[FakeDllsPreInstall] +11,,winedevice.exe +12,,mountmgr.sys + [DefaultInstall] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls @@ -156,7 +174,6 @@ AddService=BITS,0,BITSService AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService -AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -176,7 +193,6 @@ AddService=BITS,0,BITSService AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService -AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -196,7 +212,6 @@ AddService=BITS,0,BITSService AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService -AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -216,7 +231,6 @@ AddService=BITS,0,BITSService AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService -AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService

1 0

Alexandre Julliard : mountmgr: Make creating a backup optional for shell folders.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: fefb5da4ba4f848f47b2da909a3dfe590376badd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fefb5da4ba4f848f47b2da90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 16:49:30 2021 +0200 mountmgr: Make creating a backup optional for shell folders. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 13 ++++++++----- include/ddk/mountmgr.h | 1 + programs/winecfg/drive.c | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 2f669fcc868..cf7c9d636f0 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -335,13 +335,16 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) if (status != STATUS_BUFFER_TOO_SMALL) return status; } - if (!(backup = HeapAlloc( GetProcessHeap(), 0, strlen(buffer) + sizeof(".backup" ) ))) + if (input->create_backup) { - status = STATUS_NO_MEMORY; - goto done; + if (!(backup = HeapAlloc( GetProcessHeap(), 0, strlen(buffer) + sizeof(".backup" ) ))) + { + status = STATUS_NO_MEMORY; + goto done; + } + strcpy( backup, buffer ); + strcat( backup, ".backup" ); } - strcpy( backup, buffer ); - strcat( backup, ".backup" ); if (!lstat( buffer, &st )) /* move old folder/link out of the way */ { diff --git a/include/ddk/mountmgr.h b/include/ddk/mountmgr.h index 3c82e03ea36..11d4052305c 100644 --- a/include/ddk/mountmgr.h +++ b/include/ddk/mountmgr.h @@ -80,6 +80,7 @@ struct mountmgr_unix_drive struct mountmgr_shell_folder { + BOOL create_backup; ULONG folder_offset; ULONG folder_size; ULONG symlink_offset; diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index a82fe74dfe2..bee5be3af34 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -362,6 +362,7 @@ void set_shell_folder( const WCHAR *path, const char *dest ) if (dest) len += strlen(dest) + 1; if (!(ioctl = HeapAlloc( GetProcessHeap(), 0, len ))) return; + ioctl->create_backup = TRUE; ioctl->folder_offset = sizeof(*ioctl); ioctl->folder_size = nt_name.Length; memcpy( (char *)ioctl + ioctl->folder_offset, nt_name.Buffer, nt_name.Length );

1 0

Alexandre Julliard : mountmgr: Support $HOME paths to define shell folders.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: b3ea395681377265660e4bdc5df5b798f7a3f40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3ea395681377265660e4bdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 16:50:00 2021 +0200 mountmgr: Support $HOME paths to define shell folders. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index cf7c9d636f0..27f642df7e8 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -301,7 +301,8 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) UNICODE_STRING name; NTSTATUS status; ULONG size = 256; - char *buffer, *backup = NULL; + const char *home; + char *buffer = NULL, *backup = NULL, *homelink = NULL; struct stat st; unsigned int i; @@ -319,8 +320,21 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) if (!link[0]) link = NULL; } + if (link && (!strcmp( link, "$HOME" ) || !strncmp( link, "$HOME/", 6 )) && (home = getenv( "HOME" ))) + { + link += 5; + homelink = HeapAlloc( GetProcessHeap(), 0, strlen(home) + strlen(link) + 1 ); + strcpy( homelink, home ); + strcat( homelink, link ); + link = homelink; + } + /* ignore nonexistent link targets */ - if (link && stat( link, &st )) return STATUS_OBJECT_NAME_NOT_FOUND; + if (link && (stat( link, &st ) || !S_ISDIR( st.st_mode ))) + { + status = STATUS_OBJECT_NAME_NOT_FOUND; + goto done; + } name.Buffer = (WCHAR *)((char *)in_buff + input->folder_offset); name.Length = input->folder_size; @@ -328,11 +342,16 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) for (;;) { - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) return STATUS_NO_MEMORY; - status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN ); - if (!status) break; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) + { + status = STATUS_NO_MEMORY; + goto done; + } + status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); + if (status == STATUS_NO_SUCH_FILE) status = STATUS_SUCCESS; + if (status == STATUS_SUCCESS) break; + if (status != STATUS_BUFFER_TOO_SMALL) goto done; HeapFree( GetProcessHeap(), 0, buffer ); - if (status != STATUS_BUFFER_TOO_SMALL) return status; } if (input->create_backup) @@ -376,6 +395,7 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) done: HeapFree( GetProcessHeap(), 0, buffer ); HeapFree( GetProcessHeap(), 0, backup ); + HeapFree( GetProcessHeap(), 0, homelink ); return status; }

1 0

Alexandre Julliard : shell32: Use the mount manager for initial shell folders creation.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: d1e1efe0f6cfceb2c6ebe25b815eb1f97e0cb1bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e1efe0f6cfceb2c6ebe25b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 17 16:51:31 2021 +0200 shell32: Use the mount manager for initial shell folders creation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 53 +++++++++++++++++++++++++++---------------- dlls/shell32/shfldr_desktop.c | 2 +- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d6a1a1df2d6..4c8913b977c 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -40,6 +40,9 @@ #include "winreg.h" #include "wingdi.h" #include "winuser.h" +#include "winioctl.h" +#define WINE_MOUNTMGR_EXTENSIONS +#include "ddk/mountmgr.h" #include "shlobj.h" #include "shtypes.h" @@ -4127,24 +4130,22 @@ static char *get_xdg_path( const char *var ) return ret; } -static BOOL link_folder( const char *target, const char *link ) +static BOOL link_folder( HANDLE mgr, const UNICODE_STRING *path, const char *link ) { - struct stat st; - char *dir = NULL; + struct mountmgr_shell_folder *ioctl; + DWORD len = sizeof(*ioctl) + path->Length + strlen(link) + 1; BOOL ret; - if (!strcmp( target, "$HOME" ) || !strncmp( target, "$HOME/", 6 )) - { - const char *home = getenv( "HOME" ); + if (!(ioctl = heap_alloc( len ))) return FALSE; + ioctl->create_backup = FALSE; + ioctl->folder_offset = sizeof(*ioctl); + ioctl->folder_size = path->Length; + memcpy( (char *)ioctl + ioctl->folder_offset, path->Buffer, ioctl->folder_size ); + ioctl->symlink_offset = ioctl->folder_offset + ioctl->folder_size; + strcpy( (char *)ioctl + ioctl->symlink_offset, link ); - target += 5; - dir = heap_alloc( strlen(home) + strlen(target) + 1 ); - strcpy( dir, home ); - strcat( dir, target ); - target = dir; - } - if ((ret = !stat( target, &st ) && S_ISDIR( st.st_mode ))) symlink( target, link ); - heap_free( dir ); + ret = DeviceIoControl( mgr, IOCTL_MOUNTMGR_DEFINE_SHELL_FOLDER, ioctl, len, NULL, 0, NULL, NULL ); + heap_free( ioctl ); return ret; } @@ -4156,22 +4157,34 @@ static BOOL link_folder( const char *target, const char *link ) */ static void create_link( const WCHAR *path, const char *xdg_name, const char *default_name ) { - char *target, *link; + UNICODE_STRING nt_name; + char *target = NULL; + HANDLE mgr; + + if ((mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + 0, 0 )) == INVALID_HANDLE_VALUE) + { + FIXME( "failed to connect to mount manager\n" ); + return; + } - if (!(link = wine_get_unix_file_name( path ))) return; + nt_name.Buffer = NULL; + if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) goto done; if ((target = get_xdg_path( xdg_name ))) { - if (link_folder( target, link )) goto done; + if (link_folder( mgr, &nt_name, target )) goto done; } - if (link_folder( default_name, link )) goto done; + if (link_folder( mgr, &nt_name, default_name )) goto done; /* fall back to HOME */ - link_folder( "$HOME", link ); + link_folder( mgr, &nt_name, "$HOME" ); done: + RtlFreeUnicodeString( &nt_name ); heap_free( target ); - heap_free( link ); + CloseHandle( mgr ); } /****************************************************************************** diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 7c55f02525a..60cea772b01 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -935,7 +935,7 @@ HRESULT WINAPI ISF_Desktop_Constructor ( { IDesktopFolderImpl *sf; - if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_DESKTOPDIRECTORY, TRUE )) + if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_DESKTOPDIRECTORY, FALSE )) return E_UNEXPECTED; sf = LocalAlloc( LMEM_ZEROINIT, sizeof (IDesktopFolderImpl) );

1 0