January 2022 - Wine-Devel - list.winehq.org

[PATCH v2 2/2] ntdll/tests: Add more tests for NtOpenKey/NtCreateKey.
by Dmitry Timoshkov Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 445c05a02e1..16ce80a3dbf 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -456,6 +456,26 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes123" ); + str.Buffer[str.Length/sizeof(WCHAR) - 1] = 0; + str.Buffer[str.Length/sizeof(WCHAR) - 2] = 0; + str.Buffer[str.Length/sizeof(WCHAR) - 3] = 0; + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes123" ); + str.Buffer[str.Length/sizeof(WCHAR) - 3] = 0; + status = pNtOpenKey( &key, KEY_READ, &attr ); + todo_wine + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win10 */, + "NtOpenKey failed: 0x%08x\n", status ); + pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -630,13 +650,33 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes123" ); + str.Buffer[str.Length/sizeof(WCHAR) - 1] = 0; + str.Buffer[str.Length/sizeof(WCHAR) - 2] = 0; + str.Buffer[str.Length/sizeof(WCHAR) - 3] = 0; + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes123" ); + str.Buffer[str.Length/sizeof(WCHAR) - 3] = 0; + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); -- 2.34.1

1 0

[PATCH] shell32: Ignore KF_FLAG_NOT_PARENT_RELATIVE in SHGetKnownFolderPath().
by Nikolay Sivov Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shellpath.c | 15 ++++++++++++++- dlls/shell32/tests/shellpath.c | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 7bfa504a62f..2f1573f8221 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3529,11 +3529,24 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); if (flags & ~(KF_FLAG_CREATE|KF_FLAG_SIMPLE_IDLIST|KF_FLAG_DONT_UNEXPAND| - KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH)) + KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH|KF_FLAG_NOT_PARENT_RELATIVE)) { FIXME("flags 0x%08x not supported\n", flags); return E_INVALIDARG; } + + if ((flags & (KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE)) == KF_FLAG_NOT_PARENT_RELATIVE) + { + WARN("Invalid flags mask %#x.\n", flags); + return E_INVALIDARG; + } + + if (flags & KF_FLAG_NOT_PARENT_RELATIVE) + { + FIXME("Ignoring KF_FLAG_NOT_PARENT_RELATIVE.\n"); + flags &= ~KF_FLAG_NOT_PARENT_RELATIVE; + } + folder |= flags & CSIDL_FLAG_MASK; shgfp_flags = flags & KF_FLAG_DEFAULT_PATH ? SHGFP_TYPE_DEFAULT : SHGFP_TYPE_CURRENT; diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 0ba3734c518..7d0f725158a 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1910,6 +1910,19 @@ if (0) { /* crashes */ ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); CoTaskMemFree(path2); + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT_PATH, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + CoTaskMemFree(path2); + + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_NOT_PARENT_RELATIVE, NULL, &path2); + ok(hr == E_INVALIDARG, "expected S_OK, got 0x%08x\n", hr); + + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + CoTaskMemFree(path2); + CoTaskMemFree(path); } -- 2.34.1

1 0

[PATCH 10/10] d2d1/tests: Avoid "misleading indentation" warnings.
by Henri Verbeet Jan. 26, 2022

Jan. 26, 2022

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 224405. v2: - If we're touching it... - Use a less ambiguous commit message. dlls/d2d1/tests/d2d1.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0228ae8d52b..b0aa02ad2a9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4766,7 +4766,7 @@ static void test_shared_bitmap(BOOL d3d11) bitmap_desc.pixelFormat = bitmap_format_tests[i].original; hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface, surface2, &bitmap_desc, &bitmap2); - todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) + todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -5233,8 +5233,7 @@ static void test_draw_text_layout(BOOL d3d11) ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine - ok(hr == D2DERR_WRONG_FACTORY, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f); @@ -5500,8 +5499,7 @@ static void test_dc_target(BOOL d3d11) /* Invalid DC. */ hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); -todo_wine - ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID2D1DCRenderTarget_BeginDraw(rt); @@ -5512,8 +5510,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine - ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); + todo_wine ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08x.\n", clr); hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); @@ -5527,8 +5524,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine - ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); + todo_wine ok(clr == RGB(0, 0, 255), "Got unexpected colour 0x%08x.\n", clr); DeleteDC(hdc); DeleteDC(hdc2); @@ -7884,8 +7880,7 @@ static void test_gdi_interop(BOOL d3d11) dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); ok(FAILED(hr), "GetDC() was expected to fail, hr %#x.\n", hr); -todo_wine - ok(dc == NULL, "Expected NULL dc, got %p.\n", dc); + todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); @@ -7942,8 +7937,7 @@ todo_wine ID2D1RenderTarget_BeginDraw(rt); hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock); -todo_wine - ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Expected bitmap to be locked, hr %#x.\n", hr); + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IWICBitmapLock_Release(wic_lock); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -7954,8 +7948,7 @@ todo_wine ok(SUCCEEDED(hr), "Expected bitmap to be unlocked, hr %#x.\n", hr); ID2D1RenderTarget_BeginDraw(rt); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine - ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr); IWICBitmapLock_Release(wic_lock); ID2D1GdiInteropRenderTarget_Release(interop); @@ -8460,7 +8453,7 @@ static void test_bitmap_surface(BOOL d3d11) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, &bitmap_desc, &bitmap); - todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) + todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -8716,8 +8709,7 @@ static void test_device_context(BOOL d3d11) ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); -todo_wine - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -8982,8 +8974,7 @@ static void test_command_list(BOOL d3d11) ok(device_context != NULL, "Failed to create device context.\n"); hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); -todo_wine - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (FAILED(hr)) { -- 2.30.2

2 1

[PATCH v3 3/3] msvcp140_atomic_wait: Implement __std_parallel_algorithms_hw_threads.
by Daniel Lehman Jan. 26, 2022

Jan. 26, 2022

v2 - call function in msvcp140 instead of copy v3 - without internal header

1 0

[PATCH v2 4/5] winhttp: Return error from WinHttpWebSocketQueryCloseStatus() if close frame was not received.
by Hans Leidekker Jan. 26, 2022

Jan. 26, 2022

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 6 ++++++ dlls/winhttp/tests/notification.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 39223d41bbb..279e0522166 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3909,6 +3909,12 @@ DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status return ERROR_INVALID_OPERATION; } + if (!socket->close_frame_received || socket->close_frame_receive_err) + { + ret = socket->close_frame_received ? socket->close_frame_receive_err : ERROR_INVALID_OPERATION; + release_object( &socket->hdr ); + return ret; + } *status = socket->status; *ret_len = socket->reason_len; if (socket->reason_len > len) ret = ERROR_INSUFFICIENT_BUFFER; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index c57c0ef598a..cab87df339d 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -971,9 +971,9 @@ static void test_websocket(BOOL secure) close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - todo_wine ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); - todo_wine ok( close_status == 0xdead, "got %u\n", close_status ); - todo_wine ok( size == sizeof(buffer) + 1, "got %u\n", size ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( close_status == 0xdead, "got %u\n", close_status ); + ok( size == sizeof(buffer) + 1, "got %u\n", size ); WaitForSingleObject( info.wait, INFINITE ); -- 2.30.2

2 1

[PATCH v2 3/5] winhttp: Send callback for pending receives right away when closing websocket.
by Hans Leidekker Jan. 26, 2022

Jan. 26, 2022

From: Paul Gofman <pgofman(a)codeweavers.com> v2: Fix printf format warning. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 65 ++++++++++++++++++++++--------- dlls/winhttp/tests/notification.c | 18 ++++++++- 2 files changed, 63 insertions(+), 20 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7666bae4e68..39223d41bbb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3244,10 +3244,14 @@ static void send_io_complete( struct object_header *hdr ) assert( count >= 0 ); } -static void receive_io_complete( struct socket *socket ) +/* returns FALSE if sending callback should be omitted. */ +static BOOL receive_io_complete( struct socket *socket ) { LONG count = InterlockedDecrement( &socket->hdr.pending_receives ); - assert( count >= 0 ); + assert( count >= 0 || socket->state == SOCKET_STATE_CLOSED); + /* count is reset to zero during websocket close so if count went negative + * then WinHttpWebSocketClose() is to send the callback. */ + return count >= 0; } static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) @@ -3620,22 +3624,24 @@ static void CALLBACK task_socket_receive( TP_CALLBACK_INSTANCE *instance, void * TRACE("running %p\n", work); ret = socket_receive( r->socket, r->buf, r->len, &count, &type ); - receive_io_complete( r->socket ); - if (!ret) - { - WINHTTP_WEB_SOCKET_STATUS status; - status.dwBytesTransferred = count; - status.eBufferType = type; - send_callback( &r->socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); - } - else + if (receive_io_complete( r->socket )) { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_READ_DATA; - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; - send_callback( &r->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = count; + status.eBufferType = type; + send_callback( &r->socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_READ_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; + send_callback( &r->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } } release_object( &r->socket->hdr ); @@ -3719,7 +3725,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v { DWORD ret; - socket->state = SOCKET_STATE_SHUTDOWN; + if (socket->state < SOCKET_STATE_SHUTDOWN) socket->state = SOCKET_STATE_SHUTDOWN; if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { @@ -3816,6 +3822,8 @@ static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ct DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) { + enum socket_state prev_state; + LONG pending_receives = 0; struct socket *socket; DWORD ret; @@ -3835,10 +3843,29 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas return ERROR_INVALID_OPERATION; } - if (socket->state < SOCKET_STATE_SHUTDOWN + prev_state = socket->state; + socket->state = SOCKET_STATE_CLOSED; + + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + /* When closing the socket pending receives are cancelled. Setting socket->hdr.pending_receives to zero + * will prevent pending receives from sending callbacks. */ + pending_receives = InterlockedExchange( &socket->hdr.pending_receives, 0 ); + assert( pending_receives >= 0 ); + if (pending_receives) + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + + result.AsyncResult.dwResult = 0; + result.AsyncResult.dwError = ERROR_WINHTTP_OPERATION_CANCELLED; + result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + + if (prev_state < SOCKET_STATE_SHUTDOWN && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) goto done; - socket->state = SOCKET_STATE_CLOSED; if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { struct socket_shutdown *s; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 2707151e00f..c57c0ef598a 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -63,6 +63,7 @@ struct notification #define NF_WINE_ALLOW 0x0002 /* wine sends notification when it should not */ #define NF_SIGNAL 0x0004 /* signal wait handle when notified */ #define NF_MAIN_THREAD 0x0008 /* the operation completes synchronously and callback is called from the main thread */ +#define NF_SAVE_BUFFER 0x0010 /* save buffer data when notified */ struct info { @@ -75,6 +76,8 @@ struct info DWORD main_thread_id; DWORD last_thread_id; DWORD last_status; + char buffer[256]; + unsigned int buflen; }; struct test_request @@ -118,6 +121,11 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW ok(GetCurrentThreadId() == info->main_thread_id, "%u: expected callback to be called from the same thread\n", info->line); } + if (info->test[info->index].flags & NF_SAVE_BUFFER) + { + info->buflen = buflen; + memcpy( info->buffer, buffer, min( buflen, sizeof(info->buffer) )); + } if (status_ok && function_ok && info->test[info->index++].flags & NF_SIGNAL) { @@ -694,7 +702,7 @@ static const struct notification websocket_test2[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, - { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR }, + { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, NF_MAIN_THREAD | NF_SAVE_BUFFER}, { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, @@ -707,6 +715,7 @@ static const struct notification websocket_test2[] = static void test_websocket(BOOL secure) { HANDLE session, connection, request, socket, event; + WINHTTP_WEB_SOCKET_ASYNC_RESULT *result; WINHTTP_WEB_SOCKET_BUFFER_TYPE type; DWORD size, status, err; BOOL ret, unload = TRUE; @@ -951,6 +960,13 @@ static void test_websocket(BOOL secure) setup_test( &info, winhttp_websocket_close, __LINE__ ); ret = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( info.buflen == sizeof(*result), "got unexpected buflen %u.\n", info.buflen ); + result = (WINHTTP_WEB_SOCKET_ASYNC_RESULT *)info.buffer; + ok( result->Operation == WINHTTP_WEB_SOCKET_RECEIVE_OPERATION, "got unexpected operation %u.\n", + result->Operation ); + ok( !result->AsyncResult.dwResult, "got unexpected result %lu.\n", result->AsyncResult.dwResult ); + ok( result->AsyncResult.dwError == ERROR_WINHTTP_OPERATION_CANCELLED, "got unexpected error %u.\n", + result->AsyncResult.dwError ); close_status = 0xdead; size = sizeof(buffer) + 1; -- 2.30.2

2 1

[PATCH 09/10] wined3d: Use wined3d_bit_scan() in context_update_stream_info().
by Henri Verbeet Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ed7fa32f74c..6aa5ae4e997 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -266,20 +266,19 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi const struct wined3d_d3d_info *d3d_info = context->d3d_info; DWORD prev_all_vbo = stream_info->all_vbo; unsigned int i; - WORD map; + uint32_t map; wined3d_stream_info_from_declaration(stream_info, state, d3d_info); stream_info->all_vbo = 1; - for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) + map = stream_info->use_map; + while (map) { struct wined3d_stream_info_element *element; struct wined3d_bo_address data; struct wined3d_buffer *buffer; - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer; -- 2.30.2

1 0

[PATCH 08/10] wined3d: Use wined3d_bit_scan() in wined3d_device_process_vertices().
by Henri Verbeet Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71b5aaa5742..b5bf7c86740 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3509,8 +3509,8 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_box box = {0}; struct wined3d_shader *vs; unsigned int i, j; + uint32_t map; HRESULT hr; - WORD map; TRACE("device %p, src_start_idx %u, dst_idx %u, vertex_count %u, " "dst_buffer %p, declaration %p, flags %#x, dst_fvf %#x.\n", @@ -3530,14 +3530,13 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, * VBOs in those buffers and fix up the stream_info structure. * * Also apply the start index. */ - for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + map = stream_info.use_map; + while (map) { struct wined3d_stream_info_element *e; struct wined3d_map_desc map_desc; - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); e = &stream_info.elements[i]; resource = &state->streams[e->stream_idx].buffer->resource; box.left = src_start_idx * e->stride; @@ -3545,10 +3544,12 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ))) { ERR("Failed to map resource.\n"); - for (j = 0, map = stream_info.use_map; map && j < i; map >>= 1, ++j) + map = stream_info.use_map; + while (map) { - if (!(map & 1)) - continue; + j = wined3d_bit_scan(&map); + if (j >= i) + break; e = &stream_info.elements[j]; resource = &state->streams[e->stream_idx].buffer->resource; @@ -3564,11 +3565,10 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, hr = process_vertices_strided(device, dst_idx, vertex_count, &stream_info, dst_buffer, flags, dst_fvf); - for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + map = stream_info.use_map; + while (map) { - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); resource = &state->streams[stream_info.elements[i].stream_idx].buffer->resource; if (FAILED(wined3d_resource_unmap(resource, 0))) ERR("Failed to unmap resource.\n"); -- 2.30.2

1 0

[PATCH 07/10] wined3d: Use wined3d_bit_scan() in vshader_get_input().
by Henri Verbeet Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 43c6bb402c0..2731639d554 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3578,24 +3578,24 @@ static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_id return FALSE; } -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) +bool vshader_get_input(const struct wined3d_shader *shader, + uint8_t usage_req, uint8_t usage_idx_req, unsigned int *regnum) { - WORD map = shader->reg_maps.input_registers; + uint32_t map = shader->reg_maps.input_registers & 0xffff; unsigned int i; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; - + i = wined3d_bit_scan(&map); if (match_usage(shader->u.vs.attributes[i].usage, shader->u.vs.attributes[i].usage_idx, usage_req, usage_idx_req)) { *regnum = i; - return TRUE; + return true; } } - return FALSE; + + return false; } static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e45b61c61e..e28fc3b880d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5759,8 +5759,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; +bool vshader_get_input(const struct wined3d_shader *shader, + uint8_t usage_req, uint8_t usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct vs_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN; -- 2.30.2

1 0

[PATCH 06/10] wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare().
by Henri Verbeet Jan. 26, 2022

Jan. 26, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6381265def..e33cd5d5fe0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10978,24 +10978,20 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry const struct glsl_program_key *k = key; const struct glsl_shader_prog_link *prog = WINE_RB_ENTRY_VALUE(entry, const struct glsl_shader_prog_link, program_lookup_entry); + int ret; - if (k->vs_id > prog->vs.id) return 1; - else if (k->vs_id < prog->vs.id) return -1; - - if (k->gs_id > prog->gs.id) return 1; - else if (k->gs_id < prog->gs.id) return -1; - - if (k->ps_id > prog->ps.id) return 1; - else if (k->ps_id < prog->ps.id) return -1; - - if (k->hs_id > prog->hs.id) return 1; - else if (k->hs_id < prog->hs.id) return -1; - - if (k->ds_id > prog->ds.id) return 1; - else if (k->ds_id < prog->ds.id) return -1; - - if (k->cs_id > prog->cs.id) return 1; - else if (k->cs_id < prog->cs.id) return -1; + if ((ret = wined3d_uint32_compare(k->vs_id, prog->vs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->gs_id, prog->gs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->ps_id, prog->ps.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->hs_id, prog->hs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->ds_id, prog->ds.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->cs_id, prog->cs.id))) + return ret; return 0; } -- 2.30.2

1 0