September 2021 - Wine-commits

Nikolay Sivov : ole32: Use public function to get file extension in GetClassFile().
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: d3446e1ff44a50b9519e839b74deaedec174346b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3446e1ff44a50b9519e839b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 11:26:49 2021 +0300 ole32: Use public function to get file extension in GetClassFile(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/filemoniker.c | 161 +++++++++++++++++++++++------------------------ dlls/ole32/moniker.c | 31 ++------- dlls/ole32/moniker.h | 3 - 4 files changed, 85 insertions(+), 112 deletions(-) diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 84694e1538d..340ffdbded2 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -1,6 +1,6 @@ MODULE = ole32.dll IMPORTLIB = ole32 -IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 +IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase DELAYIMPORTS = oleaut32 EXTRADEFS = -D_OLE32_ diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 213971ea96b..794b4507942 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -631,6 +631,85 @@ static void free_stringtable(LPOLESTR *stringTable) CoTaskMemFree(stringTable); } +static int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) +{ + LPOLESTR word; + int i=0,j,tabIndex=0, ret=0; + LPOLESTR *strgtable ; + + int len=lstrlenW(str); + + TRACE("%s, %p\n", debugstr_w(str), *stringTable); + + strgtable = CoTaskMemAlloc((len + 1)*sizeof(*strgtable)); + + if (strgtable==NULL) + return E_OUTOFMEMORY; + + word = CoTaskMemAlloc((len + 1)*sizeof(WCHAR)); + + if (word==NULL) + { + ret = E_OUTOFMEMORY; + goto lend; + } + + while(str[i]!=0){ + + if (str[i] == L'\\') + { + + strgtable[tabIndex]=CoTaskMemAlloc(2*sizeof(WCHAR)); + + if (strgtable[tabIndex]==NULL) + { + ret = E_OUTOFMEMORY; + goto lend; + } + + lstrcpyW(strgtable[tabIndex++], L"\\"); + + i++; + + } + else { + + for (j = 0; str[i] && str[i] != L'\\'; i++, j++) + word[j]=str[i]; + + word[j]=0; + + strgtable[tabIndex]=CoTaskMemAlloc(sizeof(WCHAR)*(j+1)); + + if (strgtable[tabIndex]==NULL) + { + ret = E_OUTOFMEMORY; + goto lend; + } + + lstrcpyW(strgtable[tabIndex++],word); + } + } + strgtable[tabIndex]=NULL; + + *stringTable=strgtable; + + ret = tabIndex; + +lend: + if (ret < 0) + { + for (i = 0; i < tabIndex; i++) + CoTaskMemFree(strgtable[i]); + + CoTaskMemFree(strgtable); + } + + CoTaskMemFree(word); + + return ret; +} + /****************************************************************************** * FileMoniker_ComposeWith */ @@ -970,88 +1049,6 @@ failed: return ret; } -/****************************************************************************** - * DecomposePath (local function) - */ -int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) -{ - LPOLESTR word; - int i=0,j,tabIndex=0, ret=0; - LPOLESTR *strgtable ; - - int len=lstrlenW(str); - - TRACE("%s, %p\n", debugstr_w(str), *stringTable); - - strgtable = CoTaskMemAlloc((len + 1)*sizeof(*strgtable)); - - if (strgtable==NULL) - return E_OUTOFMEMORY; - - word = CoTaskMemAlloc((len + 1)*sizeof(WCHAR)); - - if (word==NULL) - { - ret = E_OUTOFMEMORY; - goto lend; - } - - while(str[i]!=0){ - - if (str[i] == L'\\') - { - - strgtable[tabIndex]=CoTaskMemAlloc(2*sizeof(WCHAR)); - - if (strgtable[tabIndex]==NULL) - { - ret = E_OUTOFMEMORY; - goto lend; - } - - lstrcpyW(strgtable[tabIndex++], L"\\"); - - i++; - - } - else { - - for (j = 0; str[i] && str[i] != L'\\'; i++, j++) - word[j]=str[i]; - - word[j]=0; - - strgtable[tabIndex]=CoTaskMemAlloc(sizeof(WCHAR)*(j+1)); - - if (strgtable[tabIndex]==NULL) - { - ret = E_OUTOFMEMORY; - goto lend; - } - - lstrcpyW(strgtable[tabIndex++],word); - } - } - strgtable[tabIndex]=NULL; - - *stringTable=strgtable; - - ret = tabIndex; - -lend: - if (ret < 0) - { - for (i = 0; i < tabIndex; i++) - CoTaskMemFree(strgtable[i]); - - CoTaskMemFree(strgtable); - } - - CoTaskMemFree(word); - - return ret; -} - /****************************************************************************** * FileMoniker_RelativePathTo */ diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index aed491d406f..ac47f5528c8 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -32,6 +32,7 @@ #include "compobj_private.h" #include "moniker.h" #include "irot.h" +#include "pathcch.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -910,10 +911,9 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) { IStorage *pstg=0; HRESULT res; - int nbElm, length, i; LONG sizeProgId, ret; - LPOLESTR *pathDec=0,absFile=0,progId=0; - LPWSTR extension; + LPOLESTR progId=0; + const WCHAR *extension; TRACE("%s, %p\n", debugstr_w(filePathName), pclsid); @@ -954,26 +954,9 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) /* if the above strategies fail then search for the extension key in the registry */ - /* get the last element (absolute file) in the path name */ - nbElm=FileMonikerImpl_DecomposePath(filePathName,&pathDec); - absFile=pathDec[nbElm-1]; - - /* failed if the path represents a directory and not an absolute file name*/ - if (!wcscmp(absFile, L"\\")) { - CoTaskMemFree(pathDec); + res = PathCchFindExtension(filePathName, PATHCCH_MAX_CCH, &extension); + if (FAILED(res) || !extension || !*extension || !wcscmp(extension, L".")) return MK_E_INVALIDEXTENSION; - } - - /* get the extension of the file */ - extension = NULL; - length=lstrlenW(absFile); - for(i = length-1; (i >= 0) && *(extension = &absFile[i]) != '.'; i--) - /* nothing */; - - if (!extension || !wcscmp(extension, L".")) { - CoTaskMemFree(pathDec); - return MK_E_INVALIDEXTENSION; - } ret = RegQueryValueW(HKEY_CLASSES_ROOT, extension, NULL, &sizeProgId); if (!ret) { @@ -990,10 +973,6 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) else res = HRESULT_FROM_WIN32(ret); - for(i=0; pathDec[i]!=NULL;i++) - CoTaskMemFree(pathDec[i]); - CoTaskMemFree(pathDec); - return res != S_OK ? MK_E_INVALIDEXTENSION : res; } diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 995e0459e5e..8549bd46c1e 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -38,9 +38,6 @@ HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ComCat_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -/* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ -int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) DECLSPEC_HIDDEN; - HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LPDWORD pchEaten, LPMONIKER *ppmk) DECLSPEC_HIDDEN; HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName,

1 0

Rémi Bernon : dinput8/tests: Don't try running more tests after a win_skip.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 3bc1263e5a9ce23b4744d9b14bb194be06aeb42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bc1263e5a9ce23b4744d9b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:31 2021 +0200 dinput8/tests: Don't try running more tests after a win_skip. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index ce2a3792593..533c4a8ca42 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4593,7 +4593,7 @@ struct device_desc HIDP_CAPS hid_caps; }; -static void test_device_types( void ) +static BOOL test_device_types(void) { #include "psh_hid_macros.h" static const unsigned char unknown_desc[] = @@ -4837,11 +4837,12 @@ static void test_device_types( void ) DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; IDirectInputDevice8W *device; + BOOL success = TRUE; IDirectInput8W *di; ULONG i, ref; HRESULT hr; - for (i = 0; i < ARRAY_SIZE(device_desc); ++i) + for (i = 0; i < ARRAY_SIZE(device_desc) && success; ++i) { winetest_push_context( "desc[%d]", i ); GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); @@ -4852,7 +4853,7 @@ static void test_device_types( void ) if (!dinput_driver_start( device_desc[i].report_desc_buf, device_desc[i].report_desc_len, &device_desc[i].hid_caps )) { - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4860,7 +4861,7 @@ static void test_device_types( void ) if (FAILED(hr)) { win_skip( "DirectInput8Create returned %#x\n", hr ); - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4870,7 +4871,7 @@ static void test_device_types( void ) { win_skip( "device not found, skipping tests\n" ); IDirectInput8_Release( di ); - i = ARRAY_SIZE(device_desc); + success = FALSE; goto done; } @@ -4918,6 +4919,8 @@ static void test_device_types( void ) SetCurrentDirectoryW( cwd ); winetest_pop_context(); } + + return success; } static void test_force_feedback_joystick( void ) @@ -5345,9 +5348,11 @@ START_TEST( hid ) test_hid_driver( 1, TRUE ); CoInitialize( NULL ); - test_device_types(); - test_simple_joystick(); - test_force_feedback_joystick(); + if (test_device_types()) + { + test_simple_joystick(); + test_force_feedback_joystick(); + } CoUninitialize(); UnmapViewOfFile( test_data );

1 0

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

30 Sep '21

Module: wine Branch: master Commit: be27b637a1b40bc1916b9ff9e86ee374d1d7ac11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be27b637a1b40bc1916b9ff9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:32 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_EnumEffects 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 | 81 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 533c4a8ca42..c8d0588e128 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3343,6 +3343,44 @@ static BOOL CALLBACK check_object_count( const DIDEVICEOBJECTINSTANCEW *obj, voi return DIENUM_CONTINUE; } +struct check_effects_params +{ + UINT index; + UINT expect_count; + const DIEFFECTINFOW *expect_effects; +}; + +static BOOL CALLBACK check_effects( const DIEFFECTINFOW *effect, void *args ) +{ + static const DIEFFECTINFOW unexpected_effect = {0}; + struct check_effects_params *params = args; + const DIEFFECTINFOW *exp = params->expect_effects + params->index; + + winetest_push_context( "effect[%d]", params->index ); + + ok( params->index < params->expect_count, "unexpected extra object\n" ); + if (params->index >= params->expect_count) exp = &unexpected_effect; + + check_member( *effect, *exp, "%u", dwSize ); + check_member_guid( *effect, *exp, guid ); + check_member( *effect, *exp, "%#x", dwEffType ); + check_member( *effect, *exp, "%#x", dwStaticParams ); + check_member( *effect, *exp, "%#x", dwDynamicParams ); + check_member_wstr( *effect, *exp, tszName ); + + winetest_pop_context(); + params->index++; + + return DIENUM_CONTINUE; +} + +static BOOL CALLBACK check_effect_count( const DIEFFECTINFOW *effect, void *args ) +{ + DWORD *count = args; + *count = *count + 1; + return DIENUM_CONTINUE; +} + static void test_simple_joystick(void) { #include "psh_hid_macros.h" @@ -3580,6 +3618,7 @@ static void test_simple_joystick(void) }, }; const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = {}; + const DIEFFECTINFOW expect_effects[] = {}; struct check_objects_params check_objects_params = { @@ -3587,6 +3626,11 @@ static void test_simple_joystick(void) .expect_objs = expect_objects, .todo_objs = objects_todos, }; + struct check_effects_params check_effects_params = + { + .expect_count = ARRAY_SIZE(expect_effects), + .expect_effects = expect_effects, + }; DIPROPGUIDANDPATH prop_guid_path = { .diph = @@ -3989,6 +4033,22 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[5], "%#04x", wExponent ); check_member( objinst, expect_objects[5], "%u", wReportId ); + hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + res = 0; + hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, 0xfe ); + ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( res == 0, "got %u expected %u\n", res, 0 ); + res = 0; + hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, DIEFT_PERIODIC ); + ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( res == 0, "got %u expected %u\n", res, 0 ); + hr = IDirectInputDevice8_EnumEffects( device, check_effects, &check_effects_params, DIEFT_ALL ); + ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", + check_effects_params.expect_count - check_effects_params.index ); + hr = IDirectInputDevice8_SetDataFormat( device, NULL ); ok( hr == E_POINTER, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); @@ -5192,6 +5252,7 @@ static void test_force_feedback_joystick( void ) {.type = TRUE, .flags = TRUE}, {.type = TRUE, .flags = TRUE}, }; + const DIEFFECTINFOW expect_effects[] = {}; struct check_objects_params check_objects_params = { @@ -5199,6 +5260,11 @@ static void test_force_feedback_joystick( void ) .expect_objs = expect_objects, .todo_objs = objects_todos, }; + struct check_effects_params check_effects_params = + { + .expect_count = ARRAY_SIZE(expect_effects), + .expect_effects = expect_effects, + }; DIPROPDWORD prop_dword = { .diph = @@ -5213,8 +5279,8 @@ static void test_force_feedback_joystick( void ) IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; IDirectInput8W *di; + ULONG res, ref; HRESULT hr; - ULONG ref; GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); @@ -5293,6 +5359,19 @@ static void test_force_feedback_joystick( void ) ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", check_objects_params.expect_count - check_objects_params.index ); + res = 0; + hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, 0xfe ); + ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( res == 0, "got %u expected %u\n", res, 0 ); + res = 0; + hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, DIEFT_PERIODIC ); + ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( res == 0, "got %u expected %u\n", res, 0 ); + hr = IDirectInputDevice8_EnumEffects( device, check_effects, &check_effects_params, DIEFT_ALL ); + ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", + check_effects_params.expect_count - check_effects_params.index ); + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr );

1 0

Rémi Bernon : dinput8/tests: Add the required PID reports to enumerate some effects.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 5f492b5e8aa8018e6ddfd17838cf3f91fe11c781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f492b5e8aa8018e6ddfd178… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:33 2021 +0200 dinput8/tests: Add the required PID reports to enumerate some effects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 184 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 163 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f492b5e8aa8018e6ddf…

1 0

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

30 Sep '21

Module: wine Branch: master Commit: e47fcc112fe31d9edbfb00b7bc2d93a61d836cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=e47fcc112fe31d9edbfb00b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:34 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetEffectInfo 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 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cf47216cd9e..149790f1484 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3679,6 +3679,7 @@ static void test_simple_joystick(void) DIDEVICEOBJECTDATA objdata[32] = {{0}}; DIDEVICEOBJECTINSTANCEW objinst = {0}; DIDEVICEINSTANCEW devinst = {0}; + DIEFFECTINFOW effectinfo = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; @@ -4049,6 +4050,21 @@ static void test_simple_joystick(void) ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", check_effects_params.expect_count - check_effects_params.index ); + hr = IDirectInputDevice8_GetEffectInfo( device, NULL, &GUID_Sine ); + todo_wine + ok( hr == E_POINTER, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + effectinfo.dwSize = sizeof(DIEFFECTINFOW) + 1; + hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + effectinfo.dwSize = sizeof(DIEFFECTINFOW); + hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_NULL ); + todo_wine + ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); + todo_wine + ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, NULL ); ok( hr == E_POINTER, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); @@ -5416,6 +5432,7 @@ static void test_force_feedback_joystick( void ) }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEINSTANCEW devinst = {0}; + DIEFFECTINFOW effectinfo = {0}; IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; IDirectInput8W *di; @@ -5514,6 +5531,19 @@ static void test_force_feedback_joystick( void ) ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", check_effects_params.expect_count - check_effects_params.index ); + effectinfo.dwSize = sizeof(DIEFFECTINFOW); + hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); + ok( hr == DI_OK, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + todo_wine + check_member_guid( effectinfo, expect_effects[0], guid ); + check_member( effectinfo, expect_effects[0], "%#x", dwEffType ); + todo_wine + check_member( effectinfo, expect_effects[0], "%#x", dwStaticParams ); + todo_wine + check_member( effectinfo, expect_effects[0], "%#x", dwDynamicParams ); + todo_wine + check_member_wstr( effectinfo, expect_effects[0], tszName ); + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr );

1 0

Rémi Bernon : dinput8/tests: Add the required PID reports to acquire the device.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 46a42c78af9d2d75c483e6c4d355603e6215682c URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a42c78af9d2d75c483e6c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:35 2021 +0200 dinput8/tests: Add the required PID reports to acquire the device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 15 +++- dlls/dinput8/tests/driver_hid.h | 1 + dlls/dinput8/tests/hid.c | 184 ++++++++++++++++++++++++++++++++-------- 3 files changed, 163 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46a42c78af9d2d75c483…

1 0

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

30 Sep '21

Module: wine Branch: master Commit: 5b09ceae91e5d38aaa2b738545ddd019bbfad2aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b09ceae91e5d38aaa2b7385… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:36 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_Escape 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 | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 1ec5726d34b..080f2c944ca 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3682,9 +3682,11 @@ static void test_simple_joystick(void) DIEFFECTINFOW effectinfo = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; + DIEFFESCAPE escape = {0}; DIDEVCAPS caps = {0}; IDirectInput8W *di; HANDLE event, file; + char buffer[1024]; DIJOYSTATE2 state; ULONG i, res, ref; HRESULT hr; @@ -4644,6 +4646,26 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + hr = IDirectInputDevice8_Escape( device, NULL ); + todo_wine + ok( hr == E_POINTER, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + hr = IDirectInputDevice8_Escape( device, &escape ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + escape.dwSize = sizeof(DIEFFESCAPE) + 1; + hr = IDirectInputDevice8_Escape( device, &escape ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + escape.dwSize = sizeof(DIEFFESCAPE); + escape.dwCommand = 0; + escape.lpvInBuffer = buffer; + escape.cbInBuffer = 10; + escape.lpvOutBuffer = buffer + 10; + escape.cbOutBuffer = 10; + hr = IDirectInputDevice8_Escape( device, &escape ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ Sleep( 100 ); @@ -5484,8 +5506,10 @@ static void test_force_feedback_joystick( void ) DIDEVICEINSTANCEW devinst = {0}; DIEFFECTINFOW effectinfo = {0}; IDirectInputDevice8W *device; + DIEFFESCAPE escape = {0}; DIDEVCAPS caps = {0}; IDirectInput8W *di; + char buffer[1024]; ULONG res, ref; HANDLE file; HRESULT hr; @@ -5633,6 +5657,16 @@ static void test_force_feedback_joystick( void ) todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + escape.dwSize = sizeof(DIEFFESCAPE); + escape.dwCommand = 0; + escape.lpvInBuffer = buffer; + escape.cbInBuffer = 10; + escape.lpvOutBuffer = buffer + 10; + escape.cbOutBuffer = 10; + hr = IDirectInputDevice8_Escape( device, &escape ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); @@ -5643,6 +5677,10 @@ static void test_force_feedback_joystick( void ) ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); + hr = IDirectInputDevice8_Escape( device, &escape ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine

1 0

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

30 Sep '21

Module: wine Branch: master Commit: beedf615b25f1453943a7c45dbf0ae4773408138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beedf615b25f1453943a7c45… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:37 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetForceFeedbackState 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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 080f2c944ca..918db40d444 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4643,6 +4643,14 @@ static void test_simple_joystick(void) check_member( state, expect_state_rel[i], "%#x", rgbButtons[2] ); winetest_pop_context(); + hr = IDirectInputDevice8_GetForceFeedbackState( device, NULL ); + todo_wine + ok( hr == E_POINTER, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); @@ -5656,6 +5664,9 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); escape.dwSize = sizeof(DIEFFESCAPE); escape.dwCommand = 0; @@ -5685,6 +5696,10 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine ok( hr == 0x80040301, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + res = 0xdeadbeef; + hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); + todo_wine + ok( hr == 0x80040301, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device );

1 0

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

30 Sep '21

Module: wine Branch: master Commit: 4ea75e55b63e63e23871216f921fe10fcc664ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ea75e55b63e63e23871216f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:38 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SendForceFeedbackCommand 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 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 918db40d444..43834d1f602 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4651,6 +4651,13 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); + todo_wine + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); @@ -5667,6 +5674,9 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); escape.dwSize = sizeof(DIEFFESCAPE); escape.dwCommand = 0; @@ -5701,6 +5711,32 @@ static void test_force_feedback_joystick( void ) todo_wine ok( hr == 0x80040301, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_STOPALL ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_PAUSE ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_CONTINUE ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_SETACTUATORSON ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_SETACTUATORSOFF ); + todo_wine + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); 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_SendDeviceData tests.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: f9bb8f9897e4aed9dd38d52d03e11e175b4be3aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9bb8f9897e4aed9dd38d52d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:39 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SendDeviceData 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 43834d1f602..7e48a7ef5d6 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4658,6 +4658,21 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + objdata[0].dwOfs = 0xd; + objdata[0].dwData = 0x80; + res = 1; + hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0xdeadbeef ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + res = 1; + hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 1 /*DISDD_CONTINUE*/ ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + res = 1; + hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); @@ -5518,6 +5533,7 @@ static void test_force_feedback_joystick( void ) }, }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + DIDEVICEOBJECTDATA objdata = {0}; DIDEVICEINSTANCEW devinst = {0}; DIEFFECTINFOW effectinfo = {0}; IDirectInputDevice8W *device; @@ -5737,6 +5753,13 @@ static void test_force_feedback_joystick( void ) todo_wine ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + objdata.dwOfs = 0x16; + objdata.dwData = 0x80; + res = 1; + hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), &objdata, &res, 0 ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr );

1 0