October 2020 - Wine-Devel - list.winehq.org

[PATCH v5] user32: Implement GetMouseMovePointsEx().
by Arkadiusz Hiler Oct. 3, 2020

Oct. 3, 2020

With this patch we start storing history of last 64 mouse positions on the server side which can be retrieved by the newly introduced get_cursor_history request. GetMouseMovePointsEx() is implemented on top of that. The cursor position history is shared between all the desktops within the same window station. Non-default window stations are non-interactive, i.e. they don't support input - SetCursorPos(), GetMouseMovePointsEx(), etc. are failing there with ERROR_ACCESS_DENIED. This aspect remains unimplemented and the related tests are marked with todo_wine. The only way to have multiple interactive window stations for a single user in Windows seems to be a remote desktop session. Testing with multiple desktops / winstations is done in a separate process as SetThreadDesktop() is very brittle on Windows, e.g. it tends to fail if the process has ever created a window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36873 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/user32/input.c | 58 +++++++++-- dlls/user32/tests/input.c | 198 +++++++++++++++++++++++++++++++++++++- server/protocol.def | 15 +++ server/queue.c | 39 ++++++++ server/trace.c | 25 +++++ 5 files changed, 325 insertions(+), 10 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 3425a2ea10f..e06f8b4413e 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1267,22 +1267,64 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) * Success: count of point set in the buffer * Failure: -1 */ -int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOINT ptout, int count, DWORD res) { +int WINAPI GetMouseMovePointsEx( UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOINT ptout, int count, DWORD resolution ) +{ + cursor_pos_t *pos, positions[64]; + int copied; + unsigned int i; - if((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > 64)) { - SetLastError(ERROR_INVALID_PARAMETER); + + TRACE( "%d, %p, %p, %d, %d\n", size, ptin, ptout, count, resolution ); + + if ((size != sizeof(MOUSEMOVEPOINT)) || (count < 0) || (count > ARRAY_SIZE( positions ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); return -1; } - if(!ptin || (!ptout && count)) { - SetLastError(ERROR_NOACCESS); + if (!ptin || (!ptout && count)) + { + SetLastError( ERROR_NOACCESS ); return -1; } - FIXME("(%d %p %p %d %d) stub\n", size, ptin, ptout, count, res); + if (resolution != GMMP_USE_DISPLAY_POINTS) + { + FIXME( "only GMMP_USE_DISPLAY_POINTS is supported for now\n" ); + SetLastError( ERROR_POINT_NOT_FOUND ); + return -1; + } + + SERVER_START_REQ( get_cursor_history ) + { + wine_server_set_reply( req, &positions, sizeof(positions) ); + if (wine_server_call_err( req )) return -1; + } + SERVER_END_REQ; + + for (i = 0; i < ARRAY_SIZE( positions ); i++) + { + pos = &positions[i]; + if (ptin->x == pos->x && ptin->y == pos->y && (!ptin->time || ptin->time == pos->time)) + break; + } + + if (i == ARRAY_SIZE( positions )) + { + SetLastError( ERROR_POINT_NOT_FOUND ); + return -1; + } + + for (copied = 0; copied < count && i < ARRAY_SIZE( positions ); copied++, i++) + { + pos = &positions[i]; + ptout[copied].x = pos->x; + ptout[copied].y = pos->y; + ptout[copied].time = pos->time; + ptout[copied].dwExtraInfo = pos->info; + } - SetLastError(ERROR_POINT_NOT_FOUND); - return -1; + return copied; } /*********************************************************************** diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1809c147cbd..cf83ad81bb8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1473,14 +1473,18 @@ done: SetCursorPos(pt_org.x, pt_org.y); } -static void test_GetMouseMovePointsEx(void) +static void test_GetMouseMovePointsEx(const char *argv0) { #define BUFLIM 64 #define MYERROR 0xdeadbeef + PROCESS_INFORMATION process_info; + STARTUPINFOA startup_info; + char path[MAX_PATH]; int count, retval; MOUSEMOVEPOINT in; MOUSEMOVEPOINT out[200]; POINT point; + TEST_INPUT input; /* Get a valid content for the input struct */ if(!GetCursorPos(&point)) { @@ -1605,10 +1609,194 @@ static void test_GetMouseMovePointsEx(void) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == MYERROR, "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* more than 64 to be sure we wrap around */ + for (int i = 0; i < 67; i++) + { + in.x = i; + in.y = i*2; + SetCursorPos( in.x, in.y ); + } + + SetLastError( MYERROR ); + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( GetLastError() == MYERROR, "expected error to stay %x, got %x\n", MYERROR, GetLastError() ); + + for (int i = 0; i < retval; i++) + { + ok( out[i].x == in.x && out[i].y == in.y, "wrong position %d, expected %dx%d got %dx%d\n", i, in.x, in.y, out[i].x, out[i].y ); + in.x--; + in.y -= 2; + } + + in.x = 1500; + in.y = 1500; + SetLastError( MYERROR ); + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == -1, "expected to get -1 but got %d\n", retval ); + ok( GetLastError() == ERROR_POINT_NOT_FOUND, "expected error to be set to %x, got %x\n", ERROR_POINT_NOT_FOUND, GetLastError() ); + + /* make sure there's no deduplication */ + in.x = 6; + in.y = 6; + SetCursorPos( in.x, in.y ); + SetCursorPos( in.x, in.y ); + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( out[0].x == 6 && out[0].y == 6, "expected cursor position to be 6x6 but got %d %d\n", out[0].x, out[0].y ); + ok( out[1].x == 6 && out[1].y == 6, "expected cursor position to be 6x6 but got %d %d\n", out[1].x, out[1].y ); + + /* make sure 2 events are distinguishable by their timestamps */ + in.x = 150; + in.y = 75; + SetCursorPos( 30, 30 ); + SetCursorPos( in.x, in.y ); + SetCursorPos( 150, 150 ); + Sleep( 3 ); + SetCursorPos( in.x, in.y ); + + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( out[0].x == 150 && out[0].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[0].x, out[0].y ); + ok( out[1].x == 150 && out[1].y == 150, "expected cursor position to be 150x150 but got %d %d\n", out[1].x, out[1].y ); + ok( out[2].x == 150 && out[2].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[2].x, out[2].y ); + + in.time = out[2].time; + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 62, "expected to get 62 mouse move points but got %d\n", retval ); + ok( out[0].x == 150 && out[0].y == 75, "expected cursor position to be 150x75 but got %d %d\n", out[0].x, out[0].y ); + ok( out[1].x == 30 && out[1].y == 30, "expected cursor position to be 30x30 but got %d %d\n", out[1].x, out[1].y ); + + /* events created through other means should also be on the list with correct extra info */ + mouse_event( MOUSEEVENTF_MOVE, -13, 17, 0, 0xcafecafe ); + ok( GetCursorPos( &point ), "failed to get cursor position\n" ); + ok( in.x != point.x && in.y != point.y, "cursor didn't change position after mouse_event()\n" ); + in.time = 0; + in.x = point.x; + in.y = point.y; + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( out[0].dwExtraInfo == 0xcafecafe, "wrong extra info, got 0x%lx expected 0xcafecafe\n", out[0].dwExtraInfo ); + + input.type = INPUT_MOUSE; + memset( &input, 0, sizeof(input) ); + input.u.mi.dwFlags = MOUSEEVENTF_MOVE; + input.u.mi.dwExtraInfo = 0xdeadbeef; + input.u.mi.dx = -17; + input.u.mi.dy = 13; + SendInput( 1, (INPUT *)&input, sizeof(INPUT) ); + ok( GetCursorPos( &point ), "failed to get cursor position\n" ); + ok( in.x != point.x && in.y != point.y, "cursor didn't change position after mouse_event()\n" ); + in.time = 0; + in.x = point.x; + in.y = point.y; + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( out[0].dwExtraInfo == 0xdeadbeef, "wrong extra info, got 0x%lx expected 0xdeadbeef\n", out[0].dwExtraInfo ); + + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM, GMMP_USE_HIGH_RESOLUTION_POINTS ); + todo_wine ok( retval == 64, "expected to get 64 high resolution mouse move points but got %d\n", retval ); + + sprintf(path, "%s input get_mouse_move_points_test", argv0); + memset(&startup_info, 0, sizeof(startup_info)); + startup_info.cb = sizeof(startup_info); + startup_info.dwFlags = STARTF_USESHOWWINDOW; + startup_info.wShowWindow = SW_SHOWNORMAL; + retval = CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info ); + ok(retval, "CreateProcess \"%s\" failed err %u.\n", path, GetLastError()); + winetest_wait_child_process(process_info.hProcess); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); #undef BUFLIM #undef MYERROR } +static void test_GetMouseMovePointsEx_process(void) +{ + int retval; + MOUSEMOVEPOINT in; + MOUSEMOVEPOINT out[64], out2[64]; + POINT point; + HDESK desk0, desk1; + HWINSTA winstation0, winstation1; + + memset( out, 0, sizeof(out) ); + memset( out2, 0, sizeof(out2) ); + + /* move point history is shared between desktops within the same windowstation */ + ok( GetCursorPos( &point ), "failed to get cursor position\n" ); + in.time = 0; + in.x = point.x; + in.y = point.y; + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, ARRAY_SIZE(out), GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + + desk0 = OpenInputDesktop( 0, FALSE, DESKTOP_ALL_ACCESS ); + ok( desk0 != NULL, "OpenInputDesktop has failed with %d\n", GetLastError() ); + desk1 = CreateDesktopA( "getmousemovepointsex_test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( desk1 != NULL, "CreateDesktopA failed with %d\n", GetLastError() ); + + ok( SetThreadDesktop( desk1 ), "SetThreadDesktop failed!\n" ); + ok( SwitchDesktop( desk1 ), "SwitchDesktop failed\n" ); + + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out2, ARRAY_SIZE(out2), GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + + ok( memcmp( out, out2, sizeof(out2) ) == 0, "expected to get exact same history on the new desktop\n" ); + + in.time = 0; + in.x = 38; + in.y = 27; + SetCursorPos( in.x, in.y ); + + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out2, ARRAY_SIZE(out2), GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + + ok( SetThreadDesktop( desk0 ), "SetThreadDesktop failed!\n" ); + ok( SwitchDesktop( desk0 ), "SwitchDesktop failed\n" ); + + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, ARRAY_SIZE(out), GMMP_USE_DISPLAY_POINTS ); + ok( retval == 64, "expected to get 64 mouse move points but got %d\n", retval ); + ok( memcmp( out, out2, sizeof( out2 ) ) == 0, "expected to get exact same history on the old desktop\n" ); + + CloseDesktop( desk1 ); + CloseDesktop( desk0 ); + + /* non-default windowstations are non-interactive */ + winstation0 = GetProcessWindowStation(); + ok( winstation0 != NULL, "GetProcessWindowStation has failed with %d\n", GetLastError() ); + desk0 = OpenInputDesktop( 0, FALSE, DESKTOP_ALL_ACCESS ); + ok( desk0 != NULL, "OpenInputDesktop has failed with %d\n", GetLastError() ); + winstation1 = CreateWindowStationA( "test_winstation", 0, WINSTA_ALL_ACCESS, NULL ); + + if (winstation1 == NULL && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("not enough priviledges for CreateWindowStation\n"); + CloseDesktop( desk0 ); + CloseWindowStation( winstation0 ); + return; + } + + ok( winstation1 != NULL, "CreateWindowStationA has failed with %d\n", GetLastError() ); + ok( SetProcessWindowStation( winstation1 ), "SetProcessWindowStation has failed\n" ); + + desk1 = CreateDesktopA( "getmousemovepointsex_test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( desk1 != NULL, "CreateDesktopA failed with %d\n", GetLastError() ); + ok( SetThreadDesktop( desk1 ), "SetThreadDesktop failed!\n" ); + + SetLastError( 0xDEADBEEF ); + retval = pGetMouseMovePointsEx( sizeof(MOUSEMOVEPOINT), &in, out, ARRAY_SIZE(out), GMMP_USE_DISPLAY_POINTS ); + todo_wine ok( retval == -1, "expected to get -1 mouse move points but got %d\n", retval ); + todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED got %d\n", GetLastError() ); + + ok( SetProcessWindowStation( winstation0 ), "SetProcessWindowStation has failed\n" ); + ok( SetThreadDesktop( desk0 ), "SetThreadDesktop failed!\n" ); + CloseDesktop( desk1 ); + CloseWindowStation( winstation1 ); + CloseDesktop( desk0 ); + CloseWindowStation( winstation0 ); +} + static void test_GetRawInputDeviceList(void) { RAWINPUTDEVICELIST devices[32]; @@ -3807,6 +3995,12 @@ START_TEST(input) return; } + if (argc >= 3 && strcmp(argv[2], "get_mouse_move_points_test") == 0) + { + test_GetMouseMovePointsEx_process(); + return; + } + test_Input_blackbox(); test_Input_whitebox(); test_Input_unicode(); @@ -3828,7 +4022,7 @@ START_TEST(input) test_rawinput(argv[0]); if(pGetMouseMovePointsEx) - test_GetMouseMovePointsEx(); + test_GetMouseMovePointsEx(argv[0]); else win_skip("GetMouseMovePointsEx is not available\n"); diff --git a/server/protocol.def b/server/protocol.def index f538c6dcf51..a2834898cce 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -782,6 +782,15 @@ struct rawinput_device user_handle_t target; }; +typedef struct +{ + int x; + int y; + unsigned int time; + int __pad; + lparam_t info; +} cursor_pos_t; + /****************************************************************/ /* Request declarations */ @@ -3605,6 +3614,12 @@ struct handle_info #define SET_CURSOR_CLIP 0x08 #define SET_CURSOR_NOCLIP 0x10 +/* Get the history of the 64 last cursor positions */ +(a)REQ(get_cursor_history) +(a)REPLY + VARARG(history,cursor_positions); +(a)END + /* Batch read rawinput message data */ @REQ(get_rawinput_buffer) diff --git a/server/queue.c b/server/queue.c index 2c780a94e2c..84057d6584f 100644 --- a/server/queue.c +++ b/server/queue.c @@ -227,6 +227,9 @@ static const struct object_ops thread_input_ops = /* pointer to input structure of foreground thread */ static unsigned int last_input_time; +static cursor_pos_t cursor_history[64]; +static unsigned int cursor_history_latest; + static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ); static void free_message( struct message *msg ); @@ -1520,14 +1523,33 @@ static void update_rawinput_device(const struct rawinput_device *device) e->device.target = get_user_full_handle( e->device.target ); } +static void prepend_cursor_history( int x, int y, unsigned int time, lparam_t info ) +{ + const size_t positions_len = ARRAY_SIZE( cursor_history ); + cursor_pos_t *pos; + + cursor_history_latest = (cursor_history_latest + positions_len - 1) % positions_len; + + pos = &cursor_history[cursor_history_latest]; + pos->x = x; + pos->y = y; + pos->time = time; + pos->info = info; +} + /* queue a hardware message into a given thread input */ static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ) { user_handle_t win; struct thread *thread; struct thread_input *input; + struct hardware_msg_data *msg_data; unsigned int msg_code; + msg_data = msg->data; + if (msg->msg == WM_MOUSEMOVE) + prepend_cursor_history( msg->x, msg->y, msg->time, msg_data->info ); + update_input_key_state( desktop, desktop->keystate, msg->msg, msg->wparam ); last_input_time = get_tick_count(); if (msg->msg != WM_MOUSEMOVE) always_queue = 1; @@ -3222,6 +3244,23 @@ DECL_HANDLER(set_cursor) reply->last_change = input->desktop->cursor.last_change; } +/* Get the history of the 64 last cursor positions */ +DECL_HANDLER(get_cursor_history) +{ + cursor_pos_t positions[64]; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE( positions ); i++) + { + positions[i] = cursor_history[(i + cursor_history_latest) % ARRAY_SIZE( cursor_history )]; + } + + if (sizeof(positions) == get_reply_max_size()) + set_reply_data( positions, sizeof(positions) ); + else + set_error( STATUS_INVALID_BUFFER_SIZE ); +} + DECL_HANDLER(get_rawinput_buffer) { struct thread_input *input = current->queue->input; diff --git a/server/trace.c b/server/trace.c index ffe9d6e19c6..17a28921ebd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -887,6 +887,31 @@ static void dump_varargs_rectangles( const char *prefix, data_size_t size ) remove_data( size ); } +static void dump_varargs_cursor_positions( const char *prefix, data_size_t size ) +{ + const cursor_pos_t *pos = cur_data; + data_size_t len; + + if (!size) + { + fprintf( stderr, "%s{}", prefix ); + return; + } + + fprintf( stderr, "%s{", prefix ); + len = size / sizeof(*pos); + while (len > 0) + { + fprintf( stderr, "{x=%d,y=%d,time=%u", pos->x, pos->y, pos->time ); + dump_uint64( ",info=", &pos->info ); + fputc( '}', stderr ); + pos++; + if (--len) fputc( ',', stderr ); + } + fputc( '}', stderr ); + remove_data( size ); +} + static void dump_varargs_message_data( const char *prefix, data_size_t size ) { /* FIXME: dump the structured data */ -- 2.28.0

2 1

[PATCH 3/3] dxgi/tests: Check that the last adapter is always WARP.
by Henri Verbeet Oct. 2, 2020

Oct. 2, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> Some games specifically ignore the last adapter from the adapter list, as it's always WARP on Windows. This makes them fail to detect GPUs correctly on Wine, as they drop one of the reported adapters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bee21638430..a34f574236e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5327,9 +5327,12 @@ static void test_multi_adapter(void) unsigned int output_count = 0, expected_output_count = 0; unsigned int adapter_index, output_index, device_index; DXGI_OUTPUT_DESC old_output_desc, output_desc; + DXGI_ADAPTER_DESC1 adapter_desc1; + DXGI_ADAPTER_DESC adapter_desc; DISPLAY_DEVICEW display_device; MONITORINFO monitor_info; DEVMODEW old_mode, mode; + IDXGIAdapter1 *adapter1; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIOutput *output; @@ -5531,6 +5534,48 @@ static void test_multi_adapter(void) IDXGIAdapter_Release(adapter); } + /* Windows 8+ always have a WARP adapter present at the end. */ + todo_wine ok(adapter_index >= 2 || broken(adapter_index < 2) /* Windows 7 and before */, + "Got unexpected adapter count %u.\n", adapter_index); + if (adapter_index < 2) + { + todo_wine win_skip("WARP adapter missing, skipping tests.\n"); + goto done; + } + + hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"), + "Got unexpected description %s.\n", wine_dbgstr_w(adapter_desc.Description)); + todo_wine ok(adapter_desc.VendorId == 0x1414, + "Got unexpected vendor ID %#x.\n", adapter_desc.VendorId); + todo_wine ok(adapter_desc.DeviceId == 0x008c, + "Got unexpected device ID %#x.\n", adapter_desc.DeviceId); + ok(adapter_desc.SubSysId == 0x0000, + "Got unexpected sub-system ID %#x.\n", adapter_desc.SubSysId); + ok(adapter_desc.Revision == 0x0000, + "Got unexpected revision %#x.\n", adapter_desc.Revision); + todo_wine ok(!adapter_desc.DedicatedVideoMemory, + "Got unexpected DedicatedVideoMemory %#lx.\n", adapter_desc.DedicatedVideoMemory); + ok(!adapter_desc.DedicatedSystemMemory, + "Got unexpected DedicatedSystemMemory %#lx.\n", adapter_desc.DedicatedSystemMemory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE, + "Got unexpected flags %#x.\n", adapter_desc1.Flags); + IDXGIAdapter1_Release(adapter1); + } + + IDXGIAdapter_Release(adapter); + +done: IDXGIFactory_Release(factory); expected_output_count = GetSystemMetrics(SM_CMONITORS); -- 2.20.1

2 1

[PATCH 2/3] include: Add the D3D12_SHADER_VERSION_TYPE enumeration.
by Henri Verbeet Oct. 2, 2020

Oct. 2, 2020

From: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/d3d12shader.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/d3d12shader.idl b/include/d3d12shader.idl index 9cf39c6cc3c..f6cc35a843d 100644 --- a/include/d3d12shader.idl +++ b/include/d3d12shader.idl @@ -20,6 +20,17 @@ import "oaidl.idl"; import "ocidl.idl"; import "d3dcommon.idl"; +typedef enum D3D12_SHADER_VERSION_TYPE +{ + D3D12_SHVER_PIXEL_SHADER = 0x0, + D3D12_SHVER_VERTEX_SHADER = 0x1, + D3D12_SHVER_GEOMETRY_SHADER = 0x2, + D3D12_SHVER_HULL_SHADER = 0x3, + D3D12_SHVER_DOMAIN_SHADER = 0x4, + D3D12_SHVER_COMPUTE_SHADER = 0x5, + D3D12_SHVER_RESERVED0 = 0xfff0, +} D3D12_SHADER_VERSION_TYPE; + typedef struct _D3D12_SHADER_DESC { UINT Version; -- 2.20.1

2 1

[PATCH 1/3] include: Move the ID3D12Debug interface to d3d12sdklayers.idl.
by Henri Verbeet Oct. 2, 2020

Oct. 2, 2020

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 1 + dlls/dxgi/tests/dxgi.c | 1 + include/d3d12.idl | 11 ----------- include/d3d12sdklayers.idl | 30 ++++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 include/d3d12sdklayers.idl diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 8c57f07357c..f5a4c2ba11e 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d12.h" +#include "d3d12sdklayers.h" #include "dxgi1_6.h" #include "wine/test.h" diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ce1aee5ee3b..bee21638430 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -24,6 +24,7 @@ #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "d3d12sdklayers.h" #include "winternl.h" #include "ddk/d3dkmthk.h" #include "wine/heap.h" diff --git a/include/d3d12.idl b/include/d3d12.idl index 201e01f07ef..8b1e85fcefe 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2138,17 +2138,6 @@ interface ID3D12Device : ID3D12Object LUID GetAdapterLuid(); } -[ - uuid(344488b7-6846-474b-b989-f027448245e0), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug : IUnknown -{ - void EnableDebugLayer(); -} - [ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl new file mode 100644 index 00000000000..dfbb7382174 --- /dev/null +++ b/include/d3d12sdklayers.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2016-2019 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d3d12.idl"; + +[ + uuid(344488b7-6846-474b-b989-f027448245e0), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug : IUnknown +{ + void EnableDebugLayer(); +} -- 2.20.1

2 1

[PATCH] ntdll: Implement NtGetNextProcess().
by Nikolay Sivov Oct. 2, 2020

Oct. 2, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45119 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/om.c | 28 +++++++++++++++++++++++ dlls/ntdll/unix/process.c | 20 +++++++++++++++++ include/wine/server_protocol.h | 23 ++++++++++++++++++- server/process.c | 41 ++++++++++++++++++++++++++++++++++ server/protocol.def | 11 +++++++++ server/request.h | 9 ++++++++ server/trace.c | 16 +++++++++++++ 8 files changed, 148 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce9f6281d5d..701fab0ade8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -222,6 +222,7 @@ @ stdcall -norelay -syscall NtGetContextThread(long ptr) @ stdcall -syscall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState +@ stdcall -syscall NtGetNextProcess(long long long long ptr) @ stdcall NtGetNlsSectionPtr(long long long ptr ptr) @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d3b932bec1d..6c43ee27823 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -73,6 +73,7 @@ static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); static void (WINAPI *pRtlWakeAddressAll)( const void * ); static void (WINAPI *pRtlWakeAddressSingle)( const void * ); +static NTSTATUS (WINAPI *pNtGetNextProcess)(HANDLE process, ACCESS_MASK access, ULONG attributes, ULONG flags, HANDLE *handle); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2034,6 +2035,31 @@ static void test_wait_on_address(void) ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); } +static void test_get_next_process(void) +{ + NTSTATUS status; + HANDLE handle; + + if (!pNtGetNextProcess) + { + win_skip("NtGetNextProcess is not available.\n"); + return; + } + + status = pNtGetNextProcess(0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle); + ok(!status, "Unexpected status %#x.\n", status); + pNtClose(handle); + + /* Reversed search only supported in recent enough Win10 */ + status = pNtGetNextProcess(0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 1, &handle); + ok(!status || broken(status == STATUS_INVALID_PARAMETER), "Unexpected status %#x.\n", status); + if (status) + pNtClose(handle); + + status = pNtGetNextProcess(0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 2, &handle); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2082,6 +2108,7 @@ START_TEST(om) pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); + pNtGetNextProcess = (void *)GetProcAddress(hntdll, "NtGetNextProcess"); test_case_sensitive(); test_namespace_pipe(); @@ -2096,4 +2123,5 @@ START_TEST(om) test_keyed_events(); test_null_device(); test_wait_on_address(); + test_get_next_process(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 5ccf435e9ff..b0f7fa88d34 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1743,6 +1743,26 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) return ret; } +/********************************************************************** + * NtGetNextProcess (NTDLL.@) + */ +NTSTATUS WINAPI NtGetNextProcess( HANDLE process, ACCESS_MASK access, ULONG attributes, + ULONG flags, HANDLE *handle ) +{ + NTSTATUS ret; + + SERVER_START_REQ( get_next_process ) + { + req->last = wine_server_obj_handle( process ); + req->access = access; + req->attributes = attributes; + req->flags = flags; + ret = wine_server_call( req ); + if (!ret) *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} /*********************************************************************** * __wine_make_process_system (NTDLL.@) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ea62e73f63c..70aa8839314 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5441,6 +5441,24 @@ struct resume_process_reply }; + +struct get_next_process_request +{ + struct request_header __header; + obj_handle_t last; + unsigned int access; + unsigned int attributes; + unsigned int flags; + char __pad_28[4]; +}; +struct get_next_process_reply +{ + struct reply_header __header; + obj_handle_t handle; + char __pad_12[4]; +}; + + enum request { REQ_new_process, @@ -5724,6 +5742,7 @@ enum request REQ_terminate_job, REQ_suspend_process, REQ_resume_process, + REQ_get_next_process, REQ_NB_REQUESTS }; @@ -6012,6 +6031,7 @@ union generic_request struct terminate_job_request terminate_job_request; struct suspend_process_request suspend_process_request; struct resume_process_request resume_process_request; + struct get_next_process_request get_next_process_request; }; union generic_reply { @@ -6298,11 +6318,12 @@ union generic_reply struct terminate_job_reply terminate_job_reply; struct suspend_process_reply suspend_process_reply; struct resume_process_reply resume_process_reply; + struct get_next_process_reply get_next_process_reply; }; /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 647 +#define SERVER_PROTOCOL_VERSION 648 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 1786493a814..ced638ec966 100644 --- a/server/process.c +++ b/server/process.c @@ -1829,6 +1829,47 @@ DECL_HANDLER(resume_process) } } +/* Iterate process list */ +DECL_HANDLER(get_next_process) +{ + struct process *process = NULL, *next; + struct list *ptr; + + reply->handle = 0; + + if ( req->flags > 1 ) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if (!req->last) + { + ptr = req->flags ? list_tail( &process_list ) : list_head( &process_list ); + } + else if ((process = get_process_from_handle( req->last, 0 ))) + { + ptr = req->flags ? list_prev( &process_list, &process->entry ) : + list_next( &process_list, &process->entry ); + } + else + return; + + while (ptr) + { + next = LIST_ENTRY( ptr, struct process, entry ); + if ((reply->handle = alloc_handle( current->process, next, req->access, req->attributes ))) + break; + ptr = req->flags ? list_prev( &process_list, &next->entry ) : list_next( &process_list, &next->entry ); + } + + if (!reply->handle) + set_error( STATUS_NO_MORE_ENTRIES ); + + if (process) + release_object( process ); +} + /* Get a list of processes and threads currently running */ DECL_HANDLER(list_processes) { diff --git a/server/protocol.def b/server/protocol.def index f538c6dcf51..81ce88cca82 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3703,3 +3703,14 @@ struct handle_info @REQ(resume_process) obj_handle_t handle; /* process handle */ @END + + +/* Iterate process list */ +(a)REQ(get_next_process) + obj_handle_t last; /* process handle to start with */ + unsigned int access; /* desired access for returned handle */ + unsigned int attributes; /* returned handle attributes */ + unsigned int flags; /* controls iteration direction */ +(a)REPLY + obj_handle_t handle; /* next process handle */ +(a)END diff --git a/server/request.h b/server/request.h index bc6f29f2110..26fc80dc5d6 100644 --- a/server/request.h +++ b/server/request.h @@ -400,6 +400,7 @@ DECL_HANDLER(get_job_info); DECL_HANDLER(terminate_job); DECL_HANDLER(suspend_process); DECL_HANDLER(resume_process); +DECL_HANDLER(get_next_process); #ifdef WANT_REQUEST_HANDLERS @@ -687,6 +688,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_terminate_job, (req_handler)req_suspend_process, (req_handler)req_resume_process, + (req_handler)req_get_next_process, }; C_ASSERT( sizeof(abstime_t) == 8 ); @@ -2280,6 +2282,13 @@ C_ASSERT( FIELD_OFFSET(struct suspend_process_request, handle) == 12 ); C_ASSERT( sizeof(struct suspend_process_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct resume_process_request, handle) == 12 ); C_ASSERT( sizeof(struct resume_process_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_next_process_request, last) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_next_process_request, access) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_next_process_request, attributes) == 20 ); +C_ASSERT( FIELD_OFFSET(struct get_next_process_request, flags) == 24 ); +C_ASSERT( sizeof(struct get_next_process_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_next_process_reply, handle) == 8 ); +C_ASSERT( sizeof(struct get_next_process_reply) == 16 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index ffe9d6e19c6..092cc8e94f8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4424,6 +4424,19 @@ static void dump_resume_process_request( const struct resume_process_request *re fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_get_next_process_request( const struct get_next_process_request *req ) +{ + fprintf( stderr, " last=%04x", req->last ); + fprintf( stderr, ", access=%08x", req->access ); + fprintf( stderr, ", attributes=%08x", req->attributes ); + fprintf( stderr, ", flags=%08x", req->flags ); +} + +static void dump_get_next_process_reply( const struct get_next_process_reply *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_exec_process_request, @@ -4706,6 +4719,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_terminate_job_request, (dump_func)dump_suspend_process_request, (dump_func)dump_resume_process_request, + (dump_func)dump_get_next_process_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4990,6 +5004,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, NULL, + (dump_func)dump_get_next_process_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5274,6 +5289,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "terminate_job", "suspend_process", "resume_process", + "get_next_process", }; static const struct -- 2.28.0

2 1

[PATCH] ntdll: Handle 64-bit addresses in +seh traces.
by Daniel Lehman Oct. 2, 2020

Oct. 2, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- -0110:trace:seh:dump_scope_table 0: 40004cdc-40004ce2 handler 4000b1a0 target 40000000 -0110:trace:seh:dump_scope_table 1: 40004cdc-40004d1b handler 4000b1ce target 40004d1b -0110:trace:seh:dump_scope_table 2: 40004cdc-40004d4f handler 4000b1fe target 40000000 -0110:trace:seh:dump_scope_table 3: 40004cdc-40004d88 handler 4000b22c target 40004d88 +0110:trace:seh:dump_scope_table 0: 140004cdc-140004ce2 handler 14000b1a0 target 140000000 +0110:trace:seh:dump_scope_table 1: 140004cdc-140004d1b handler 14000b1ce target 140004d1b +0110:trace:seh:dump_scope_table 2: 140004cdc-140004d4f handler 14000b1fe target 140000000 +0110:trace:seh:dump_scope_table 3: 140004cdc-140004d88 handler 14000b22c target 140004d88 -0110:trace:seh:__C_specific_handler unwinding to target 40005569 +0110:trace:seh:__C_specific_handler unwinding to target 140005569 -0110:trace:seh:RtlRestoreContext returning to 40005336 stack 21ed00 +0110:trace:seh:RtlRestoreContext returning to 140005336 stack 21ed00 -0110:trace:seh:RtlVirtualUnwind type 2 rip 40005567 rsp 21fd00 +0110:trace:seh:RtlVirtualUnwind type 2 rip 140005567 rsp 21fd00 -0110:trace:seh:dispatch_exception code=c0000094 flags=0 addr=000000014000225C ip=4000225c tid=0110 +0110:trace:seh:dispatch_exception code=c0000094 flags=0 addr=000000014000225C ip=14000225c tid=0110 --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6fbb612825b..35a5be882bd 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -241,7 +241,7 @@ static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) TRACE( "scope table at %p\n", table ); for (i = 0; i < table->Count; i++) - TRACE( " %u: %lx-%lx handler %lx target %lx\n", i, + TRACE( " %u: %llx-%llx handler %llx target %llx\n", i, base + table->ScopeRecord[i].BeginAddress, base + table->ScopeRecord[i].EndAddress, base + table->ScopeRecord[i].HandlerAddress, @@ -384,7 +384,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C frame.Handler = nested_exception_handler; __wine_push_frame( &frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", + TRACE( "calling handler %p (rec=%p, frame=0x%llx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); @@ -445,7 +445,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %llx (%p-%p)\n", dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -480,7 +480,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* hack: call wine handlers registered in the tib list */ else while ((ULONG64)teb_frame < context.Rsp) { - TRACE( "found wine frame %p rsp %lx handler %p\n", + TRACE( "found wine frame %p rsp %llx handler %p\n", teb_frame, context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) @@ -521,7 +521,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; - TRACE( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", + TRACE( "code=%x flags=%x addr=%p ip=%llx tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) @@ -780,7 +780,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, unsigned int i, prolog_offset; BOOL mach_frame = FALSE; - TRACE( "type %x rip %lx rsp %lx\n", type, pc, context->Rsp ); + TRACE( "type %x rip %llx rsp %llx\n", type, pc, context->Rsp ); if (TRACE_ON(seh)) dump_unwind_info( base, function ); frame = *frame_ret = context->Rsp; @@ -944,7 +944,7 @@ static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dis frame.dispatch = dispatch; __wine_push_frame( &frame.frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", + TRACE( "calling handler %p (rec=%p, frame=0x%llx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res ); @@ -1162,7 +1162,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) teb_frame = __wine_pop_frame( teb_frame ); } - TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + TRACE( "returning to %llx stack %llx\n", context->Rip, context->Rsp ); NtSetContextThread( GetCurrentThread(), context ); } @@ -1226,7 +1226,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %llx (%p-%p)\n", dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -1236,7 +1236,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { if (end_frame && (dispatch.EstablisherFrame > (ULONG64)end_frame)) { - ERR( "invalid end frame %lx/%p\n", dispatch.EstablisherFrame, end_frame ); + ERR( "invalid end frame %llx/%p\n", dispatch.EstablisherFrame, end_frame ); raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EH_TARGET_UNWIND; @@ -1381,7 +1381,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, return ExceptionContinueExecution; } } - TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); + TRACE( "unwinding to target %llx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); RtlUnwindEx( frame, (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget, rec, 0, dispatch->ContextRecord, dispatch->HistoryTable ); } @@ -1471,7 +1471,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %llx (%p-%p)\n", dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); break; } -- 2.25.1

2 1

[PATCH 3/3] vcruntime140_1: Terminate on noexcept function trying to propagate exception.
by Piotr Caban Oct. 2, 2020

Oct. 2, 2020

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/except_x86_64.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 2/3] msvcrt: Terminate on noexcept function trying to propagate exception (x86_64).
by Piotr Caban Oct. 2, 2020

Oct. 2, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except_x86_64.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] msvcrt: Terminate on noexcept function trying to propagate exception (i386).
by Piotr Caban Oct. 2, 2020

Oct. 2, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cppexcept.h | 1 + dlls/msvcrt/except_i386.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)

1 0

[PATCH 1/5] ntdll: Introduce RtlProcessFlsData() and use it for FLS data destruction.
by Paul Gofman Oct. 2, 2020

Oct. 2, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 10 ++++++++++ include/winternl.h | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0bfef62a7da..f2b746856e1 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1022,7 +1022,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) RtlExitUserThread( 1 ); } RtlFreeUserStack( fiber->stack_allocation ); - HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); + RtlProcessFlsData( fiber->fls_slots, 3 ); HeapFree( GetProcessHeap(), 0, fiber ); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 20bc3f977d1..cd27ce5658b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3255,7 +3255,8 @@ void WINAPI LdrShutdownThread(void) for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); RtlFreeHeap( GetProcessHeap(), 0, pointers ); } - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 3 ); + NtCurrentTeb()->FlsSlots = NULL; RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); NtCurrentTeb()->TlsExpansionSlots = NULL; RtlReleasePebLock(); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce9f6281d5d..6f44f499825 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -874,6 +874,7 @@ @ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) +@ stdcall RtlProcessFlsData(ptr long) @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap @ stdcall RtlPushFrame(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 716ef3b61d0..57292043582 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -343,3 +343,13 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsGetValue( ULONG index, void **data ) return STATUS_SUCCESS; } + + +/*********************************************************************** + * RtlProcessFlsData (NTDLL.@) + */ +void WINAPI DECLSPEC_HOTPATCH RtlProcessFlsData( void *teb_fls_data, ULONG flags ) +{ + if (flags & 2) + RtlFreeHeap( GetProcessHeap(), 0, teb_fls_data ); +} diff --git a/include/winternl.h b/include/winternl.h index 82328167c9e..75324635ed7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3480,6 +3480,7 @@ NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void WINAPI RtlProcessFlsData(void*,ULONG); NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); NTSYSAPI NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); -- 2.26.2

2 9