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

Rémi Bernon : dinput: Load action map from registry before resetting guid.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 18b5f7956f5b45540f5ee7e3ae29cf0948ae5ac2 URL: https://gitlab.winehq.org/wine/wine/-/commit/18b5f7956f5b45540f5ee7e3ae29cf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 09:40:50 2023 +0200 dinput: Load action map from registry before resetting guid. --- dlls/dinput/device.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b9f38330800..8b5d5a566bf 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1812,7 +1812,6 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONW *action, *action_end; DWORD i, username_len = MAX_PATH; WCHAR username_buf[MAX_PATH]; - BOOL load_success = FALSE; BOOL *mapped; TRACE( "iface %p, format %p, username %s, flags %#lx\n", iface, format, @@ -1840,12 +1839,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, { if (!action->dwSemantic) return DIERR_INVALIDPARAM; if (action->dwFlags & DIA_APPMAPPED) action->dwHow = DIAH_APPREQUESTED; - else if (action->dwFlags & DIA_APPNOMAP) continue; - else - { - action->dwHow = 0; - action->guidInstance = GUID_NULL; - } + else action->dwHow = 0; } /* Unless asked the contrary by these flags, try to load a previous mapping */ @@ -1854,10 +1848,18 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, /* Retrieve logged user name if necessary */ if (username == NULL) GetUserNameW( username_buf, &username_len ); else lstrcpynW( username_buf, username, MAX_PATH ); - load_success = load_mapping_settings( impl, format, username_buf ); + load_mapping_settings( impl, format, username_buf ); + } + + action_end = format->rgoAction + format->dwNumActions; + for (action = format->rgoAction; action < action_end; action++) + { + if (action->dwHow == DIAH_APPREQUESTED || action->dwHow == DIAH_USERCONFIG) continue; + if (action->dwFlags & DIA_APPNOMAP) continue; + action->guidInstance = GUID_NULL; + action->dwHow = 0; } - if (load_success) return DI_OK; if (!(mapped = calloc( impl->device_format.dwNumObjs, sizeof(*mapped) ))) return DIERR_OUTOFMEMORY; action_end = format->rgoAction + format->dwNumActions;

1 0

Rémi Bernon : dinput: Check device type in BuildActionMap for specific semantics.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 782ad8f70c60b35c19a4469f322818f3d879933e URL: https://gitlab.winehq.org/wine/wine/-/commit/782ad8f70c60b35c19a4469f322818… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 24 11:05:36 2023 +0100 dinput: Check device type in BuildActionMap for specific semantics. --- dlls/dinput/device.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8b5d5a566bf..a152d552f5d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1785,7 +1785,8 @@ static HRESULT WINAPI dinput_device_WriteEffectToFile( IDirectInputDevice8W *ifa return DI_OK; } -static BOOL object_matches_semantic( const DIOBJECTDATAFORMAT *object, DWORD semantic, BOOL exact ) +static BOOL object_matches_semantic( const DIDEVICEINSTANCEW *instance, const DIOBJECTDATAFORMAT *object, + DWORD semantic, BOOL exact ) { DWORD value = semantic & 0xff, axis = (semantic >> 15) & 3, type; @@ -1799,7 +1800,15 @@ static BOOL object_matches_semantic( const DIOBJECTDATAFORMAT *object, DWORD sem } if (!(DIDFT_GETTYPE( object->dwType ) & type)) return FALSE; - if ((semantic & 0xf0000000) == 0x80000000) return object->dwOfs == value; + if ((semantic & 0xf0000000) == 0x80000000) + { + switch (semantic & 0x0f000000) + { + case 0x01000000: return (instance->dwDevType & 0xf) == DIDEVTYPE_KEYBOARD && object->dwOfs == value; + case 0x02000000: return (instance->dwDevType & 0xf) == DIDEVTYPE_MOUSE && object->dwOfs == value; + default: return FALSE; + } + } if (axis && (axis - 1) != DIDFT_GETINSTANCE( object->dwType )) return FALSE; return !exact || !value || value == DIDFT_GETINSTANCE( object->dwType ) + 1; } @@ -1872,7 +1881,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, for (object = impl->device_format.rgodf; object < object_end; object++) { if (mapped[object - impl->device_format.rgodf]) continue; - if (!object_matches_semantic( object, action->dwSemantic, TRUE )) continue; + if (!object_matches_semantic( &impl->instance, object, action->dwSemantic, TRUE )) continue; if ((action->dwFlags & DIA_FORCEFEEDBACK) && !(object->dwType & DIDFT_FFACTUATOR)) continue; action->dwObjID = object->dwType; action->guidInstance = impl->guid; @@ -1891,7 +1900,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, for (object = impl->device_format.rgodf; object < object_end; object++) { if (mapped[object - impl->device_format.rgodf]) continue; - if (!object_matches_semantic( object, action->dwSemantic, FALSE )) continue; + if (!object_matches_semantic( &impl->instance, object, action->dwSemantic, FALSE )) continue; if ((action->dwFlags & DIA_FORCEFEEDBACK) && !(object->dwType & DIDFT_FFACTUATOR)) continue; action->dwObjID = object->dwType; action->guidInstance = impl->guid;

1 0

Rémi Bernon : dinput: Implement DIDBAM_PRESERVE BuildActionMap flag.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: cb987646a4df19e9b9cbc2c5a5a5b411d3835ec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb987646a4df19e9b9cbc2c5a5a5b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 09:48:35 2023 +0200 dinput: Implement DIDBAM_PRESERVE BuildActionMap flag. --- dlls/dinput/device.c | 4 ++++ dlls/dinput/tests/joystick8.c | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a152d552f5d..b4b39f0595e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1847,6 +1847,8 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, for (action = format->rgoAction; action < action_end; action++) { if (!action->dwSemantic) return DIERR_INVALIDPARAM; + if (flags == DIDBAM_PRESERVE && !IsEqualCLSID( &action->guidInstance, &GUID_NULL ) && + !IsEqualCLSID( &action->guidInstance, &impl->guid )) continue; if (action->dwFlags & DIA_APPMAPPED) action->dwHow = DIAH_APPREQUESTED; else action->dwHow = 0; } @@ -1864,6 +1866,8 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, for (action = format->rgoAction; action < action_end; action++) { if (action->dwHow == DIAH_APPREQUESTED || action->dwHow == DIAH_USERCONFIG) continue; + if (flags == DIDBAM_PRESERVE && !IsEqualCLSID( &action->guidInstance, &GUID_NULL ) && + !IsEqualCLSID( &action->guidInstance, &impl->guid )) continue; if (action->dwFlags & DIA_APPNOMAP) continue; action->guidInstance = GUID_NULL; action->dwHow = 0; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index ccd07da28ec..f8ab7bfc789 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -209,8 +209,8 @@ static BOOL CALLBACK check_no_created_effect_objects( IDirectInputEffect *effect return DIENUM_CONTINUE; } -#define check_diactionw( a, b ) check_diactionw_( __LINE__, a, b, FALSE ) -static void check_diactionw_( int line, const DIACTIONW *actual, const DIACTIONW *expected, BOOL todo ) +#define check_diactionw( a, b ) check_diactionw_( __LINE__, a, b ) +static void check_diactionw_( int line, const DIACTIONW *actual, const DIACTIONW *expected ) { check_member_( __FILE__, line, *actual, *expected, "%#Ix", uAppData ); check_member_( __FILE__, line, *actual, *expected, "%#lx", dwSemantic ); @@ -219,15 +219,13 @@ static void check_diactionw_( int line, const DIACTIONW *actual, const DIACTIONW check_member_wstr_( __FILE__, line, *actual, *expected, lptszActionName ); else check_member_( __FILE__, line, *actual, *expected, "%p", lptszActionName ); - todo_wine_if( todo ) check_member_guid_( __FILE__, line, *actual, *expected, guidInstance ); check_member_( __FILE__, line, *actual, *expected, "%#lx", dwObjID ); - todo_wine_if( todo ) check_member_( __FILE__, line, *actual, *expected, "%#lx", dwHow ); } -#define check_diactionformatw( a, b ) check_diactionformatw_( __LINE__, a, b, FALSE ) -static void check_diactionformatw_( int line, const DIACTIONFORMATW *actual, const DIACTIONFORMATW *expected, BOOL todo ) +#define check_diactionformatw( a, b ) check_diactionformatw_( __LINE__, a, b ) +static void check_diactionformatw_( int line, const DIACTIONFORMATW *actual, const DIACTIONFORMATW *expected ) { DWORD i; check_member_( __FILE__, line, *actual, *expected, "%#lx", dwSize ); @@ -237,7 +235,7 @@ static void check_diactionformatw_( int line, const DIACTIONFORMATW *actual, con for (i = 0; i < min( actual->dwNumActions, expected->dwNumActions ); ++i) { winetest_push_context( "action[%lu]", i ); - check_diactionw_( line, actual->rgoAction + i, expected->rgoAction + i, todo && i >= 2 ); + check_diactionw_( line, actual->rgoAction + i, expected->rgoAction + i ); winetest_pop_context(); if (expected->dwActionSize != sizeof(DIACTIONW)) break; if (actual->dwActionSize != sizeof(DIACTIONW)) break; @@ -1377,7 +1375,7 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e ok( hr == DI_OK, "BuildActionMap returned %#lx\n", hr ); hr = IDirectInputDevice8_BuildActionMap( device, &action_format, L"username", DIDBAM_PRESERVE ); ok( hr == DI_OK, "BuildActionMap returned %#lx\n", hr ); - check_diactionformatw_( __LINE__, &action_format, &expect_action_format_4, TRUE ); + check_diactionformatw( &action_format, &expect_action_format_4 ); IDirectInputDevice8_Release( keyboard ); IDirectInputDevice8_Release( mouse );

1 0

Rémi Bernon : dinput: Rewrite IDirectInput8_EnumDevicesBySemantics.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: d62e2268d77c237e8430e158bb337958d88486ba URL: https://gitlab.winehq.org/wine/wine/-/commit/d62e2268d77c237e8430e158bb3379… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 27 10:07:56 2023 +0200 dinput: Rewrite IDirectInput8_EnumDevicesBySemantics. Simplifying and fixing it. --- dlls/dinput/device.c | 6 +- dlls/dinput/device_private.h | 2 + dlls/dinput/dinput.c | 198 ++++++++++++++++++------------------------ dlls/dinput/tests/joystick8.c | 2 +- 4 files changed, 90 insertions(+), 118 deletions(-)

1 0

Huw Davies : win32u: Fix printf format warnings.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: d0246c3ea0680f0bb40dcd0e5b54c942e096925c URL: https://gitlab.winehq.org/wine/wine/-/commit/d0246c3ea0680f0bb40dcd0e5b54c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 27 13:44:57 2023 +0100 win32u: Fix printf format warnings. --- dlls/win32u/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 11bb129134c..a49376d96a9 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2457,7 +2457,7 @@ BOOL WINAPI NtUserGetPointerInfoList( UINT32 id, POINTER_INPUT_TYPE type, UINT_P UINT32 *entry_count, UINT32 *pointer_count, void *pointer_info ) { FIXME( "id %#x, type %#x, unk0 %#zx, unk1 %#zx, size %#zx, entry_count %p, pointer_count %p, pointer_info %p stub!\n", - id, (int)type, unk0, unk1, (size_t)size, entry_count, pointer_count, pointer_info ); + id, (int)type, (size_t)unk0, (size_t)unk1, (size_t)size, entry_count, pointer_count, pointer_info ); RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; }

1 0

Francois Gouget : schtasks/tests: Deleting folders requires elevated privileges on Windows 7 & 8.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 739c5c547c361880a69993b21855af0fa00ade76 URL: https://gitlab.winehq.org/wine/wine/-/commit/739c5c547c361880a69993b21855af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 25 17:52:59 2023 +0100 schtasks/tests: Deleting folders requires elevated privileges on Windows 7 & 8. This means skipping any test that requires creating a task as the test would be unable to clean up after itself. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52193 Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54634 --- programs/schtasks/tests/Makefile.in | 2 +- programs/schtasks/tests/schtasks.c | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/programs/schtasks/tests/Makefile.in b/programs/schtasks/tests/Makefile.in index dcf641c4b13..424f9a294d1 100644 --- a/programs/schtasks/tests/Makefile.in +++ b/programs/schtasks/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = schtasks.exe -IMPORTS = ole32 +IMPORTS = advapi32 ole32 C_SRCS = \ diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index c1168d4b209..238dc3bdc16 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -16,8 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #define COBJMACROS +#include "winternl.h" #include "initguid.h" #include "taskschd.h" @@ -58,6 +61,37 @@ static WCHAR *a2w(const char *str) return ret; } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL check_win_version(int min_major, int min_minor) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + NTSTATUS (WINAPI *pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); + RTL_OSVERSIONINFOEXW rtlver; + + rtlver.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + pRtlGetVersion = (void *)GetProcAddress(hntdll, "RtlGetVersion"); + pRtlGetVersion(&rtlver); + return rtlver.dwMajorVersion > min_major || + (rtlver.dwMajorVersion == min_major && + rtlver.dwMinorVersion >= min_minor); +} +#define is_win10_plus() check_win_version(10, 0) + #define run_command(a) _run_command(__LINE__,a) static DWORD _run_command(unsigned line, const char *cmd) { @@ -173,6 +207,12 @@ START_TEST(schtasks) static WCHAR wine_testW[] = L"\\wine\\test"; DWORD r; + if (!is_process_elevated() && !is_win10_plus()) + { + win_skip("Deleting the test folders requires elevated privileges on Windows <= 8\n"); + return; + } + CoInitialize(NULL); if(!initialize_task_service()) { CoUninitialize();

1 0

Francois Gouget : schtasks/tests: Verify that the task folders are correctly deleted.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: a2d5644797ee6177d1eae05ac8d53e4b7d866137 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2d5644797ee6177d1eae05ac8d53e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 7 00:13:11 2023 +0100 schtasks/tests: Verify that the task folders are correctly deleted. --- programs/schtasks/tests/schtasks.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 238dc3bdc16..3ed2378c90c 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -266,8 +266,10 @@ START_TEST(schtasks) r = DeleteFileA("test.xml"); ok(r, "DeleteFileA failed: %lu\n", GetLastError()); - ITaskFolder_DeleteFolder(root, wine_testW, 0); - ITaskFolder_DeleteFolder(root, wineW, 0); + r = ITaskFolder_DeleteFolder(root, wine_testW, 0); + ok(r == S_OK, "DeleteFolder(\\wine\\test) failed: %lx\n", r); + r = ITaskFolder_DeleteFolder(root, wineW, 0); + ok(r == S_OK, "DeleteFolder(\\wine) failed: %lx\n", r); ITaskFolder_Release(root); ITaskService_Release(service);

1 0

Francois Gouget : schedsvc/tests: Use __HRESULT_FROM_WIN32() to initialize constants.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 5d2fe518ee6519dfe0b9466fa763845eccb9b4f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d2fe518ee6519dfe0b9466fa76384… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 24 18:29:39 2023 +0100 schedsvc/tests: Use __HRESULT_FROM_WIN32() to initialize constants. It is a macro and thus constant unlike HRESULT_FROM_WIN32(). --- dlls/schedsvc/tests/rpcapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 41182bb4fbe..84302f89141 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -65,7 +65,7 @@ START_TEST(rpcapi) { { 0, S_OK }, { TASK_CREATE, S_OK }, - { TASK_UPDATE, 0x80070002 /* HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) */ }, + { TASK_UPDATE, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) }, { TASK_CREATE | TASK_UPDATE, S_OK } }; static const struct @@ -73,8 +73,8 @@ START_TEST(rpcapi) DWORD flags, hr; } open_existing_task[] = { - { 0, 0x800700b7 /* HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) */ }, - { TASK_CREATE, 0x800700b7 /* HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) */ }, + { 0, __HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) }, + { TASK_CREATE, __HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) }, { TASK_UPDATE, S_OK }, { TASK_CREATE | TASK_UPDATE, S_OK } };

1 0

Francois Gouget : schedsvc/tests: Use wide character string literals in rpcapi.c.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 3e975e93602016694a035c95910a5348a379d854 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e975e93602016694a035c95910a53… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 25 18:02:21 2023 +0100 schedsvc/tests: Use wide character string literals in rpcapi.c. --- dlls/schedsvc/tests/rpcapi.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 84302f89141..cf160108c05 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -42,8 +42,8 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) START_TEST(rpcapi) { static unsigned char ncalrpc[] = "ncalrpc"; - static const char xml1[] = - "<?xml version=\"1.0\"?>\n" + static const WCHAR* xml1 = + L"<?xml version=\"1.0\"?>\n" "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" " <RegistrationInfo>\n" " <Description>\"Task1\"</Description>\n" @@ -78,7 +78,7 @@ START_TEST(rpcapi) { TASK_UPDATE, S_OK }, { TASK_CREATE | TASK_UPDATE, S_OK } }; - WCHAR xmlW[sizeof(xml1)], *xml; + WCHAR *xml; HRESULT hr; DWORD version, start_index, count, i, enumed, enabled, state; WCHAR *path; @@ -146,11 +146,9 @@ START_TEST(rpcapi) hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); - path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"Wine", xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine", xml1, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); @@ -159,7 +157,7 @@ START_TEST(rpcapi) { path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"\\Wine\\Task1", xmlW, create_new_task[i].flags, NULL, + hr = SchRpcRegisterTask(L"\\Wine\\Task1", xml1, create_new_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == create_new_task[i].hr, "%lu: expected %#lx, got %#lx\n", i, create_new_task[i].hr, hr); @@ -174,21 +172,21 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"\\Wine\\Task1", xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task1", xml1, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); path = NULL; info = NULL; - hr = SchRpcRegisterTask(NULL, xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(NULL, xml1, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xml1, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr); ok(!lstrcmpW(path, L"\\Wine\\Folder1\\Task1") /* win7 */ || !lstrcmpW(path, L"Wine\\Folder1\\Task1") /* vista */, "expected \\Wine\\Folder1\\Task1, task actual path %s\n", wine_dbgstr_w(path)); @@ -199,7 +197,7 @@ START_TEST(rpcapi) { path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, open_existing_task[i].flags, NULL, + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xml1, open_existing_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == open_existing_task[i].hr, "%lu: expected %#lx, got %#lx\n", i, open_existing_task[i].hr, hr); if (hr == S_OK) @@ -216,7 +214,7 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xml1, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#lx\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); @@ -358,7 +356,7 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"Wine\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Task1", xml1, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr); ok(!lstrcmpW(path, L"\\Wine\\Task1") /* win7 */ || !lstrcmpW(path, L"Wine\\Task1") /* vista */, "expected \\Wine\\Task1, task actual path %s\n", wine_dbgstr_w(path)); @@ -367,7 +365,7 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"\\Wine\\Task2", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task2", xml1, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr); ok(!lstrcmpW(path, L"\\Wine\\Task2"), "expected \\Wine\\Task2, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); @@ -449,7 +447,7 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(L"Wine\\Task3", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Task3", xml1, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr); ok(!lstrcmpW(path, L"\\Wine\\Task3") /* win7 */ || !lstrcmpW(path, L"Wine\\Task3") /* vista */, "expected \\Wine\\Task3, task actual path %s\n", wine_dbgstr_w(path)); @@ -515,7 +513,7 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(NULL, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(NULL, xml1, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK || hr == E_ACCESSDENIED, "expected S_OK, got %#lx\n", hr); if (hr != E_ACCESSDENIED) {

1 0

Francois Gouget : schedsvc/tests: Use a winetest context in the rpcapi loops.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: ee2c7dc881310dfa2f89cebde944f0875cf76879 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee2c7dc881310dfa2f89cebde944f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 25 18:05:06 2023 +0100 schedsvc/tests: Use a winetest context in the rpcapi loops. --- dlls/schedsvc/tests/rpcapi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index cf160108c05..0142b1af88a 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -155,6 +155,7 @@ START_TEST(rpcapi) for (i = 0; i < ARRAY_SIZE(create_new_task); i++) { + winetest_push_context("%lu", i); path = NULL; info = NULL; hr = SchRpcRegisterTask(L"\\Wine\\Task1", xml1, create_new_task[i].flags, NULL, @@ -168,6 +169,7 @@ START_TEST(rpcapi) ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); } + winetest_pop_context(); } path = NULL; @@ -195,11 +197,12 @@ START_TEST(rpcapi) for (i = 0; i < ARRAY_SIZE(open_existing_task); i++) { + winetest_push_context("%lu", i); path = NULL; info = NULL; hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xml1, open_existing_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); - ok(hr == open_existing_task[i].hr, "%lu: expected %#lx, got %#lx\n", i, open_existing_task[i].hr, hr); + ok(hr == open_existing_task[i].hr, "expected %#lx, got %#lx\n", open_existing_task[i].hr, hr); if (hr == S_OK) { ok(!lstrcmpW(path, L"\\Wine\\Folder1\\Task1") /* win7 */ || @@ -208,8 +211,9 @@ START_TEST(rpcapi) MIDL_user_free(path); } else - ok(!path, "%lu: expected NULL, path %p\n", i, path); - ok(!info, "%lu: expected NULL, info %p\n", i, info); + ok(!path, "expected NULL, path %p\n", path); + ok(!info, "expected NULL, info %p\n", info); + winetest_pop_context(); } path = NULL;

1 0