October 2016 - Wine-commits

Hadrien Boizard : winex11.drv: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 288a15fabde623597b272597ec84afbddb4636e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288a15fabde623597b272597e… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Thu Oct 13 17:05:08 2016 +0200 winex11.drv: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0de7955..7408a0e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2243,7 +2243,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag surface_rect = get_surface_rect( visible_rect ); if (data->surface) { - if (!memcmp( &data->surface->rect, &surface_rect, sizeof(surface_rect) )) + if (EqualRect( &data->surface->rect, &surface_rect )) { /* existing surface is good enough */ window_surface_add_ref( data->surface ); @@ -2311,7 +2311,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags old_client_rect.right - data->client_rect.right == x_offset && old_client_rect.top - data->client_rect.top == y_offset && old_client_rect.bottom - data->client_rect.bottom == y_offset && - !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) + EqualRect( &valid_rects[0], &data->client_rect )) { /* if we have an X window the bits will be moved by the X server */ if (!window && (x_offset != 0 || y_offset != 0)) @@ -2595,7 +2595,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO OffsetRect( &rect, -window_rect->left, -window_rect->top ); surface = data->surface; - if (!surface || memcmp( &surface->rect, &rect, sizeof(RECT) )) + if (!surface || !EqualRect( &surface->rect, &rect )) { data->surface = create_surface( data->whole_window, &data->vis, &rect, color_key, !data->embedded );

1 0

Christoph von Wittich : rpcrt4: Implement RpcBindingServerFromClient and populate NetworkAddr for each transport.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 01290cdc1f79e2ad53ef02acc109f132521e3f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01290cdc1f79e2ad53ef02acc… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Wed Oct 12 17:14:11 2016 +0200 rpcrt4: Implement RpcBindingServerFromClient and populate NetworkAddr for each transport. Add more thorough testing for this function. Signed-off-by: Colin Finck <mail(a)colinfinck.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.c | 22 ++++++++++++++++++---- dlls/rpcrt4/rpc_transport.c | 34 ++++++++++++++++++++++++++++++++-- dlls/rpcrt4/tests/server.c | 33 ++++++++++++++++++++++----------- 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 7212a18..07eddbe 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1636,11 +1636,25 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE * /*********************************************************************** * RpcBindingServerFromClient (RPCRT4.@) */ - -RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE *ServerBinding) +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingServerFromClient(RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE* ServerBinding) { - FIXME("%p %p: stub\n", ClientBinding, ServerBinding); - return RPC_S_INVALID_BINDING; + RpcBinding* bind = ClientBinding; + RpcBinding* NewBinding; + + if (!bind) + bind = I_RpcGetCurrentCallHandle(); + + if (!bind->server) + return RPC_S_INVALID_BINDING; + + RPCRT4_AllocBinding(&NewBinding, TRUE); + NewBinding->Protseq = RPCRT4_strdupA(bind->Protseq); + NewBinding->NetworkAddr = RPCRT4_strdupA(bind->NetworkAddr); + + *ServerBinding = NewBinding; + + return RPC_S_OK; } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b2fbf9b..4ba17a0 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -388,6 +388,7 @@ static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np * static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; RPC_STATUS status; LPSTR pname; @@ -397,6 +398,16 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); + /* Store the local computer name as the NetworkAddr for ncacn_np as long as + * we don't support named pipes over the network. */ + FIXME("Using local computer name as NetworkAddr\n"); + new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); + if (!GetComputerNameA(new_conn->NetworkAddr, &len)) + { + ERR("Failed to retrieve the computer name, error %u\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } + return status; } @@ -429,6 +440,7 @@ static RPC_STATUS rpcrt4_ncalrpc_np_is_server_listening(const char *endpoint) static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; RPC_STATUS status; LPSTR pname; @@ -439,7 +451,15 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection pname = ncalrpc_pipe_name(old_conn->Endpoint); status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); - + + /* Store the local computer name as the NetworkAddr for ncalrpc. */ + new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); + if (!GetComputerNameA(new_conn->NetworkAddr, &len)) + { + ERR("Failed to retrieve the computer name, error %u\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } + return status; } @@ -1479,10 +1499,20 @@ static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection ERR("Failed to accept a TCP connection: error %d\n", ret); return RPC_S_OUT_OF_RESOURCES; } + nonblocking = 1; ioctlsocket(ret, FIONBIO, &nonblocking); client->sock = ret; - TRACE("Accepted a new TCP connection\n"); + + client->common.NetworkAddr = HeapAlloc(GetProcessHeap(), 0, INET6_ADDRSTRLEN); + ret = getnameinfo((struct sockaddr*)&address, addrsize, client->common.NetworkAddr, INET6_ADDRSTRLEN, NULL, 0, NI_NUMERICHOST); + if (ret != 0) + { + ERR("Failed to retrieve the IP address, error %d\n", ret); + return RPC_S_OUT_OF_RESOURCES; + } + + TRACE("Accepted a new TCP connection from %s\n", client->common.NetworkAddr); return RPC_S_OK; } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f9a5a96..ee28703 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -745,29 +745,40 @@ void __cdecl s_context_handle_test(void) binding = NULL; status = RpcBindingServerFromClient(NULL, &binding); - todo_wine - { - ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); - ok(binding != NULL, "binding is NULL\n"); - } + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(binding != NULL, "binding is NULL\n"); if (status == RPC_S_OK && binding != NULL) { unsigned char* string_binding = NULL; - unsigned char* computer_name = NULL; + unsigned char* object_uuid = NULL; + unsigned char* protseq = NULL; + unsigned char* network_address = NULL; + unsigned char* endpoint = NULL; + unsigned char* network_options = NULL; status = RpcBindingToStringBindingA(binding, &string_binding); - ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); ok(string_binding != NULL, "string_binding is NULL\n"); - status = RpcStringBindingParseA(string_binding, NULL, NULL, &computer_name, NULL, NULL); - + status = RpcStringBindingParseA(string_binding, &object_uuid, &protseq, &network_address, &endpoint, &network_options); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); - ok(computer_name != NULL, "computer_name is NULL\n"); + ok(protseq != NULL && *protseq != '\0', "protseq is %s\n", protseq); + ok(network_address != NULL && *network_address != '\0', "network_address is %s\n", network_address); + + todo_wine + { + ok(object_uuid != NULL && *object_uuid == '\0', "object_uuid is %s\n", object_uuid); + ok(endpoint != NULL && *endpoint == '\0', "endpoint is %s\n", endpoint); + ok(network_options != NULL && *network_options == '\0', "network_options is %s\n", network_options); + } RpcStringFreeA(&string_binding); - RpcStringFreeA(&computer_name); + RpcStringFreeA(&object_uuid); + RpcStringFreeA(&protseq); + RpcStringFreeA(&network_address); + RpcStringFreeA(&endpoint); + RpcStringFreeA(&network_options); RpcBindingFree(&binding); } }

1 0

Donat Enikeev : crypt32/tests: Add tests for Cert(Un)registerSystemStore.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: dc208e7216fe2871c5ff59598ade2c8df2091de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc208e7216fe2871c5ff59598… Author: Donat Enikeev <donat(a)enikeev.net> Date: Fri Oct 14 09:37:08 2016 +0300 crypt32/tests: Add tests for Cert(Un)registerSystemStore. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 92 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 4483936..e811fbe 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -123,6 +123,8 @@ static BOOL (WINAPI *pCertGetStoreProperty)(HCERTSTORE,DWORD,void*,DWORD*); static void (WINAPI *pCertRemoveStoreFromCollection)(HCERTSTORE,HCERTSTORE); static BOOL (WINAPI *pCertSetStoreProperty)(HCERTSTORE,DWORD,DWORD,const void*); static BOOL (WINAPI *pCertAddCertificateLinkToStore)(HCERTSTORE,PCCERT_CONTEXT,DWORD,PCCERT_CONTEXT*); +static BOOL (WINAPI *pCertRegisterSystemStore)(const void*,DWORD,void*,void*); +static BOOL (WINAPI *pCertUnregisterSystemStore)(const void*,DWORD); #define test_store_is_empty(store) _test_store_is_empty(__LINE__,store) static void _test_store_is_empty(unsigned line, HCERTSTORE store) @@ -1868,6 +1870,88 @@ static void testCertOpenSystemStore(void) RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); } +static const struct +{ + DWORD cert_store; + BOOL expected; + BOOL todo; +} reg_system_store_test_data[] = { + { CERT_SYSTEM_STORE_CURRENT_USER, TRUE, 0}, + /* Following tests could require administrator privileges and thus could be skipped */ + { CERT_SYSTEM_STORE_CURRENT_SERVICE, TRUE, 1}, + { CERT_SYSTEM_STORE_LOCAL_MACHINE, TRUE, 0}, + { CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY, TRUE, 0}, + { CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY, TRUE, 0}, + { CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, TRUE, 1} +}; + +static void testCertRegisterSystemStore(void) +{ + BOOL ret, cur_flag; + DWORD err = 0; + HCERTSTORE hstore; + static const WCHAR WineTestW[] = {'W','i','n','e','T','e','s','t',0}; + const CERT_CONTEXT *cert, *cert2; + unsigned int i; + + if (!pCertRegisterSystemStore || !pCertUnregisterSystemStore) + { + win_skip("CertRegisterSystemStore() or CertUnregisterSystemStore() is not available\n"); + return; + } + + for (i = 0; i < sizeof(reg_system_store_test_data) / sizeof(reg_system_store_test_data[0]); i++) { + cur_flag = reg_system_store_test_data[i].cert_store; + ret = pCertRegisterSystemStore(WineTestW, cur_flag, NULL, NULL); + if (!ret) + { + err = GetLastError(); + if (err == ERROR_ACCESS_DENIED) + { + win_skip("Insufficient privileges for the flag %08x test\n", cur_flag); + continue; + } + } + todo_wine_if (reg_system_store_test_data[i].todo) + ok (ret == reg_system_store_test_data[i].expected, + "Store registration (dwFlags=%08x) failed, last error %x\n", cur_flag, err); + if (!ret) + { + skip("Nothing to test without registered store at %08x\n", cur_flag); + continue; + } + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_STORE_OPEN_EXISTING_FLAG | cur_flag, WineTestW); + ok (hstore != NULL, "Opening just registered store at %08x failed, last error %x\n", cur_flag, GetLastError()); + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); + ok (cert != NULL, "Failed creating cert at %08x, last error: %x\n", cur_flag, GetLastError()); + if (cert) + { + ret = CertAddCertificateContextToStore(hstore, cert, CERT_STORE_ADD_NEW, NULL); + ok (ret, "Failed to add cert at %08x, last error: %x\n", cur_flag, GetLastError()); + + cert2 = CertEnumCertificatesInStore(hstore, NULL); + ok (cert2 != NULL && cert2->cbCertEncoded == cert->cbCertEncoded, + "Unexpected cert encoded size at %08x, last error: %x\n", cur_flag, GetLastError()); + + ret = CertDeleteCertificateFromStore(cert2); + ok (ret, "Failed to delete certificate from the new store at %08x, last error: %x\n", cur_flag, GetLastError()); + + CertFreeCertificateContext(cert); + } + + ret = CertCloseStore(hstore, 0); + ok (ret, "CertCloseStore failed at %08x, last error %x", cur_flag, GetLastError()); + + ret = pCertUnregisterSystemStore(WineTestW, cur_flag ); + todo_wine_if (reg_system_store_test_data[i].todo) + ok( ret == reg_system_store_test_data[i].expected, + "Unregistering failed at %08x, last error %d\n", cur_flag, GetLastError()); + } + +} + struct EnumSystemStoreInfo { BOOL goOn; @@ -2587,8 +2671,6 @@ static void testEmptyStore(void) ok(res, "CertDeleteCertificateContextFromStore failed\n"); ok(cert3->hCertStore == cert->hCertStore, "Unexpected hCertStore\n"); - CertFreeCertificateContext(cert3); - store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(store != NULL, "CertOpenStore failed\n"); @@ -2601,8 +2683,6 @@ static void testEmptyStore(void) ok(res, "CertDeleteCertificateContextFromStore failed\n"); ok(cert3->hCertStore == store, "Unexpected hCertStore\n"); - CertFreeCertificateContext(cert3); - CertCloseStore(store, 0); res = CertCloseStore(cert->hCertStore, CERT_CLOSE_STORE_CHECK_FLAG); @@ -2808,6 +2888,8 @@ START_TEST(store) pCertRemoveStoreFromCollection = (void*)GetProcAddress(hdll, "CertRemoveStoreFromCollection"); pCertSetStoreProperty = (void*)GetProcAddress(hdll, "CertSetStoreProperty"); pCertAddCertificateLinkToStore = (void*)GetProcAddress(hdll, "CertAddCertificateLinkToStore"); + pCertRegisterSystemStore = (void*)GetProcAddress(hdll, "CertRegisterSystemStore"); + pCertUnregisterSystemStore = (void*)GetProcAddress(hdll, "CertUnregisterSystemStore"); /* various combinations of CertOpenStore */ testMemStore(); @@ -2821,6 +2903,8 @@ START_TEST(store) testSerializedStore(); testCloseStore(); + testCertRegisterSystemStore(); + testCertOpenSystemStore(); testCertEnumSystemStore(); testStoreProperty();

1 0

Donat Enikeev : crypt32: Cert(Un)RegisterSystemStore semi-stubs.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 71bd13391b3cd8d686b552021b918cf1e4f70d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bd13391b3cd8d686b552021… Author: Donat Enikeev <donat(a)enikeev.net> Date: Fri Oct 14 09:37:09 2016 +0300 crypt32: Cert(Un)RegisterSystemStore semi-stubs. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 2 ++ dlls/crypt32/store.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 0d2a477..b5ce48c 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -78,6 +78,7 @@ @ stdcall CertRDNValueToStrA(long ptr ptr long) @ stdcall CertRDNValueToStrW(long ptr ptr long) @ stdcall CertRegisterPhysicalStore(ptr long wstr ptr ptr) +@ stdcall CertRegisterSystemStore(ptr long ptr ptr) @ stdcall CertRemoveEnhancedKeyUsageIdentifier(ptr str) @ stdcall CertRemoveStoreFromCollection(ptr ptr) @ stdcall CertSaveStore(ptr long long long ptr long) @@ -190,6 +191,7 @@ @ stdcall CryptUnprotectMemory(ptr long long) @ stdcall CryptUnregisterDefaultOIDFunction(long str wstr) @ stdcall CryptUnregisterOIDFunction(long str str) +@ stdcall CertUnregisterSystemStore(ptr long) @ stub CryptUnregisterOIDInfo @ stdcall CryptVerifyCertificateSignature(long long ptr long ptr) @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index d5d7443..356712b 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1390,6 +1390,51 @@ BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } +BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, + PCERT_SYSTEM_STORE_INFO pStoreInfo, void *pvReserved) +{ + HCERTSTORE hstore; + + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG ) + { + FIXME("(%p, %08x, %p, %p): flag not supported\n", pvSystemStore, dwFlags, pStoreInfo, pvReserved); + return FALSE; + } + + TRACE("(%s, %08x, %p, %p)\n", debugstr_w(pvSystemStore), dwFlags, pStoreInfo, pvReserved); + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, dwFlags, pvSystemStore); + if (hstore) + { + CertCloseStore(hstore, 0); + return TRUE; + } + + return FALSE; +} + +BOOL WINAPI CertUnregisterSystemStore(void *pvSystemStore, DWORD dwFlags) +{ + HCERTSTORE hstore; + + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG) + { + FIXME("(%p, %08x): flag not supported\n", pvSystemStore, dwFlags); + return FALSE; + } + TRACE("(%s, %08x)\n", debugstr_w(pvSystemStore), dwFlags); + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, dwFlags | CERT_STORE_OPEN_EXISTING_FLAG, pvSystemStore); + if (hstore == NULL) + return FALSE; + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, dwFlags | CERT_STORE_DELETE_FLAG, pvSystemStore); + if (hstore == NULL && GetLastError() == 0) + return TRUE; + + return FALSE; +} + static void EmptyStore_addref(WINECRYPT_CERTSTORE *store) { TRACE("(%p)\n", store);

1 0

Jacek Caban : ntdll: Return NULL key on NtCreateKey failure.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: e891be17b23f9f8007aad75209776edb7cb065b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e891be17b23f9f8007aad7520… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 21:22:28 2016 +0200 ntdll: Return NULL key on NtCreateKey failure. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 8 +++----- dlls/ntdll/tests/reg.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index cb522ca..e151e91 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -71,11 +71,9 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT req->options = options; wine_server_add_data( req, objattr, len ); if (class) wine_server_add_data( req, class->Buffer, class->Length ); - if (!(ret = wine_server_call( req ))) - { - *retkey = wine_server_ptr_handle( reply->hkey ); - if (dispos) *dispos = reply->created ? REG_CREATED_NEW_KEY : REG_OPENED_EXISTING_KEY; - } + ret = wine_server_call( req ); + *retkey = wine_server_ptr_handle( reply->hkey ); + if (dispos && !ret) *dispos = reply->created ? REG_CREATED_NEW_KEY : REG_OPENED_EXISTING_KEY; } SERVER_END_REQ; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index c15d6a8..7d2e566 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -364,16 +364,22 @@ static void test_NtOpenKey(void) /* Zero accessmask */ attr.Length = sizeof(attr); + key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, 0, &attr); todo_wine ok(status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got: 0x%08x\n", status); +todo_wine + ok(!key, "key = %p\n", key); if (status == STATUS_SUCCESS) NtClose(key); /* Calling without parent key requres full registry path. */ pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); InitializeObjectAttributes(&attr, &str, 0, 0, 0); + key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); +todo_wine + ok(!key, "key = %p\n", key); pRtlFreeUnicodeString( &str ); /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ @@ -1070,8 +1076,10 @@ static void test_symlinks(void) /* try opening the target through the link */ attr.ObjectName = &link_str; + key = (HANDLE)0xdeadbeef; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status ); + ok( !key, "key = %p\n", key ); attr.ObjectName = &target_str; status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); @@ -1271,8 +1279,10 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS || status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status ); - status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, 0 ); + key = (HKEY)0xdeadbeef; + status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, NULL ); ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateKey failed: 0x%08x\n", status ); + ok( !key, "key = %p\n", key ); status = pNtDeleteKey( link ); ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );

1 0

Jacek Caban : advapi32: Pass options argument to NtOpenFileEx.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: 41c7d1e227b06ec5bb0a2a3af1963bb4830e6f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c7d1e227b06ec5bb0a2a3af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 21:22:36 2016 +0200 advapi32: Pass options argument to NtOpenFileEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 11be690..2d8e1bb 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -126,7 +126,7 @@ static HANDLE open_wow6432node( HANDLE key ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, wow6432nodeW ); - if (NtOpenKey( &ret, MAXIMUM_ALLOWED, &attr )) ret = 0; + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) ret = 0; return ret; } @@ -202,21 +202,24 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES return status; } -/* wrapper for NtOpenKey to handle Wow6432 nodes */ -static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) +/* wrapper for NtOpenKeyEx to handle Wow6432 nodes */ +static NTSTATUS open_key( HKEY *retkey, DWORD options, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) { NTSTATUS status; BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); HANDLE subkey, root = attr->RootDirectory; WCHAR *buffer = attr->ObjectName->Buffer; - DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); + DWORD pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); UNICODE_STRING str; - if (!force_wow32) return NtOpenKey( (HANDLE *)retkey, access, attr ); + if (!force_wow32) + { + if (options & REG_OPTION_OPEN_LINK) attr->Attributes |= OBJ_OPENLINK; + return NtOpenKeyEx( (HANDLE *)retkey, access, attr, options ); + } if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; - attrs = attr->Attributes; attr->ObjectName = &str; for (;;) @@ -235,13 +238,13 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a } if (i == len) { - attr->Attributes = attrs; - status = NtOpenKey( &subkey, access, attr ); + if (options & REG_OPTION_OPEN_LINK) attr->Attributes |= OBJ_OPENLINK; + status = NtOpenKeyEx( &subkey, access, attr, options ); } else { - attr->Attributes = attrs & ~OBJ_OPENLINK; - status = NtOpenKey( &subkey, access, attr ); + if (!(options & REG_OPTION_OPEN_LINK)) attr->Attributes &= ~OBJ_OPENLINK; + status = NtOpenKeyEx( &subkey, access, attr, options & ~REG_OPTION_OPEN_LINK ); } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; @@ -536,9 +539,8 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM acc attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitUnicodeString( &nameW, name ); - return RtlNtStatusToDosError( open_key( retkey, access, &attr ) ); + return RtlNtStatusToDosError( open_key( retkey, options, access, &attr ) ); } @@ -591,13 +593,12 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD op attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitAnsiString( &nameA, name ); if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, &nameA, FALSE ))) { - status = open_key( retkey, access, &attr ); + status = open_key( retkey, options, access, &attr ); } return RtlNtStatusToDosError( status ); }

1 0

Jacek Caban : advapi32: Initialize retkey value in open_key.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: 48aab01d652fdda3b45723d24a83fd88f6efff67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48aab01d652fdda3b45723d24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 21:22:45 2016 +0200 advapi32: Initialize retkey value in open_key. Office 2013 registry virtualization depends on this. Its NtOpenKey[Ex] hook doesn't set it to NULL, but it's expected to be NULL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 2d8e1bb..e32f48a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -212,6 +212,8 @@ static NTSTATUS open_key( HKEY *retkey, DWORD options, ACCESS_MASK access, OBJEC DWORD pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); UNICODE_STRING str; + *retkey = NULL; + if (!force_wow32) { if (options & REG_OPTION_OPEN_LINK) attr->Attributes |= OBJ_OPENLINK;

1 0

Sebastian Lackner : ntoskrnl.exe: Defer deallocation of in_buff in dispatch_ioctl.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: 5789b94f197894c314604b6dc31ce153d1526b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5789b94f197894c314604b6dc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:48:55 2016 +0200 ntoskrnl.exe: Defer deallocation of in_buff in dispatch_ioctl. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 428e700..3c18ee6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -417,6 +417,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG { IRP *irp; void *out_buff = NULL; + void *to_free = NULL; DEVICE_OBJECT *device; FILE_OBJECT *file = wine_server_get_ptr( params->ioctl.file ); @@ -435,7 +436,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG if ((params->ioctl.code & 3) == METHOD_BUFFERED) { memcpy( out_buff, in_buff, in_size ); - HeapFree( GetProcessHeap(), 0, in_buff ); + to_free = in_buff; in_buff = out_buff; } } @@ -455,6 +456,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, to_free ); return STATUS_SUCCESS; }

1 0

Sebastian Lackner : ntoskrnl.exe: Add support for METHOD_IN_DIRECT/ METHOD_OUT_DIRECT ioctls.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: eb7ac554d1b857cc64ed9bc12e430bb26efa592b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7ac554d1b857cc64ed9bc12… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:51:06 2016 +0200 ntoskrnl.exe: Add support for METHOD_IN_DIRECT/METHOD_OUT_DIRECT ioctls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7fbde50..cefc1dd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1561,6 +1561,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, req->async.event = wine_server_obj_handle( event ); req->async.cvalue = cvalue; wine_server_add_data( req, in_buffer, in_size ); + if ((code & 3) != METHOD_BUFFERED) + wine_server_add_data( req, out_buffer, out_size ); wine_server_set_reply( req, out_buffer, out_size ); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3c18ee6..912d084 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -428,17 +428,27 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG TRACE( "ioctl %x device %p file %p in_size %u out_size %u\n", params->ioctl.code, device, file, in_size, out_size ); - if ((params->ioctl.code & 3) == METHOD_BUFFERED) out_size = max( in_size, out_size ); - if (out_size) { - if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; - if ((params->ioctl.code & 3) == METHOD_BUFFERED) + if ((params->ioctl.code & 3) != METHOD_BUFFERED) + { + if (in_size < out_size) return STATUS_INVALID_DEVICE_REQUEST; + in_size -= out_size; + if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; + memcpy( out_buff, (char *)in_buff + in_size, out_size ); + } + else if (out_size > in_size) { + if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; memcpy( out_buff, in_buff, in_size ); to_free = in_buff; in_buff = out_buff; } + else + { + out_buff = in_buff; + out_size = in_size; + } } irp = IoBuildDeviceIoControlRequest( params->ioctl.code, device, in_buff, in_size, out_buff, out_size, @@ -449,6 +459,9 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG return STATUS_NO_MEMORY; } + if (out_size && (params->ioctl.code & 3) != METHOD_BUFFERED) + HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, in_buff, in_size ); + irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = in_buff;

1 0

Sebastian Lackner : ntoskrnl.exe: Use MmInitializeMdl in IoAllocateMdl.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: 9912ef778fd0435fab9fc0d0c85ebe92dec51345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9912ef778fd0435fab9fc0d0c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:53:29 2016 +0200 ntoskrnl.exe: Use MmInitializeMdl in IoAllocateMdl. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 ++++--------------- include/ddk/wdm.h | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 912d084..eac81f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -744,31 +744,20 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) */ PMDL WINAPI IoAllocateMdl( PVOID va, ULONG length, BOOLEAN secondary, BOOLEAN charge_quota, IRP *irp ) { + SIZE_T mdl_size; PMDL mdl; - ULONG_PTR address = (ULONG_PTR)va; - ULONG_PTR page_address; - SIZE_T nb_pages, mdl_size; TRACE("(%p, %u, %i, %i, %p)\n", va, length, secondary, charge_quota, irp); if (charge_quota) FIXME("Charge quota is not yet supported\n"); - /* FIXME: We suppose that page size is 4096 */ - page_address = address & ~(4096 - 1); - nb_pages = (((address + length - 1) & ~(4096 - 1)) - page_address) / 4096 + 1; - - mdl_size = sizeof(MDL) + nb_pages * sizeof(PVOID); - - mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size); + mdl_size = sizeof(MDL) + sizeof(PFN_NUMBER) * ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length); + mdl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size ); if (!mdl) return NULL; - mdl->Size = mdl_size; - mdl->Process = NULL; /* FIXME: IoGetCurrentProcess */ - mdl->StartVa = (PVOID)page_address; - mdl->ByteCount = length; - mdl->ByteOffset = address - page_address; + MmInitializeMdl( mdl, va, length ); if (!irp) return mdl; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3e93469..3829e8b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -28,6 +28,16 @@ #define POINTER_ALIGNMENT #endif +/* FIXME: We suppose that page size is 4096 */ +#undef PAGE_SIZE +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12 + +#define BYTE_OFFSET(va) ((ULONG)((ULONG_PTR)(va) & (PAGE_SIZE - 1))) +#define PAGE_ALIGN(va) ((PVOID)((ULONG_PTR)(va) & ~(PAGE_SIZE - 1))) +#define ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length) \ + ((BYTE_OFFSET(va) + ((SIZE_T)(length)) + (PAGE_SIZE - 1)) >> PAGE_SHIFT) + typedef LONG KPRIORITY; typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; @@ -1035,6 +1045,17 @@ typedef struct _MDL { } MDL, *PMDL; typedef MDL *PMDLX; +typedef ULONG PFN_NUMBER, *PPFN_NUMBER; + +static inline void MmInitializeMdl(MDL *mdl, void *va, SIZE_T length) +{ + mdl->Next = NULL; + mdl->Size = sizeof(MDL) + sizeof(PFN_NUMBER) * ADDRESS_AND_SIZE_TO_SPAN_PAGES(va, length); + mdl->MdlFlags = 0; + mdl->StartVa = (void *)PAGE_ALIGN(va); + mdl->ByteOffset = BYTE_OFFSET(va); + mdl->ByteCount = length; +} typedef struct _KTIMER { DISPATCHER_HEADER Header;

1 0