September 2021 - Wine-commits

Rémi Bernon : winebus.sys: Use Rtl CS functions.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 39ca4de66553135df796b2329832af0ead0d5012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39ca4de66553135df796b232… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:57 2021 +0200 winebus.sys: Use Rtl CS functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 8 ++++---- dlls/winebus.sys/bus_sdl.c | 8 ++++---- dlls/winebus.sys/bus_udev.c | 24 +++++++++++------------ dlls/winebus.sys/main.c | 46 ++++++++++++++++++++++---------------------- 4 files changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39ca4de66553135df796…

1 0

Alexandre Julliard : shell32: Load the XDG user dirs config file using Win32 APIs.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: d603b22a0cc81fdce64be6a59d7453023e3410a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d603b22a0cc81fdce64be6a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 10:58:12 2021 +0200 shell32: Load the XDG user dirs config file using Win32 APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 193 ++++++++++++++++++++++----------------- dlls/shell32/xdg.c | 229 ----------------------------------------------- dlls/shell32/xdg.h | 2 - 3 files changed, 113 insertions(+), 311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d603b22a0cc81fdce64b…

1 0

Alexandre Julliard : shell32: Add a helper to retrieve trash item data without copying it.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 0cdb12ae37de187858d99e80204c32969d99a07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdb12ae37de187858d99e80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 17:14:58 2021 +0200 shell32: Add a helper to retrieve trash item data without copying it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/recyclebin.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 807cae3d81d..d77e4f54b65 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -68,6 +68,13 @@ static const shvheader RecycleBinColumns[] = #define COLUMNS_COUNT 6 +static const WIN32_FIND_DATAW *get_trash_item_data( LPCITEMIDLIST id ) +{ + if (id->mkid.cb < 2 + 1 + sizeof(WIN32_FIND_DATAW) + 2) return NULL; + if (id->mkid.abID[0] != 0) return NULL; + return (const WIN32_FIND_DATAW *)(id->mkid.abID + 1); +} + static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME ft) { FILETIME lft; @@ -183,11 +190,11 @@ static void DoRestore(RecycleBinMenu *This) UINT i; for(i=0;i<This->cidl;i++) { - WIN32_FIND_DATAW data; - TRASH_UnpackItemID(&((This->apidl[i])->mkid),&data); - if(PathFileExistsW(data.cFileName)) + const WIN32_FIND_DATAW *data = get_trash_item_data( This->apidl[i] ); + + if(PathFileExistsW(data->cFileName)) { - PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data.cFileName); + PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data->cFileName); WCHAR message[100]; WCHAR caption[50]; if(_ILIsFolder(ILFindLastID(dest_pidl))) @@ -198,14 +205,14 @@ static void DoRestore(RecycleBinMenu *This) if(ShellMessageBoxW(shell32_hInstance,GetActiveWindow(),message, caption,MB_YESNO|MB_ICONEXCLAMATION, - data.cFileName)!=IDYES) + data->cFileName)!=IDYES) continue; } if(SUCCEEDED(TRASH_RestoreItem(This->apidl[i]))) { IPersistFolder2 *persist; LPITEMIDLIST root_pidl; - PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data.cFileName); + PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data->cFileName); BOOL is_folder = _ILIsFolder(ILFindLastID(dest_pidl)); IShellFolder2_QueryInterface(This->folder,&IID_IPersistFolder2, (void**)&persist); @@ -513,12 +520,11 @@ static HRESULT WINAPI RecycleBin_GetUIObjectOf(IShellFolder2 *iface, HWND hwndOw static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET *pName) { - WIN32_FIND_DATAW data; + const WIN32_FIND_DATAW *data = get_trash_item_data( pidl ); TRACE("(%p, %p, %x, %p)\n", This, pidl, uFlags, pName); - TRASH_UnpackItemID(&pidl->mkid, &data); pName->uType = STRRET_WSTR; - return SHStrDupW(PathFindFileNameW(data.cFileName), &pName->u.pOleStr); + return SHStrDupW(PathFindFileNameW(data->cFileName), &pName->u.pOleStr); } static HRESULT WINAPI RecycleBin_SetNameOf(IShellFolder2 *This, HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR pszName, @@ -598,7 +604,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsEx(IShellFolder2 *iface, LPCITEMIDLIS static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) { RecycleBin *This = impl_from_IShellFolder2(iface); - WIN32_FIND_DATAW data; + const WIN32_FIND_DATAW *data; WCHAR buffer[MAX_PATH]; TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, pDetails); @@ -610,21 +616,21 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS if (iColumn == COLUMN_NAME) return RecycleBin_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &pDetails->str); - TRASH_UnpackItemID(&pidl->mkid, &data); + data = get_trash_item_data( pidl ); switch (iColumn) { case COLUMN_DATEDEL: - FormatDateTime(buffer, MAX_PATH, data.ftLastAccessTime); + FormatDateTime(buffer, MAX_PATH, data->ftLastAccessTime); break; case COLUMN_DELFROM: - lstrcpyW(buffer, data.cFileName); + lstrcpyW(buffer, data->cFileName); PathRemoveFileSpecW(buffer); break; case COLUMN_SIZE: - StrFormatKBSizeW(((LONGLONG)data.nFileSizeHigh<<32)|data.nFileSizeLow, buffer, MAX_PATH); + StrFormatKBSizeW(((LONGLONG)data->nFileSizeHigh<<32)|data->nFileSizeLow, buffer, MAX_PATH); break; case COLUMN_MTIME: - FormatDateTime(buffer, MAX_PATH, data.ftLastWriteTime); + FormatDateTime(buffer, MAX_PATH, data->ftLastWriteTime); break; case COLUMN_TYPE: /* TODO */ @@ -767,9 +773,8 @@ static HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, B return S_OK; case 1: { - WIN32_FIND_DATAW data; - TRASH_UnpackItemID(&((*apidl)->mkid),&data); - lstrcpynW(arg,data.cFileName,MAX_PATH); + const WIN32_FIND_DATAW *data = get_trash_item_data( apidl[0] ); + lstrcpynW(arg,data->cFileName,MAX_PATH); LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_ERASEITEM, message, ARRAY_SIZE(message)); break; } @@ -847,9 +852,8 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR pSHQueryRBInfo->i64Size = 0; for (; i<cidl; i++) { - WIN32_FIND_DATAW data; - TRASH_UnpackItemID(&((apidl[i])->mkid),&data); - pSHQueryRBInfo->i64Size += ((DWORDLONG)data.nFileSizeHigh << 32) + data.nFileSizeLow; + const WIN32_FIND_DATAW *data = get_trash_item_data( apidl[i] ); + pSHQueryRBInfo->i64Size += ((DWORDLONG)data->nFileSizeHigh << 32) + data->nFileSizeLow; ILFree(apidl[i]); } SHFree(apidl);

1 0

Alexandre Julliard : shell32: Reimplement trash support using Win32 APIs.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 5803b168ac6203acd0f99fd40ab206fe489e4cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=5803b168ac6203acd0f99fd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 17:16:57 2021 +0200 shell32: Reimplement trash support using Win32 APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 4 +- dlls/shell32/recyclebin.c | 404 +++++++++++++++++++++- dlls/shell32/shfldr.h | 3 + dlls/shell32/shlfileop.c | 8 +- dlls/shell32/trash.c | 854 ---------------------------------------------- dlls/shell32/xdg.c | 743 ---------------------------------------- dlls/shell32/xdg.h | 47 --- 7 files changed, 405 insertions(+), 1658 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5803b168ac6203acd0f9…

1 0

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

16 Sep '21

Module: wine Branch: master Commit: c5e864d4b6cd0f7312f754a2178f041cd7a4b160 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5e864d4b6cd0f7312f754a2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:38 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetProperty 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 | 199 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5e864d4b6cd0f7312f7…

1 0

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

16 Sep '21

Module: wine Branch: master Commit: 2972e9973ea4ca4a5f677149da4a3646ba97247e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2972e9973ea4ca4a5f677149… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:39 2021 +0200 dinput8/tests: Add some HID joystick IDirectInput8_CreateDevice tests. Creating a device with the instance guid may get the wrong one if a true controller is plugged in. This is because driver_hid.dll runs in a different process from winehid.sys, and so gets another set of rawinput handles. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index fbcb1e27afb..898dd7a6cdf 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3443,6 +3443,26 @@ static void test_simple_joystick(void) check_member( devinst, expect_devinst, "%04x", wUsagePage ); check_member( devinst, expect_devinst, "%04x", wUsage ); + hr = IDirectInput8_CreateDevice( di, &devinst.guidInstance, NULL, NULL ); + ok( hr == E_POINTER, "IDirectInput8_CreateDevice returned %#x\n", hr ); + hr = IDirectInput8_CreateDevice( di, NULL, &device, NULL ); + ok( hr == E_POINTER, "IDirectInput8_CreateDevice returned %#x\n", hr ); + hr = IDirectInput8_CreateDevice( di, &GUID_NULL, &device, NULL ); + ok( hr == DIERR_DEVICENOTREG, "IDirectInput8_CreateDevice returned %#x\n", hr ); + hr = IDirectInput8_CreateDevice( di, &devinst.guidInstance, &device, NULL ); + ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr ); + + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_VIDPID returned %#x\n", hr ); + /* Wine may get the wrong device here, because the test driver creates another instance of + hidclass.sys, and gets duplicate rawinput handles, which we use in the guidInstance */ + todo_wine_if( prop_dword.dwData != EXPECT_VIDPID ) + ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + hr = IDirectInput8_CreateDevice( di, &expect_guid_product, &device, NULL ); ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr );

1 0

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

16 Sep '21

Module: wine Branch: master Commit: 7fcca74881c8b8189c7a35df9b8026486ecf7437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fcca74881c8b8189c7a35df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:40 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SetDataFormat 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 898dd7a6cdf..2bbf7a9e978 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3401,6 +3401,7 @@ static void test_simple_joystick(void) }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEINSTANCEW devinst = {0}; + DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; IDirectInput8W *di; @@ -3676,6 +3677,20 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_NOTINITIALIZED, "IDirectInputDevice8_GetProperty DIPROP_APPDATA returned %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + dataformat.dwSize = sizeof(DIDATAFORMAT); + hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + dataformat.dwObjSize = sizeof(DIOBJECTDATAFORMAT); + hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); + ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

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

16 Sep '21

Module: wine Branch: master Commit: 7da842a738234bd5f3222610892498ddea4c5954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da842a738234bd5f3222610… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:41 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SetEventNotification 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2bbf7a9e978..fbf1b894fd1 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3405,6 +3405,7 @@ static void test_simple_joystick(void) IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; IDirectInput8W *di; + HANDLE event; HRESULT hr; WCHAR *tmp; ULONG ref; @@ -3691,9 +3692,19 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetEventNotification( device, (HANDLE)0xdeadbeef ); + todo_wine + ok( hr == E_HANDLE, "IDirectInputDevice8_SetEventNotification returned: %#x\n", hr ); + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( event != NULL, "CreateEventW failed, last error %u\n", GetLastError() ); + hr = IDirectInputDevice8_SetEventNotification( device, event ); + ok( hr == DI_OK, "IDirectInputDevice8_SetEventNotification returned: %#x\n", hr ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + CloseHandle( event ); + ref = IDirectInput8_Release( di ); ok( ref == 0, "IDirectInput8_Release returned %d\n", ref );

1 0

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

16 Sep '21

Module: wine Branch: master Commit: 2975ad8134d81368b32f642204824a5914cc4e5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2975ad8134d81368b32f6422… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:42 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SetCooperativeLevel 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index fbf1b894fd1..2cfa8f2e09e 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3409,6 +3409,7 @@ static void test_simple_joystick(void) HRESULT hr; WCHAR *tmp; ULONG ref; + HWND hwnd; GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); @@ -3700,6 +3701,31 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetEventNotification( device, event ); ok( hr == DI_OK, "IDirectInputDevice8_SetEventNotification returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, 0 ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND ); + ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); + ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); + ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + + hwnd = CreateWindowW( L"static", L"dinput", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, + NULL, NULL, NULL, NULL ); + + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); + ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); + ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + DestroyWindow( hwnd ); + + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_(Un)Acquire tests.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: f9486e98472e42cc400088b86835d2467ffbb387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9486e98472e42cc400088b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:43 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_(Un)Acquire 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2cfa8f2e09e..c0690bac868 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3721,11 +3721,31 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); + todo_wine + ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + DestroyWindow( hwnd ); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + + /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ + Sleep( 100 ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0