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

Francois Gouget : advapi32/tests: Separate the EnumServicesStatus() and EnumServicesStatusEx() tests.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 3bfe31570735cfb09c7d3cfdc2d1e0b06e870559 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bfe31570735cfb09c7d3cfdc2d1e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 16 19:23:31 2023 +0100 advapi32/tests: Separate the EnumServicesStatus() and EnumServicesStatusEx() tests. --- dlls/advapi32/tests/service.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 8a4fdec05ab..2d38f9e6a90 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1072,7 +1072,6 @@ static void test_enum_svc(void) DWORD servicecountactive, servicecountinactive; ENUM_SERVICE_STATUSA *services; ENUM_SERVICE_STATUSW *servicesW; - ENUM_SERVICE_STATUS_PROCESSA *exservices; UINT i; /* All NULL or wrong */ @@ -1452,6 +1451,19 @@ static void test_enum_svc(void) ok(servicecountinactive == 0, "Inactive services mismatch %lu\n", servicecountinactive); CloseServiceHandle(scm_handle); +} + +static void test_enum_svc_ex(void) +{ + SC_HANDLE scm_handle; + BOOL ret; + DWORD bufsize, needed, returned, resume; + DWORD neededW, returnedW; + DWORD tempneeded, tempreturned, missing; + DWORD servicecountactive, servicecountinactive; + ENUM_SERVICE_STATUSA *services; + ENUM_SERVICE_STATUS_PROCESSA *exservices; + UINT i; /* More or less the same for EnumServicesStatusExA */ if (!pEnumServicesStatusExA) @@ -1627,9 +1639,24 @@ static void test_enum_svc(void) /* Store the needed bytes */ tempneeded = needed; + /* Show the Ex call returns the same service count as the regular enum */ + EnumServicesStatusA(scm_handle, SERVICE_WIN32, SERVICE_STATE_ALL, + NULL, 0, &needed, &returned, NULL); + services = HeapAlloc(GetProcessHeap(), 0, needed); + returned = 0xdeadbeef; + ret = EnumServicesStatusA(scm_handle, SERVICE_WIN32, SERVICE_STATE_ALL, + services, needed, &needed, &returned, NULL); + ok(ret, "Expected success, got error %lu\n", GetLastError()); + ok(needed == 0, "Expected needed buffer to be 0 as we are done\n"); + ok(returned != 0xdeadbeef && returned > 0, "Expected some returned services\n"); + HeapFree(GetProcessHeap(), 0, services); + + /* Store the number of returned services */ + tempreturned = returned; + /* Allocate the correct needed bytes */ - exservices = HeapAlloc(GetProcessHeap(), 0, needed); - bufsize = needed; + exservices = HeapAlloc(GetProcessHeap(), 0, tempneeded); + bufsize = tempneeded; needed = 0xdeadbeef; returned = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2913,6 +2940,7 @@ START_TEST(service) test_get_servicekeyname(); test_query_svc(); test_enum_svc(); + test_enum_svc_ex(); test_close(); test_wow64(); /* Test the creation, querying and deletion of a service */

1 0

Francois Gouget : advapi32/tests: Better check the EnumServicesStatusExW() output.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 1da9e7c0874884d73a98a01115a4c683eb18a579 URL: https://gitlab.winehq.org/wine/wine/-/commit/1da9e7c0874884d73a98a01115a4c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 17 11:47:19 2023 +0100 advapi32/tests: Better check the EnumServicesStatusExW() output. It only has this one test. --- dlls/advapi32/tests/service.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 2d38f9e6a90..8736aaab04c 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1631,10 +1631,16 @@ static void test_enum_svc_ex(void) /* Test to show we get the same needed buffer size for the W-call */ neededW = 0xdeadbeef; + returnedW = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = pEnumServicesStatusExW(scm_handle, 0, SERVICE_WIN32, SERVICE_STATE_ALL, NULL, 0, &neededW, &returnedW, NULL, NULL); ok(!ret, "Expected failure\n"); + ok(returnedW == 0, "Expected no service returned, got %ld\n", returned); + ok(neededW != 0xdeadbeef && neededW > 0, "Expected the needed buffer size\n"); ok(neededW == needed, "Expected needed buffersize to be the same for A- and W-calls\n"); + ok(GetLastError() == ERROR_MORE_DATA, + "Expected ERROR_MORE_DATA, got %ld\n", GetLastError()); /* Store the needed bytes */ tempneeded = needed;

1 0

Francois Gouget : advapi32/tests: Take into account service start / stop race conditions.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 81e33a34841a48beb1103bf967586f5a8d3c4e40 URL: https://gitlab.winehq.org/wine/wine/-/commit/81e33a34841a48beb1103bf967586f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 16 20:18:13 2023 +0100 advapi32/tests: Take into account service start / stop race conditions. Services sometimes start or stop between two EnumServicesStatus() calls. Fortunately this is rare so the tests can just retry to get the expected result. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53460 --- dlls/advapi32/tests/service.c | 149 ++++++++++++++++++++++++++++++++---------- 1 file changed, 115 insertions(+), 34 deletions(-)

1 0

Huw Davies : winedump: Fix printf format warning.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 9b77f860469b2c244a537e266b383cfee1b1363e URL: https://gitlab.winehq.org/wine/wine/-/commit/9b77f860469b2c244a537e266b383c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 12:59:09 2023 +0000 winedump: Fix printf format warning. --- tools/winedump/pdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index c76c19fec89..d12150ab3a2 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -240,7 +240,7 @@ static void dump_string_table(const PDB_STRING_TABLE* strtable, const char* name end = ptr + strtable->length; while (ptr < end) { - printf("%s\t%zu] %s\n", pfx, ptr - (const char*)(strtable + 1), ptr); + printf("%s\t%tu] %s\n", pfx, ptr - (const char*)(strtable + 1), ptr); ptr += strlen(ptr) + 1; } table = (unsigned *)((char*)(strtable + 1) + strtable->length);

1 0

Sven Baars : advapi32/tests: Test deleting 32-bit registry keys.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 68920ee430fa9f36aaf4f9afa471caa717c36048 URL: https://gitlab.winehq.org/wine/wine/-/commit/68920ee430fa9f36aaf4f9afa471ca… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 11:55:45 2023 +0100 advapi32/tests: Test deleting 32-bit registry keys. --- dlls/advapi32/tests/registry.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 524c3e0ef76..723950a4d0f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1500,6 +1500,22 @@ static void test_reg_delete_key(void) ret = RegOpenKeyA(hkey_main, "deleteme", &key); ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); RegCloseKey(key); + + /* Test deleting 32-bit keys */ + ret = RegCreateKeyExA(hkey_main, "deleteme", 0, NULL, 0, KEY_ALL_ACCESS | KEY_WOW64_32KEY, NULL, &key, NULL); + ok(ret == ERROR_SUCCESS, "Could not create key, got %ld\n", ret); + RegCloseKey(key); + + ret = RegOpenKeyExA(hkey_main, "deleteme", 0, KEY_READ | KEY_WOW64_32KEY, &key); + ok(ret == ERROR_SUCCESS, "Could not open key, got %ld\n", ret); + + ret = RegDeleteKeyExA(key, "", KEY_WOW64_32KEY, 0); + todo_wine_if(ptr_size == 64) ok(ret == ERROR_SUCCESS, "RegDeleteKeyExA failed, got %ld\n", ret); + RegCloseKey(key); + + ret = RegOpenKeyExA(hkey_main, "deleteme", 0, KEY_READ | KEY_WOW64_32KEY, &key); + todo_wine_if(ptr_size == 64) ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); + RegCloseKey(key); } static BOOL set_privileges(LPCSTR privilege, BOOL set)

1 0

Sven Baars : kernelbase: Also call NtOpenKeyEx() on empty key names.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 88fa3459b928c6d27f56c67778c0e5d45ebbaa5b URL: https://gitlab.winehq.org/wine/wine/-/commit/88fa3459b928c6d27f56c67778c0e5… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 11:56:31 2023 +0100 kernelbase: Also call NtOpenKeyEx() on empty key names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54691 --- dlls/advapi32/tests/registry.c | 4 ++-- dlls/kernelbase/registry.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 723950a4d0f..528875261d6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1510,11 +1510,11 @@ static void test_reg_delete_key(void) ok(ret == ERROR_SUCCESS, "Could not open key, got %ld\n", ret); ret = RegDeleteKeyExA(key, "", KEY_WOW64_32KEY, 0); - todo_wine_if(ptr_size == 64) ok(ret == ERROR_SUCCESS, "RegDeleteKeyExA failed, got %ld\n", ret); + ok(ret == ERROR_SUCCESS, "RegDeleteKeyExA failed, got %ld\n", ret); RegCloseKey(key); ret = RegOpenKeyExA(hkey_main, "deleteme", 0, KEY_READ | KEY_WOW64_32KEY, &key); - todo_wine_if(ptr_size == 64) ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "Key was not deleted, got %ld\n", ret); RegCloseKey(key); } diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index d414b210026..daf1afa2cd6 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -155,7 +155,7 @@ static NTSTATUS open_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWOR attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; + if (len > 0 && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; str.Buffer = name->Buffer; @@ -202,7 +202,7 @@ static NTSTATUS open_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWOR /* wrapper for NtOpenKeyEx to handle Wow6432 nodes */ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD options, ACCESS_MASK access ) { - HKEY subkey, subkey_root = root; + HKEY subkey = 0, subkey_root = root; NTSTATUS status = 0; *retkey = NULL; @@ -228,7 +228,7 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING name, DWORD op return status; } - while (!status && name.Length) + while (!status && (name.Length || !subkey)) { status = open_subkey( &subkey, subkey_root, &name, options, access ); if (subkey_root && subkey_root != root) NtClose( subkey_root );

1 0

Mohamad Al-Jaf : windows.perception.stub/tests: Add IHolographicSpaceStatics3::get_IsConfigured() tests.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: f2a7b2f9e1c1d3877e8b7af32c9340bff223819f URL: https://gitlab.winehq.org/wine/wine/-/commit/f2a7b2f9e1c1d3877e8b7af32c9340… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 20:43:34 2023 -0500 windows.perception.stub/tests: Add IHolographicSpaceStatics3::get_IsConfigured() tests. --- dlls/windows.perception.stub/tests/perception.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 67c45e2a480..1c763930e05 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -153,6 +153,11 @@ static void test_HolographicSpaceStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); + value = 2; + hr = IHolographicSpaceStatics3_get_IsConfigured( holographicspace_statics3, &value ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( value == FALSE, "got %d.\n", value ); + ref = IHolographicSpaceStatics3_Release( holographicspace_statics3 ); ok( ref == 2, "got ref %ld.\n", ref ); done:

1 0

Mohamad Al-Jaf : windows.perception.stub: Implement IHolographicSpaceStatics3::get_IsConfigured().
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: a0a782d8a1ce8639627b8f521506f7a77d3a0ea7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0a782d8a1ce8639627b8f521506f7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 20:45:36 2023 -0500 windows.perception.stub: Implement IHolographicSpaceStatics3::get_IsConfigured(). Needed by the VR game Desperate: Vladivostok. --- dlls/windows.perception.stub/holographicspace.c | 6 ++++-- dlls/windows.perception.stub/tests/perception.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c index 52fd6421075..8a12147f4a8 100644 --- a/dlls/windows.perception.stub/holographicspace.c +++ b/dlls/windows.perception.stub/holographicspace.c @@ -174,8 +174,10 @@ DEFINE_IINSPECTABLE( holographicspace_statics3, IHolographicSpaceStatics3, struc static HRESULT WINAPI holographicspace_statics3_get_IsConfigured( IHolographicSpaceStatics3 *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + return S_OK; } static const struct IHolographicSpaceStatics3Vtbl holographicspace_statics3_vtbl = diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 1c763930e05..d0bee4eb247 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -155,8 +155,8 @@ static void test_HolographicSpaceStatics(void) value = 2; hr = IHolographicSpaceStatics3_get_IsConfigured( holographicspace_statics3, &value ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( value == FALSE, "got %d.\n", value ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( value == FALSE, "got %d.\n", value ); ref = IHolographicSpaceStatics3_Release( holographicspace_statics3 ); ok( ref == 2, "got ref %ld.\n", ref );

1 0

Hans Leidekker : adsldp/tests: Skip all remaining tests when the server is down.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 39e70374e67a84ee96a660b637a6c148d0513c91 URL: https://gitlab.winehq.org/wine/wine/-/commit/39e70374e67a84ee96a660b637a6c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 17 08:45:01 2023 +0100 adsldp/tests: Skip all remaining tests when the server is down. There's a long timeout when the connection fails and there doesn't appear to be a way to reduce it with this API. When several of these timeouts occur the total time can exceed the timeout for the test. This patch skips all remaining tests when one of them detects that the server is down. --- dlls/adsldp/tests/ldap.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 80b41df5ea7..a5bb4ee971f 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -37,6 +37,8 @@ DEFINE_GUID(CLSID_LDAP,0x228d9a81,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); DEFINE_OLEGUID(CLSID_PointerMoniker,0x306,0,0); +static BOOL server_down; + static const struct { const WCHAR *path; @@ -74,6 +76,8 @@ static void test_LDAP(void) BSTR path, user, password; int i; + if (server_down) return; + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); ok(hr == S_OK, "got %#lx\n", hr); IADs_Release(ads); @@ -99,6 +103,7 @@ static void test_LDAP(void) { SysFreeString(path); skip("server is down\n"); + server_down = TRUE; break; } ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); @@ -110,6 +115,7 @@ static void test_LDAP(void) { SysFreeString(path); skip("server is down\n"); + server_down = TRUE; break; } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); @@ -121,6 +127,7 @@ static void test_LDAP(void) { SysFreeString(path); skip("server is down\n"); + server_down = TRUE; break; } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); @@ -149,6 +156,8 @@ static void test_ParseDisplayName(void) ULONG count; int i; + if (server_down) return; + hr = CoCreateInstance(&CLSID_LDAP, 0, CLSCTX_INPROC_SERVER, &IID_IParseDisplayName, (void **)&parse); ok(hr == S_OK, "got %#lx\n", hr); IParseDisplayName_Release(parse); @@ -172,6 +181,7 @@ static void test_ParseDisplayName(void) { SysFreeString(path); skip("server is down\n"); + server_down = TRUE; break; } ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); @@ -193,6 +203,7 @@ static void test_ParseDisplayName(void) if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; break; } todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) @@ -237,12 +248,15 @@ static void do_search(const struct search *s) LPWSTR name; const struct result *res; + if (server_down) return; + trace("search DN %s\n", wine_dbgstr_w(s->dn)); hr = ADsGetObject(s->dn, &IID_IDirectorySearch, (void **)&ds); if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; return; } ok(hr == S_OK, "got %#lx\n", hr); @@ -363,6 +377,8 @@ static void test_DirectorySearch(void) ADS_SEARCH_COLUMN col; LPWSTR name; + if (server_down) return; + hr = ADsGetObject(L"LDAP:", &IID_IDirectorySearch, (void **)&ds); ok(hr == E_NOINTERFACE, "got %#lx\n", hr); @@ -370,6 +386,7 @@ static void test_DirectorySearch(void) if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; return; } ok(hr == E_NOINTERFACE, "got %#lx\n", hr); @@ -378,6 +395,7 @@ static void test_DirectorySearch(void) if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; return; } ok(hr == S_OK, "got %#lx\n", hr); @@ -492,10 +510,13 @@ static void test_DirectoryObject(void) ADS_SEARCH_HANDLE sh; ADS_SEARCH_COLUMN col; + if (server_down) return; + hr = ADsGetObject(L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", &IID_IDirectoryObject, (void **)&dirobj); if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; return; } ok(hr == S_OK, "got %#lx\n", hr);

1 0

Zhiyi Zhang : user32/tests: Test winstation and desktop access rights.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 44b92e577716f5b91fd8b6130a79a81ae13d426f URL: https://gitlab.winehq.org/wine/wine/-/commit/44b92e577716f5b91fd8b6130a79a8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 15 10:32:55 2023 +0800 user32/tests: Test winstation and desktop access rights. --- dlls/user32/tests/winstation.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 9c27b5afd01..fc775546502 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -121,7 +121,9 @@ static void test_handles(void) char buffer[29], default_name[29] = ""; DWORD size; BOOL ret; + OBJECT_BASIC_INFORMATION info; TOKEN_STATISTICS token_stats; + NTSTATUS status; /* win stations */ @@ -133,6 +135,12 @@ static void test_handles(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() ); print_object( w1 ); + status = NtQueryObject( w1, ObjectBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "NtQueryObject failed, status %#lx\n", status ); + todo_wine + ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS), + "Got unexpected access %#lx\n", info.GrantedAccess ); + flags = 0; ok( GetHandleInformation( w1, &flags ), "GetHandleInformation failed\n" ); ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE) || @@ -270,6 +278,12 @@ static void test_handles(void) ok( GetHandleInformation( d1, &flags ), "GetHandleInformation failed\n" ); ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE), "handle %p PROTECT_FROM_CLOSE set\n", d1 ); + status = NtQueryObject( d1, ObjectBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "NtQueryObject failed, status %#lx\n", status ); + todo_wine + ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS), + "Got unexpected access %#lx\n", info.GrantedAccess ); + SetLastError( 0xdeadbeef ); ok( !CloseDesktop(d1), "closing thread desktop succeeded\n" ); ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */

1 0