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

Connor McAdams : uiautomationcore: Add a helper function for retrieving a property value from an individual node provider.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: master Commit: 2d85254355ce70d2a7a963f1cd614f8d49c1632f URL: https://gitlab.winehq.org/wine/wine/-/commit/2d85254355ce70d2a7a963f1cd614f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Mar 22 10:36:21 2023 -0400 uiautomationcore: Add a helper function for retrieving a property value from an individual node provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 195974c25f6..fbcbb7640b3 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -381,6 +381,23 @@ int get_node_provider_type_at_idx(struct uia_node *node, int idx) return 0; } +static HRESULT get_prop_val_from_node_provider(IWineUiaNode *node, const struct uia_prop_info *prop_info, int idx, + VARIANT *out_val) +{ + IWineUiaProvider *prov; + HRESULT hr; + + VariantInit(out_val); + hr = IWineUiaNode_get_provider(node, idx, &prov); + if (FAILED(hr)) + return hr; + + hr = IWineUiaProvider_get_prop_val(prov, prop_info, out_val); + IWineUiaProvider_Release(prov); + + return hr; +} + static HRESULT get_prov_opts_from_node_provider(IWineUiaNode *node, int idx, int *out_opts) { IWineUiaProvider *prov; @@ -2231,22 +2248,16 @@ BOOL WINAPI UiaNodeRelease(HUIANODE huianode) return TRUE; } -static HRESULT get_prop_val_from_node_provider(struct uia_node *node, +static HRESULT get_prop_val_from_node(struct uia_node *node, const struct uia_prop_info *prop_info, VARIANT *v) { - IWineUiaProvider *prov; HRESULT hr = S_OK; int i; + VariantInit(v); for (i = 0; i < node->prov_count; i++) { - hr = IWineUiaNode_get_provider(&node->IWineUiaNode_iface, i, &prov); - if (FAILED(hr)) - return hr; - - VariantInit(v); - hr = IWineUiaProvider_get_prop_val(prov, prop_info, v); - IWineUiaProvider_Release(prov); + hr = get_prop_val_from_node_provider(&node->IWineUiaNode_iface, prop_info, i, v); if (FAILED(hr) || V_VT(v) != VT_EMPTY) break; } @@ -2301,7 +2312,7 @@ HRESULT WINAPI UiaGetPropertyValue(HUIANODE huianode, PROPERTYID prop_id, VARIAN break; } - hr = get_prop_val_from_node_provider(node, prop_info, &v); + hr = get_prop_val_from_node(node, prop_info, &v); if (SUCCEEDED(hr) && V_VT(&v) != VT_EMPTY) { /* @@ -2440,7 +2451,7 @@ HRESULT WINAPI UiaGetRuntimeId(HUIANODE huianode, SAFEARRAY **runtime_id) { VARIANT v; - hr = get_prop_val_from_node_provider(node, prop_info, &v); + hr = get_prop_val_from_node(node, prop_info, &v); if (FAILED(hr)) { VariantClear(&v);

1 0

Rémi Bernon : dinput: Load action map from registry before resetting guid.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Connor McAdams : uiautomationcore/tests: Add NULL input argument tests for IUIAutomationTreeWalker navigation method.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: master Commit: 45aca56e0879e089e063a9e643b497f3f915cdad URL: https://gitlab.winehq.org/wine/wine/-/commit/45aca56e0879e089e063a9e643b497… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Mar 20 08:10:55 2023 -0400 uiautomationcore/tests: Add NULL input argument tests for IUIAutomationTreeWalker navigation method. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 6aa5e67c440..b957999a365 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -11841,6 +11841,15 @@ static void test_CUIAutomation_TreeWalker_ifaces(IUIAutomation *uia_iface) provider_add_child(&Provider, &Provider_child); provider_add_child(&Provider, &Provider_child2); + /* NULL input argument tests. */ + hr = IUIAutomationTreeWalker_GetFirstChildElement(walker, element, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + element2 = (void *)0xdeadbeef; + hr = IUIAutomationTreeWalker_GetFirstChildElement(walker, NULL, &element2); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(!element2, "element2 != NULL\n"); + /* NavigateDirection_FirstChild. */ element2 = NULL; hr = IUIAutomationTreeWalker_GetFirstChildElement(walker, element, &element2);

1 0

Connor McAdams : uiautomationcore/tests: Skip IAccessible2 tests on Win10v1909.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: master Commit: 5c41987709a861d088c887a723aaf1779b1b9272 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c41987709a861d088c887a723aaf1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Mar 15 16:28:35 2023 -0400 uiautomationcore/tests: Skip IAccessible2 tests on Win10v1909. Windows 10 1909 doesn't use IAccessible2 interfaces while comparing IAccessible interfaces, so skip the interface comparison tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53269 --- dlls/uiautomationcore/tests/uiautomation.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index f1d57336d37..6aa5e67c440 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -2739,9 +2739,9 @@ static void test_uia_prov_from_acc_ia2(void) HRESULT hr; /* Only one exposes an IA2 interface, no match. */ - set_accessible_props(&Accessible, 0, 0, 0, L"acc_name", 0, 0, 0, 0); + set_accessible_props(&Accessible, ROLE_SYSTEM_DOCUMENT, 0, 0, L"acc_name", 0, 0, 0, 0); set_accessible_ia2_props(&Accessible, TRUE, 0); - set_accessible_props(&Accessible2, 0, 0, 0, L"acc_name", 0, 0, 0, 0); + set_accessible_props(&Accessible2, ROLE_SYSTEM_TEXT, 0, 0, L"acc_name", 0, 0, 0, 0); set_accessible_ia2_props(&Accessible2, FALSE, 0); hr = pUiaProviderFromIAccessible(&Accessible.IAccessible_iface, CHILDID_SELF, UIA_PFIA_DEFAULT, &elprov); @@ -2755,6 +2755,11 @@ static void test_uia_prov_from_acc_ia2(void) acc_client = &Accessible2.IAccessible_iface; SET_EXPECT(winproc_GETOBJECT_CLIENT); + /* The four below are only called on Win10v1909. */ + SET_EXPECT(Accessible_get_accRole); + SET_EXPECT(Accessible2_get_accRole); + SET_EXPECT(Accessible2_QI_IAccIdentity); + SET_EXPECT(Accessible2_get_accParent); elprov2 = (void *)0xdeadbeef; hr = IRawElementProviderSimple_get_HostRawElementProvider(elprov, &elprov2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2762,6 +2767,27 @@ static void test_uia_prov_from_acc_ia2(void) ok(Accessible2.ref == 1, "Unexpected refcnt %ld\n", Accessible2.ref); CHECK_CALLED(winproc_GETOBJECT_CLIENT); + /* + * Win10v1909 has IAccessible2 support, but it's not used for checking if + * two IAccessible interfaces match. Skip the comparison tests for this + * Windows version. + */ + if (called_Accessible_get_accRole) + { + IRawElementProviderSimple_Release(elprov); + CHECK_CALLED(Accessible_get_accRole); + CHECK_CALLED(Accessible2_get_accRole); + CHECK_CALLED(Accessible2_QI_IAccIdentity); + CHECK_CALLED(Accessible2_get_accParent); + win_skip("Win10v1909 doesn't support IAccessible2 interface comparsion, skipping tests.\n"); + return; + } + called_Accessible_get_accRole = expect_Accessible_get_accRole = 0; + called_Accessible2_get_accRole = expect_Accessible2_get_accRole = 0; + called_Accessible2_QI_IAccIdentity = expect_Accessible2_QI_IAccIdentity = 0; + called_Accessible2_get_accParent = expect_Accessible2_get_accParent = 0; + + Accessible.role = Accessible2.role = 0; elprov2 = (void *)0xdeadbeef; acc_client = NULL; hr = IRawElementProviderSimple_get_HostRawElementProvider(elprov, &elprov2);

1 0

Alex Henrie : wldap32: Implement setting LDAP_OPT_SSL and add tests.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: master Commit: 31aa2245ef4e7c91250b8033a5bdeb5069d316ee URL: https://gitlab.winehq.org/wine/wine/-/commit/31aa2245ef4e7c91250b8033a5bdeb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 27 09:07:48 2023 -0600 wldap32: Implement setting LDAP_OPT_SSL and add tests. Windows has the LDAP_OPT_SSL option to turn SSL on or off after calling ldap_init but before connecting to the server. OpenLDAP doesn't have that option and instead expects a fully SSL connection to be requested by passing one or more "ldaps://" URIs to ldap_init. However, OpenLDAP also has an LDAP_OPT_URI option, which Windows does not have, that can be used to change the URIs before connecting. And OpenLDAP already takes care of converting "ldap://" or "ldaps://" to lowercase, so all we have to do is find and replace that exact string in each URI in the list. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54727 --- dlls/wldap32/option.c | 33 ++++++++++++++++++++++++-- dlls/wldap32/tests/parse.c | 54 ++++++++++++++++++++++++++++++++++++++++++ dlls/wldap32/winldap_private.h | 18 ++++++++++++++ 3 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index cc85ed1340b..38ede5557d2 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -291,6 +291,7 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_PROTOCOL_VERSION: case WLDAP32_LDAP_OPT_REFERRALS: case WLDAP32_LDAP_OPT_SIZELIMIT: + case WLDAP32_LDAP_OPT_SSL: case WLDAP32_LDAP_OPT_TIMELIMIT: return ldap_set_optionW( ld, option, value ); @@ -333,7 +334,6 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_SERVER_ERROR: case WLDAP32_LDAP_OPT_SERVER_EXT_ERROR: case WLDAP32_LDAP_OPT_SIGN: - case WLDAP32_LDAP_OPT_SSL: case WLDAP32_LDAP_OPT_SSL_INFO: case WLDAP32_LDAP_OPT_SSPI_FLAGS: case WLDAP32_LDAP_OPT_TCP_KEEPALIVE: @@ -447,6 +447,36 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_TIMELIMIT: return map_error( ldap_set_option( CTX(ld), option, value ) ); + case WLDAP32_LDAP_OPT_SSL: + { + BOOL turn_on; + char *uri, *new_uri; + + if (value == WLDAP32_LDAP_OPT_ON) + turn_on = TRUE; + else if (value == WLDAP32_LDAP_OPT_OFF) + turn_on = FALSE; + else if (*(ULONG *)value == 1) + turn_on = TRUE; + else if (*(ULONG *)value == 0) + turn_on = FALSE; + else + return WLDAP32_LDAP_PARAM_ERROR; + + ret = ldap_get_option( CTX(ld), LDAP_OPT_URI, &uri ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + if (turn_on) + new_uri = strreplace( uri, "ldap://", "ldaps://" ); + else + new_uri = strreplace( uri, "ldaps://", "ldap://" ); + + ret = map_error( ldap_set_option( CTX(ld), LDAP_OPT_URI, new_uri ) ); + ldap_memfree(uri); + free(new_uri); + return ret; + } + case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: case WLDAP32_LDAP_OPT_CACHE_STRATEGY: @@ -486,7 +516,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_SERVER_ERROR: case WLDAP32_LDAP_OPT_SERVER_EXT_ERROR: case WLDAP32_LDAP_OPT_SIGN: - case WLDAP32_LDAP_OPT_SSL: case WLDAP32_LDAP_OPT_SSL_INFO: case WLDAP32_LDAP_OPT_SSPI_FLAGS: case WLDAP32_LDAP_OPT_TCP_KEEPALIVE: diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 19e7a48b471..8cd313cd6ca 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -491,6 +491,59 @@ static void test_ldap_paged_search(void) ldap_unbind( ld ); } +static void test_opt_ssl(void) +{ + LDAP *ld; + ULONG ret, version = LDAP_VERSION3, value; + + /* Turning on LDAP_OPT_SSL without setting the protocol version does not work */ + ld = ldap_initA( (char *)"db.debian.org", 636 ); + ok( ld != NULL, "ldap_init failed\n" ); + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, LDAP_OPT_ON ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_simple_bind_sA( ld, NULL, NULL ); + todo_wine ok( ret == LDAP_PROTOCOL_ERROR, "ldap_simple_bind_sA should fail, got %#lx\n", ret ); + ldap_unbind( ld ); + + /* Setting the protocol version to 3 automatically enables SSL when using port 636 */ + ld = ldap_initA( (char *)"db.debian.org", 636 ); + ok( ld != NULL, "ldap_init failed\n" ); + ret = ldap_set_optionA( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, LDAP_OPT_OFF ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_simple_bind_sA( ld, NULL, NULL ); + todo_wine ok( !ret, "ldap_simple_bind_sA should succeed, got %#lx\n", ret ); + ldap_unbind( ld ); + + /* Turning on SSL when the server does not expect it does not work */ + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, LDAP_OPT_ON ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_simple_bind_sA( ld, NULL, NULL ); + ok( ret == LDAP_SERVER_DOWN, "ldap_simple_bind_sA should fail, got %#lx\n", ret ); + ldap_unbind( ld ); + + /* SSL can also be turned on by passing a pointer to a variable with value 1 */ + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + value = 1; + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, &value ); + ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); + ret = ldap_simple_bind_sA( ld, NULL, NULL ); + ok( ret == LDAP_SERVER_DOWN, "ldap_simple_bind_sA should fail, got %#lx\n", ret ); + ldap_unbind( ld ); + + /* SSL cannot be turned on by passing a pointer to a variable with a bogus value */ + ld = ldap_initA( (char *)"db.debian.org", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + value = 2; + ret = ldap_set_optionA( ld, LDAP_OPT_SSL, &value ); + ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionA should fail, got %#lx\n", ret ); + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; @@ -498,6 +551,7 @@ START_TEST (parse) test_ldap_paged_search(); test_ldap_server_control(); test_ldap_bind_sA(); + test_opt_ssl(); ld = ldap_initA( (char *)"db.debian.org", 389 ); ok( ld != NULL, "ldap_init failed\n" ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index aeeffcfcc15..7adf77f151e 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -598,6 +598,24 @@ static inline WCHAR *strnAtoW( const char *str, DWORD in_len, DWORD *out_len ) return ret; } +static inline char *strreplace( const char *s, const char *before, const char *after ) +{ + char *ret = malloc( strlen( s ) + strlen( after ) / strlen( before ) + 1 ); + char *cur, *prev = ret; + if (ret) + { + ret[0] = 0; + for (cur = strstr( s, before ); cur; cur = strstr( prev, before )) + { + strncat( ret, prev, cur - prev ); + strcat( ret, after ); + prev = cur + strlen( before ); + } + strncat( ret, prev, cur - prev ); + } + return ret; +} + static inline DWORD bvarraylenW( struct WLDAP32_berval **bv ) { struct WLDAP32_berval **p = bv;

1 0

Francois Gouget : schedsvc/tests: Document SchRpcGetTaskInfo() calls that crash on Windows.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: master Commit: 4385a3c29e169827239a05318dfda546a46e340c URL: https://gitlab.winehq.org/wine/wine/-/commit/4385a3c29e169827239a05318dfda5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 25 18:51:06 2023 +0100 schedsvc/tests: Document SchRpcGetTaskInfo() calls that crash on Windows. Not just Windows 7 but all versions up to Windows 11. --- dlls/schedsvc/tests/rpcapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 0142b1af88a..b8742c1fd58 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -471,7 +471,7 @@ START_TEST(rpcapi) MIDL_user_free(names[0]); MIDL_user_free(names); - if (0) /* crashes under win7 */ + if (0) /* each of these crashes on Windows 7 to 11 */ { hr = SchRpcGetTaskInfo(NULL, 0, NULL, NULL); hr = SchRpcGetTaskInfo(L"Task1", 0, NULL, NULL);

1 0

Francois Gouget : schedsvc/tests: Deleting tasks & folders requires elevated privileges on Windows 7.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: master Commit: bb516ae1a616b6454ebe494201c50690a811dc03 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb516ae1a616b6454ebe494201c506… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 26 17:59:04 2023 +0200 schedsvc/tests: Deleting tasks & folders requires elevated privileges on Windows 7. This means skipping any test that requires creating a folder as the test would be unable to clean up after itself. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53128 Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54109 --- dlls/schedsvc/tests/Makefile.in | 2 +- dlls/schedsvc/tests/rpcapi.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in index b8e7448bb76..62f41d4744f 100644 --- a/dlls/schedsvc/tests/Makefile.in +++ b/dlls/schedsvc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = schedsvc.dll -IMPORTS = rpcrt4 ole32 +IMPORTS = advapi32 rpcrt4 ole32 C_SRCS = \ atsvcapi.c \ diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index b8742c1fd58..d9e2a75eb7b 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -18,6 +18,7 @@ #include <stdio.h> #include <windows.h> +#include "winternl.h" #include <ole2.h> #include <rpcdce.h> #include <taskschd.h> @@ -25,6 +26,37 @@ #include "wine/test.h" +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_win8_plus() check_win_version(6, 2) + extern handle_t schrpc_handle; static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) @@ -143,6 +175,12 @@ START_TEST(rpcapi) hr = SchRpcDelete(L"", 0); ok(hr == E_ACCESSDENIED /* win7 */ || hr == E_INVALIDARG /* vista */, "expected E_ACCESSDENIED, got %#lx\n", hr); + if (!is_process_elevated() && !is_win8_plus()) + { + win_skip("Skipping because deleting anything requires elevated privileges on Windows 7\n"); + return; + } + hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#lx\n", hr);

1 0

Francois Gouget : schedsvc/tests: Use a winetest context in the rpcapi loops.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Francois Gouget : schedsvc/tests: Use wide character string literals in rpcapi.c.
by Alexandre Julliard March 27, 2023

March 27, 2023

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 __HRESULT_FROM_WIN32() to initialize constants.
by Alexandre Julliard March 27, 2023

March 27, 2023

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