July 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Implement NtQueryInformationToken(TokenSessionId).
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: eb69da2a9cbbc4f9893ca6ae43420c71f9b63571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb69da2a9cbbc4f9893ca6ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 16:22:26 2021 +0200 ntdll: Implement NtQueryInformationToken(TokenSessionId). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46595 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 7 +++++-- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 11 ++++++----- server/token.c | 1 + server/trace.c | 1 + 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 6a088e84e4d..b998750d798 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -418,10 +418,13 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c break; case TokenSessionId: + SERVER_START_REQ( get_token_info ) { - *(DWORD *)info = 0; - FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); + req->handle = wine_server_obj_handle( token ); + status = wine_server_call( req ); + if (!status) *(DWORD *)info = reply->session_id; } + SERVER_END_REQ; break; case TokenVirtualizationEnabled: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d6815b7e349..867f99a7627 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4913,12 +4913,12 @@ struct get_token_info_reply struct reply_header __header; luid_t token_id; luid_t modified_id; + unsigned int session_id; int primary; int impersonation_level; int elevation; int group_count; int privilege_count; - char __pad_44[4]; }; @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 723 +#define SERVER_PROTOCOL_VERSION 724 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 8eb7e3e99ca..10402ca2db3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3432,6 +3432,7 @@ struct handle_info @REPLY luid_t token_id; /* locally-unique identifier of the token */ luid_t modified_id; /* locally-unique identifier of the modified version of the token */ + unsigned int session_id; /* token session id */ int primary; /* is the token primary or impersonation? */ int impersonation_level; /* level of impersonation */ int elevation; /* elevation type */ diff --git a/server/request.h b/server/request.h index 19e5a2a84f1..a5490fd215a 100644 --- a/server/request.h +++ b/server/request.h @@ -2088,11 +2088,12 @@ C_ASSERT( FIELD_OFFSET(struct get_token_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_token_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, token_id) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, modified_id) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, primary) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, impersonation_level) == 28 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, elevation) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, group_count) == 36 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, privilege_count) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, session_id) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, primary) == 28 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, impersonation_level) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, elevation) == 36 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, group_count) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, privilege_count) == 44 ); C_ASSERT( sizeof(struct get_token_info_reply) == 48 ); C_ASSERT( FIELD_OFFSET(struct create_linked_token_request, handle) == 12 ); C_ASSERT( sizeof(struct create_linked_token_request) == 16 ); diff --git a/server/token.c b/server/token.c index 9c72c2a6bed..5d2fc9555a2 100644 --- a/server/token.c +++ b/server/token.c @@ -1601,6 +1601,7 @@ DECL_HANDLER(get_token_info) { reply->token_id = token->token_id; reply->modified_id = token->modified_id; + reply->session_id = token->session_id; reply->primary = token->primary; reply->impersonation_level = token->impersonation_level; reply->elevation = token->elevation; diff --git a/server/trace.c b/server/trace.c index f27cc47170b..c65694ad644 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4251,6 +4251,7 @@ static void dump_get_token_info_reply( const struct get_token_info_reply *req ) { dump_luid( " token_id=", &req->token_id ); dump_luid( ", modified_id=", &req->modified_id ); + fprintf( stderr, ", session_id=%08x", req->session_id ); fprintf( stderr, ", primary=%d", req->primary ); fprintf( stderr, ", impersonation_level=%d", req->impersonation_level ); fprintf( stderr, ", elevation=%d", req->elevation );

1 0

Hugh McMaster : reg/tests: Don't verify key deletion after calling delete_tree().
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 3186a0046336e82a2e8133f8a5958e6250c6fe61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3186a0046336e82a2e8133f8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 1 23:22:48 2021 +1000 reg/tests: Don't verify key deletion after calling delete_tree(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 1 - programs/reg/tests/copy.c | 27 --------------------------- programs/reg/tests/delete.c | 9 --------- programs/reg/tests/export.c | 1 - programs/reg/tests/import.c | 4 ---- programs/reg/tests/query.c | 1 - 6 files changed, 43 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 469f354de39..2c1a2cf35e3 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -226,7 +226,6 @@ static void test_command_syntax(void) DWORD r; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg add", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index c6a83e57276..e9542a67f5e 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -127,10 +127,7 @@ static void test_copy_empty_key(void) DWORD r; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, NULL); @@ -192,10 +189,7 @@ static void test_copy_simple_data(void) DWORD r, dword; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -262,10 +256,7 @@ static void test_copy_complex_data(void) DWORD r, dword; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -331,10 +322,7 @@ static void test_copy_key_order(void) DWORD r; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); add_key(hkey, "Subkey2", 0, NULL); @@ -356,10 +344,7 @@ static void test_copy_value_order(void) DWORD r; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); add_value(hkey, "Value 2", REG_SZ, "I was added first!", 19); @@ -381,10 +366,7 @@ static void test_copy_hex_data(void) DWORD r; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Try copying empty hex values */ add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -450,10 +432,7 @@ static void test_copy_embedded_null_values(void) DWORD r; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" COPY_SRC "]\n" @@ -483,10 +462,7 @@ static void test_copy_slashes(void) DWORD r; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); add_key(hkey, "https://winehq.org", 0, NULL); @@ -509,10 +485,7 @@ static void test_copy_escaped_null_values(void) DWORD r; delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); - verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); add_value(hkey, "Wine5a", REG_SZ, "\\0", 3); diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index 0c313c12a31..2bc1abadfcb 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -24,7 +24,6 @@ static void test_command_syntax(void) DWORD r; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg delete", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -85,7 +84,6 @@ static void test_delete(void) const DWORD deadbeef = 0xdeadbeef; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -184,7 +182,6 @@ static void test_registry_view_win32(void) if (!is_win32) return; delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); - verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); /* Test deletion from the 32-bit registry view (32-bit Windows) */ create_test_key(KEY_WOW64_32KEY); @@ -257,10 +254,7 @@ static void test_registry_view_win64(void) if (!is_win64) return; delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); - verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); - delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); - verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); /* Test deletion from the 32-bit registry view (64-bit Windows) */ create_test_key(KEY_WOW64_32KEY); @@ -336,10 +330,7 @@ static void test_registry_view_wow64(void) if (!is_wow64) return; delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); - verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); - delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); - verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); /* Test deletion from the 32-bit registry view (WOW64) */ create_test_key(KEY_WOW64_32KEY); diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 0f48443384e..e32f750079e 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -177,7 +177,6 @@ static void test_export(void) BYTE hex[4], buffer[8]; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg export", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 2531ba336e8..ace45cf5984 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -102,7 +102,6 @@ static void test_import(void) BYTE hex[8]; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg import", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -1655,7 +1654,6 @@ static void test_unicode_import(void) BYTE hex[8]; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, @@ -3201,7 +3199,6 @@ static void test_import_with_whitespace(void) DWORD r, dword; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); @@ -3347,7 +3344,6 @@ static void test_unicode_import_with_whitespace(void) DWORD r, dword; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 590d322c37c..eca392b64d9 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -204,7 +204,6 @@ static void test_query(void) BYTE buf[512]; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Key not present */ run_reg_exe("reg query HKCU\\" KEY_BASE, &r);

1 0

Henri Verbeet : dxgi/tests: Add a test for swapchain present counts.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 7eadbae52c9d287524acbe61121939d536a4026a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eadbae52c9d287524acbe61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 1 16:56:30 2021 +0200 dxgi/tests: Add a test for swapchain present counts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 0d3caa61783..75dbf56f995 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -908,6 +908,38 @@ static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d return adapter; } +#define create_swapchain(a, b, c) create_swapchain_(__LINE__, a, b, c) +static IDXGISwapChain *create_swapchain_(unsigned int line, IUnknown *device, BOOL is_d3d12, HWND window) +{ + DXGI_SWAP_CHAIN_DESC desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + HRESULT hr; + + desc.BufferDesc.Width = 640; + desc.BufferDesc.Height = 480; + desc.BufferDesc.RefreshRate.Numerator = 60; + desc.BufferDesc.RefreshRate.Denominator = 1; + desc.BufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc.BufferCount = is_d3d12 ? 2 : 1; + desc.OutputWindow = window; + desc.Windowed = TRUE; + desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + desc.Flags = 0; + + get_factory(device, is_d3d12, &factory); + hr = IDXGIFactory_CreateSwapChain(factory, device, &desc, &swapchain); + ok_(__FILE__, line)(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + IDXGIFactory_Release(factory); + + return swapchain; +} + static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -7432,6 +7464,63 @@ done: heap_free(original_modes); } +static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) +{ + UINT present_count, expected; + IDXGISwapChain *swapchain; + HWND window; + HRESULT hr; + + window = create_window(); + swapchain = create_swapchain(device, is_d3d12, window); + + present_count = ~0u; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!present_count, "Got unexpected present count %u.\n", present_count); + + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count + 1; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + hr = IDXGISwapChain_Present(swapchain, 10, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + expected = present_count; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + ShowWindow(window, SW_MINIMIZE); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); + expected = present_count + !!is_d3d12; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + ShowWindow(window, SW_NORMAL); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count + 1; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + IDXGISwapChain_Release(swapchain); + DestroyWindow(window); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -7549,6 +7638,7 @@ START_TEST(dxgi) run_on_d3d10(test_window_association); run_on_d3d10(test_default_fullscreen_target_output); run_on_d3d10(test_mode_change); + run_on_d3d10(test_swapchain_present_count); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7579,6 +7669,7 @@ START_TEST(dxgi) run_on_d3d12(test_window_association); run_on_d3d12(test_default_fullscreen_target_output); run_on_d3d12(test_mode_change); + run_on_d3d12(test_swapchain_present_count); FreeLibrary(d3d12_module); }

1 0

Henri Verbeet : dxgi: Implement d3d11_swapchain_GetLastPresentCount().
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 6f674ef6f137afe719f5cf049c60f4303bee205e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f674ef6f137afe719f5cf04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 1 16:56:31 2021 +0200 dxgi: Implement d3d11_swapchain_GetLastPresentCount(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 14 +++++++++++--- dlls/dxgi/tests/dxgi.c | 20 +++++++++++--------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 34e53af2138..b3cd1164b90 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -182,6 +182,7 @@ struct d3d11_swapchain IWineDXGIFactory *factory; IDXGIOutput *target; + LONG present_count; }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5b3ca5b5762..a2a85f75bac 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -328,6 +328,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDevice(IDXGISwapChain1 *ifac static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, unsigned int sync_interval, unsigned int flags) { + HRESULT hr; + if (sync_interval > 4) { WARN("Invalid sync interval %u.\n", sync_interval); @@ -345,7 +347,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return S_OK; } - return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); + if (SUCCEEDED(hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0))) + InterlockedIncrement(&swapchain->present_count); + return hr; } static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) @@ -599,9 +603,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapCha static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetLastPresentCount(IDXGISwapChain1 *iface, UINT *last_present_count) { - FIXME("iface %p, last_present_count %p stub!\n", iface, last_present_count); + struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - return E_NOTIMPL; + TRACE("iface %p, last_present_count %p.\n", iface, last_present_count); + + *last_present_count = swapchain->present_count; + + return S_OK; } /* IDXGISwapChain1 methods */ diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 75dbf56f995..1e5f9d9cb22 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7476,28 +7476,29 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) present_count = ~0u; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!present_count, "Got unexpected present count %u.\n", present_count); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(!present_count, "Got unexpected present count %u.\n", present_count); hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 10, 0); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_MINIMIZE); @@ -7505,7 +7506,7 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); expected = present_count + !!is_d3d12; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); todo_wine_if(is_d3d12) ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); @@ -7514,8 +7515,9 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); IDXGISwapChain_Release(swapchain); DestroyWindow(window);

1 0

Rémi Bernon : wineusb.sys: Handle IRP_MN_SURPRISE_REMOVAL and set removed flag.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 84c9206ca75a71622d061c63215230dd37673761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84c9206ca75a71622d061c63… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 1 09:51:23 2021 +0200 wineusb.sys: Handle IRP_MN_SURPRISE_REMOVAL and set removed flag. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 8fb1d75f121..a72095409ff 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -145,7 +145,6 @@ static void remove_usb_device(libusb_device *libusb_device) if (device->libusb_device == libusb_device) { list_remove(&device->entry); - device->removed = TRUE; break; } } @@ -402,26 +401,24 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) } case IRP_MN_START_DEVICE: - case IRP_MN_SURPRISE_REMOVAL: ret = STATUS_SUCCESS; break; - case IRP_MN_REMOVE_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: EnterCriticalSection(&wineusb_cs); remove_pending_irps(device); + device->removed = TRUE; LeaveCriticalSection(&wineusb_cs); + ret = STATUS_SUCCESS; + break; - if (device->removed) - { - libusb_unref_device(device->libusb_device); - libusb_close(device->handle); + case IRP_MN_REMOVE_DEVICE: + remove_pending_irps(device); - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); - IoDeleteDevice(device->device_obj); - return STATUS_SUCCESS; - } + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + IoDeleteDevice(device->device_obj); ret = STATUS_SUCCESS; break;

1 0

Huw Davies : nsiproxy: Implement NDIS ifinfo get_parameter for a few parameters.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: f5238be33012c31af8a7c40023ec65c82e7a1456 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5238be33012c31af8a7c400… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:08 2021 +0100 nsiproxy: Implement NDIS ifinfo get_parameter for a few parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 13 +++++++-- dlls/nsiproxy.sys/ndis.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 207d3941c0d..d7f6ac9c739 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -113,9 +113,7 @@ static void test_nsi_api( void ) err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); -todo_wine ok( !err, "got %d\n", err ); - if (err) continue; ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); @@ -362,12 +360,23 @@ static void test_ndis_ifinfo( void ) ok( !err, "got %d\n", err ); ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &stat_get.if_guid, sizeof(stat_get.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + luid_get.Value = ~0u; err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), &rw_get, rw_size, &dyn_get, sizeof(dyn_get), &stat_get, sizeof(stat_get) ); ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), + NSI_PARAM_TYPE_STATIC, &stat_get.if_guid, sizeof(stat_get.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); + FreeMibTable( table ); NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 8e5eccbbf23..647fd650cd3 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -515,6 +515,75 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void return status; } +static NTSTATUS ifinfo_get_rw_parameter( struct if_entry *entry, void *data, DWORD data_size, DWORD data_offset ) +{ + switch (data_offset) + { + case FIELD_OFFSET( struct nsi_ndis_ifinfo_rw, alias ): + { + IF_COUNTED_STRING *str = (IF_COUNTED_STRING *)data; + if (data_size != sizeof(*str)) return STATUS_INVALID_PARAMETER; + if_counted_string_init( str, entry->if_name ); + return STATUS_SUCCESS; + } + default: + FIXME( "Offset %#x not handled\n", data_offset ); + } + + return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS ifinfo_get_static_parameter( struct if_entry *entry, void *data, DWORD data_size, DWORD data_offset ) +{ + switch (data_offset) + { + case FIELD_OFFSET( struct nsi_ndis_ifinfo_static, if_index ): + if (data_size != sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + *(DWORD *)data = entry->if_index; + return STATUS_SUCCESS; + + case FIELD_OFFSET( struct nsi_ndis_ifinfo_static, if_guid ): + if (data_size != sizeof(GUID)) return STATUS_INVALID_PARAMETER; + *(GUID *)data = entry->if_guid; + return STATUS_SUCCESS; + + default: + FIXME( "Offset %#x not handled\n", data_offset ); + } + return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_luid( (const NET_LUID *)key ); + if (entry) + { + switch (param_type) + { + case NSI_PARAM_TYPE_RW: + status = ifinfo_get_rw_parameter( entry, data, data_size, data_offset ); + break; + case NSI_PARAM_TYPE_STATIC: + status = ifinfo_get_static_parameter( entry, data, data_size, data_offset ); + break; + } + } + + LeaveCriticalSection( &if_list_cs ); + + return status; +} + static const struct module_table tables[] = { { @@ -525,6 +594,7 @@ static const struct module_table tables[] = }, ifinfo_enumerate_all, ifinfo_get_all_parameters, + ifinfo_get_parameter }, { ~0u } };

1 0

Jacek Caban : include: Add ntgdi.h file.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 0cfbeb5520c9de0381b2f727120adcdb9b5f0d94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cfbeb5520c9de0381b2f727… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 30 17:37:41 2021 +0200 include: Add ntgdi.h file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ntgdi.h | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0cfbeb5520c9de0381b2…

1 0

Alexandre Julliard : ntdll: Add a helper function to retrieve the CPU area context on the Unix side.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: bedfb31d7cfe0f1683e142ab6b0c1575cfc4c933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bedfb31d7cfe0f1683e142ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 11:16:27 2021 +0200 ntdll: Add a helper function to retrieve the CPU area context on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 6 +----- dlls/ntdll/unix/signal_i386.c | 6 +----- dlls/ntdll/unix/thread.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index e3ad240c718..a86805b113c 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -921,11 +921,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.Sp = (DWORD)teb->Tib.StackBase; context.Pc = (DWORD)pRtlUserThreadStart; if (context.Pc & 1) context.Cpsr |= 0x20; /* thumb mode */ - if (NtCurrentTeb64()) - { - WOW64_CPURESERVED *cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); - memcpy( cpu + 1, &context, sizeof(context) ); - } + if ((ctx = get_cpu_area( IMAGE_FILE_MACHINE_ARMNT ))) *ctx = context; if (suspend) wait_suspend( &context ); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1560251e3a1..72aff4614ca 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2337,11 +2337,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.FloatSave.ControlWord = 0x27f; ((XSAVE_FORMAT *)context.ExtendedRegisters)->ControlWord = 0x27f; ((XSAVE_FORMAT *)context.ExtendedRegisters)->MxCsr = 0x1f80; - if (NtCurrentTeb64()) - { - WOW64_CPURESERVED *cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); - memcpy( cpu + 1, &context, sizeof(context) ); - } + if ((ctx = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) *ctx = context; if (suspend) wait_suspend( &context ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 05c412620f6..4383a4779be 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1097,6 +1097,35 @@ static SIZE_T get_machine_context_size( USHORT machine ) } +/*********************************************************************** + * get_cpu_area + * + * cf. RtlWow64GetCurrentCpuArea + */ +void *get_cpu_area( USHORT machine ) +{ + WOW64_CPURESERVED *cpu; + ULONG align; + + if (!NtCurrentTeb()->WowTebOffset) return NULL; +#ifdef _WIN64 + cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; +#else + cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); +#endif + if (cpu->Machine != machine) return NULL; + switch (cpu->Machine) + { + case IMAGE_FILE_MACHINE_I386: align = TYPE_ALIGNMENT(I386_CONTEXT); break; + case IMAGE_FILE_MACHINE_AMD64: align = TYPE_ALIGNMENT(ARM_CONTEXT); break; + case IMAGE_FILE_MACHINE_ARMNT: align = TYPE_ALIGNMENT(AMD64_CONTEXT); break; + case IMAGE_FILE_MACHINE_ARM64: align = TYPE_ALIGNMENT(ARM64_NT_CONTEXT); break; + default: return NULL; + } + return (void *)(((ULONG_PTR)(cpu + 1) + align - 1) & ~(align - 1)); +} + + /*********************************************************************** * set_thread_id */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 20b78e2a266..3ab546eb254 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -181,6 +181,7 @@ extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux ) DECLSPEC_HIDDEN; extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu ) DECLSPEC_HIDDEN; +extern void *get_cpu_area( USHORT machine ) DECLSPEC_HIDDEN; extern void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) DECLSPEC_HIDDEN; extern NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Initialize the Wow64 context on x86-64.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 4acecd8619219b750fa5f2d0d233cd246fe498fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4acecd8619219b750fa5f2d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 11:46:05 2021 +0200 ntdll: Initialize the Wow64 context on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5901d9cf867..f9e82d72190 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -362,6 +362,9 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) context->ContextFlags |= CONTEXT_XSTATE; } +static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ +static USHORT cs64_sel; /* selector for %cs in 64-bit mode */ +static USHORT ds64_sel; /* selector for %ds/%es/%ss in 64-bit mode */ /*********************************************************************** * Definitions for Dwarf unwind tables @@ -2479,6 +2482,8 @@ NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_E */ void signal_init_threading(void) { + __asm__( "movw %%cs,%0" : "=m" (cs64_sel) ); + __asm__( "movw %%ss,%0" : "=m" (ds64_sel) ); } @@ -2607,6 +2612,13 @@ void signal_init_process(void) if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) __wine_syscall_flags |= SYSCALL_HAVE_XSAVE; if (xstate_compaction_enabled) __wine_syscall_flags |= SYSCALL_HAVE_XSAVEC; +#ifdef __linux__ + if (NtCurrentTeb()->WowTebOffset) + { + cs32_sel = 0x23; + } +#endif + sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK; @@ -2642,17 +2654,39 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B struct amd64_thread_data *thread_data = (struct amd64_thread_data *)&teb->GdiTebBatch; struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { 0 }; + I386_CONTEXT *wow_context; context.ContextFlags = CONTEXT_ALL; context.Rcx = (ULONG_PTR)entry; context.Rdx = (ULONG_PTR)arg; context.Rsp = (ULONG_PTR)teb->Tib.StackBase - 0x28; context.Rip = (ULONG_PTR)pRtlUserThreadStart; + context.SegCs = cs64_sel; + context.SegDs = ds64_sel; + context.SegEs = ds64_sel; + context.SegGs = ds64_sel; + context.SegSs = ds64_sel; context.EFlags = 0x200; context.u.FltSave.ControlWord = 0x27f; context.u.FltSave.MxCsr = context.MxCsr = 0x1f80; - __asm__( "movw %%cs,%0" : "=m" (context.SegCs) ); - __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); + + if ((wow_context = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) + { + wow_context->ContextFlags = CONTEXT_I386_ALL; + wow_context->Eax = (ULONG_PTR)entry; + wow_context->Ebx = (ULONG_PTR)arg; + wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; + wow_context->Eip = (ULONG_PTR)pRtlUserThreadStart; + wow_context->SegCs = cs32_sel; + wow_context->SegDs = context.SegDs; + wow_context->SegEs = context.SegEs; + wow_context->SegFs = context.SegFs; + wow_context->SegGs = context.SegGs; + wow_context->SegSs = context.SegSs; + wow_context->EFlags = 0x202; + wow_context->FloatSave.ControlWord = context.u.FltSave.ControlWord; + *(XSAVE_FORMAT *)wow_context->ExtendedRegisters = context.u.FltSave; + } if (suspend) wait_suspend( &context );

1 0

Alexandre Julliard : ntdll: Use the CPU area to get/set the Wow64 context on x86-64.
by Alexandre Julliard July 1, 2021

July 1, 2021

Module: wine Branch: master Commit: 11d6c52f32e4ac31414f1b8580606e61c738c452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d6c52f32e4ac31414f1b85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 12:17:29 2021 +0200 ntdll: Use the CPU area to get/set the Wow64 context on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 184 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 179 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index f9e82d72190..56dc640e082 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1614,7 +1614,8 @@ void *get_native_context( CONTEXT *context ) */ void *get_wow_context( CONTEXT *context ) { - return NULL; + if (context->SegCs != cs64_sel) return NULL; + return get_cpu_area( IMAGE_FILE_MACHINE_I386 ); } @@ -1851,10 +1852,97 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) */ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { - BOOL self; + BOOL self = (handle == GetCurrentThread()); + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + I386_CONTEXT *wow_frame; + const I386_CONTEXT *context = ctx; + DWORD flags = context->ContextFlags & ~CONTEXT_i386; if (size != sizeof(I386_CONTEXT)) return STATUS_INFO_LENGTH_MISMATCH; - return set_thread_context( handle, ctx, &self, IMAGE_FILE_MACHINE_I386 ); + + /* debug registers require a server call */ + if (self && (flags & CONTEXT_I386_DEBUG_REGISTERS)) + self = (amd64_thread_data()->dr0 == context->Dr0 && + amd64_thread_data()->dr1 == context->Dr1 && + amd64_thread_data()->dr2 == context->Dr2 && + amd64_thread_data()->dr3 == context->Dr3 && + amd64_thread_data()->dr6 == context->Dr6 && + amd64_thread_data()->dr7 == context->Dr7); + + if (!self) + { + NTSTATUS ret = set_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_I386 ); + if (ret || !self) return ret; + if (flags & CONTEXT_I386_DEBUG_REGISTERS) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } + if (!(flags & ~CONTEXT_I386_DEBUG_REGISTERS)) return ret; + } + + if (!(wow_frame = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) return STATUS_INVALID_PARAMETER; + + if (flags & CONTEXT_I386_INTEGER) + { + wow_frame->Eax = context->Eax; + wow_frame->Ebx = context->Ebx; + wow_frame->Ecx = context->Ecx; + wow_frame->Edx = context->Edx; + wow_frame->Esi = context->Esi; + wow_frame->Edi = context->Edi; + } + if (flags & CONTEXT_I386_CONTROL) + { + wow_frame->Esp = context->Esp; + wow_frame->Ebp = context->Ebp; + wow_frame->Eip = context->Eip; + wow_frame->EFlags = context->EFlags; + wow_frame->SegCs = cs32_sel; + wow_frame->SegSs = ds64_sel; + } + if (flags & CONTEXT_I386_SEGMENTS) + { + wow_frame->SegDs = ds64_sel; + wow_frame->SegEs = ds64_sel; + wow_frame->SegFs = 0; /* FIXME */ + wow_frame->SegGs = ds64_sel; + } + if (flags & CONTEXT_I386_DEBUG_REGISTERS) + { + wow_frame->Dr0 = context->Dr0; + wow_frame->Dr1 = context->Dr1; + wow_frame->Dr2 = context->Dr2; + wow_frame->Dr3 = context->Dr3; + wow_frame->Dr6 = context->Dr6; + wow_frame->Dr7 = context->Dr7; + } + if (flags & CONTEXT_I386_EXTENDED_REGISTERS) + { + memcpy( &frame->xsave, context->ExtendedRegisters, sizeof(frame->xsave) ); + } + else if (flags & CONTEXT_I386_FLOATING_POINT) + { + fpu_to_fpux( &frame->xsave, &context->FloatSave ); + } + if (flags & CONTEXT_I386_XSTATE) + { + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); + + if (xs->Mask & XSTATE_MASK_GSSE) + { + frame->xstate.Mask |= XSTATE_MASK_GSSE; + memcpy( &frame->xstate.YmmContext, &xs->YmmContext, sizeof(xs->YmmContext) ); + } + else frame->xstate.Mask &= ~XSTATE_MASK_GSSE; + frame->restore_flags |= CONTEXT_I386_XSTATE; + } + return STATUS_SUCCESS; } @@ -1863,10 +1951,96 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) */ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) { - BOOL self; + DWORD needed_flags; + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + I386_CONTEXT *wow_frame, *context = ctx; + BOOL self = (handle == GetCurrentThread()); if (size != sizeof(I386_CONTEXT)) return STATUS_INFO_LENGTH_MISMATCH; - return get_thread_context( handle, ctx, &self, IMAGE_FILE_MACHINE_I386 ); + + needed_flags = context->ContextFlags & ~CONTEXT_i386; + + /* debug registers require a server call */ + if (needed_flags & CONTEXT_I386_DEBUG_REGISTERS) self = FALSE; + + if (!self) + { + NTSTATUS ret = get_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_I386 ); + if (ret || !self) return ret; + /* update the cached version of the debug registers */ + if (needed_flags & CONTEXT_I386_DEBUG_REGISTERS) + { + amd64_thread_data()->dr0 = context->Dr0; + amd64_thread_data()->dr1 = context->Dr1; + amd64_thread_data()->dr2 = context->Dr2; + amd64_thread_data()->dr3 = context->Dr3; + amd64_thread_data()->dr6 = context->Dr6; + amd64_thread_data()->dr7 = context->Dr7; + } + if (!(needed_flags & ~CONTEXT_I386_DEBUG_REGISTERS)) return ret; + } + + if (!(wow_frame = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) return STATUS_INVALID_PARAMETER; + + if (needed_flags & CONTEXT_I386_INTEGER) + { + context->Eax = wow_frame->Eax; + context->Ebx = wow_frame->Ebx; + context->Ecx = wow_frame->Ecx; + context->Edx = wow_frame->Edx; + context->Esi = wow_frame->Esi; + context->Edi = wow_frame->Edi; + context->ContextFlags |= CONTEXT_I386_INTEGER; + } + if (needed_flags & CONTEXT_I386_CONTROL) + { + context->Esp = wow_frame->Esp; + context->Ebp = wow_frame->Ebp; + context->Eip = wow_frame->Eip; + context->EFlags = wow_frame->EFlags; + context->SegCs = wow_frame->SegCs; + context->SegSs = wow_frame->SegSs; + context->ContextFlags |= CONTEXT_I386_CONTROL; + } + if (needed_flags & CONTEXT_I386_SEGMENTS) + { + context->SegDs = wow_frame->SegDs; + context->SegEs = wow_frame->SegEs; + context->SegFs = wow_frame->SegFs; + context->SegGs = wow_frame->SegGs; + context->ContextFlags |= CONTEXT_I386_SEGMENTS; + } + if (needed_flags & CONTEXT_I386_EXTENDED_REGISTERS) + { + memcpy( context->ExtendedRegisters, &frame->xsave, sizeof(context->ExtendedRegisters) ); + context->ContextFlags |= CONTEXT_I386_EXTENDED_REGISTERS; + } + if (needed_flags & CONTEXT_I386_FLOATING_POINT) + { + fpux_to_fpu( &context->FloatSave, &frame->xsave ); + context->ContextFlags |= CONTEXT_I386_FLOATING_POINT; + } + if ((needed_flags & CONTEXT_I386_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) + { + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xstate = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); + unsigned int mask; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) || + context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; + xstate->Mask = frame->xstate.Mask & mask; + xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; + memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); + if (xstate->Mask) + { + if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; + memcpy( &xstate->YmmContext, &frame->xstate.YmmContext, sizeof(xstate->YmmContext) ); + } + } + return STATUS_SUCCESS; }

1 0