- Wine-Devel - list.winehq.org

[PATCH] wined3d: Do not attempt to bind a null buffer_object in state_cb().
by Conor McCarthy Dec. 14, 2021

Dec. 14, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52020 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/wined3d/state.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 865c60d18..6d7e30732 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4584,13 +4584,12 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state { const struct wined3d_constant_buffer_state *buffer_state = &state->cb[shader_type][i]; - if (!buffer_state->buffer) + if (!(buffer = buffer_state->buffer) || !buffer->buffer_object) { GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, 0)); continue; } - buffer = buffer_state->buffer; bo_gl = wined3d_bo_gl(buffer->buffer_object); GL_EXTCALL(glBindBufferRange(GL_UNIFORM_BUFFER, base + i, bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset, buffer_state->size)); -- 2.33.0

2 1

[PATCH] wmc: Fix a typo in a comment.
by Andrey Gusev Dec. 14, 2021

Dec. 14, 2021

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- tools/wmc/write.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wmc/write.h b/tools/wmc/write.h index 8451e0b7950..964059a1c04 100644 --- a/tools/wmc/write.h +++ b/tools/wmc/write.h @@ -1,5 +1,5 @@ /* - * Wine Message Compiler outpur generation + * Wine Message Compiler output generation * * Copyright 2000 Bertho A. Stultiens (BS) * -- 2.33.1

1 0

[PATCH] hlink/tests: Fix a typo in a comment.
by Andrey Gusev Dec. 14, 2021

Dec. 14, 2021

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/hlink/tests/hlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index ccbbd889d5c..c905093bd86 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -183,7 +183,7 @@ static void test_reference(void) ok(r == S_OK, "failed\n"); ok(str == NULL, "string should be null\n"); - /* Unimplented functions checks */ + /* Unimplemented functions checks */ r = IHlink_GetAdditionalParams(lnk, NULL); ok(r == E_NOTIMPL, "failed\n"); -- 2.33.1

1 0

[PATCH] conhost: Process Ctrl-M (carriage return) key input
by Hugh McMaster Dec. 14, 2021

Dec. 14, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50526 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/conhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 05447d52dd5..6bc0cc33bbd 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -356,7 +356,7 @@ static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) if (screen_buffer->console->window) { - update_window_region( screen_buffer->console, rect ); + update_window_region( screen_buffer->console, rect ); return; } if (!screen_buffer->console->tty_output) return; @@ -1125,6 +1125,7 @@ static const struct edit_line_key_entry win32_std_key_map[] = static const struct edit_line_key_entry win32_key_map_ctrl[] = { + { 'M', edit_line_done }, { VK_LEFT, edit_line_move_left_word }, { VK_RIGHT, edit_line_move_right_word }, { VK_END, edit_line_kill_suffix }, -- 2.34.1

1 0

[PATCH] mfplat/tests: Fix test crash on old Windows 10 systems.
by Nikolay Sivov Dec. 14, 2021

Dec. 14, 2021

MFCreateDXGISurfaceBuffer() rejects unsupported riid argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52166 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 06547dba3f4..33b93852e2a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6867,7 +6867,12 @@ static void test_d3d12_surface_buffer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D12Resource, (IUnknown *)resource, 0, FALSE, &buffer); + if (hr == E_INVALIDARG) + { todo_wine + win_skip("D3D12 resource buffers are not supported.\n"); + goto notsupported; + } ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); if (SUCCEEDED(hr)) @@ -6888,6 +6893,8 @@ if (SUCCEEDED(hr)) IMFDXGIBuffer_Release(dxgi_buffer); IMFMediaBuffer_Release(buffer); } + +notsupported: ID3D12Resource_Release(resource); refcount = ID3D12Device_Release(device); ok(!refcount, "Unexpected device refcount %u.\n", refcount); -- 2.33.0

2 1

[PATCH] riched20: Defer releasing the host if inside a notify callback.
by Huw Davies Dec. 14, 2021

Dec. 14, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51521 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index af4d37d9fd2..82a3db8f0b6 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -44,11 +44,13 @@ struct host unsigned int client_edge : 1; unsigned int use_set_rect : 1; unsigned int use_back_colour : 1; + unsigned int defer_release : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; RECT client_rect, set_rect; COLORREF back_colour; WCHAR password_char; + unsigned int notify_level; }; static const ITextHost2Vtbl textHostVtbl; @@ -118,6 +120,8 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) GetClientRect( hwnd, &texthost->client_rect ); texthost->use_back_colour = 0; texthost->password_char = (texthost->props & TXTBIT_USEPASSWORD) ? '*' : 0; + texthost->defer_release = 0; + texthost->notify_level = 0; return texthost; } @@ -1098,12 +1102,24 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if ((((host->event_mask & ENM_KEYEVENTS) && msg >= WM_KEYFIRST && msg <= WM_KEYLAST) || ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) || - ((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL)) && - send_msg_filter( host, msg, &wparam, &lparam )) + ((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL))) { - TRACE( "exit (filtered) hwnd %p msg %04x (%s) %lx %lx -> %lu\n", - hwnd, msg, get_msg_name(msg), wparam, lparam, res ); - return res; + host->notify_level++; + res = send_msg_filter( host, msg, &wparam, &lparam ); + if (!--host->notify_level && host->defer_release) + { + TRACE( "exit (filtered deferred release) hwnd %p msg %04x (%s) %lx %lx -> 0\n", + hwnd, msg, get_msg_name(msg), wparam, lparam ); + ITextHost2_Release( &host->ITextHost_iface ); + return 0; + } + + if (res) + { + TRACE( "exit (filtered %lu) hwnd %p msg %04x (%s) %lx %lx -> 0\n", + res, hwnd, msg, get_msg_name(msg), wparam, lparam ); + return 0; + } } switch (msg) @@ -1139,7 +1155,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; } case WM_DESTROY: - ITextHost2_Release( &host->ITextHost_iface ); + if (!host->notify_level) ITextHost2_Release( &host->ITextHost_iface ); + else host->defer_release = 1; return 0; case WM_ERASEBKGND: -- 2.23.0

1 0

[PATCH 1/2] mfplat/tests: Use CRT allocation functions.
by Nikolay Sivov Dec. 14, 2021

Dec. 14, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4dfdc18bb52..baac5ceffae 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,7 +38,6 @@ #include "evr.h" #include "wine/test.h" -#include "wine/heap.h" #define D3D11_INIT_GUID #include "initguid.h" @@ -4201,7 +4200,7 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size == 8, "Got size %u.\n", size); - buffer = heap_alloc(size); + buffer = malloc(size); hr = MFGetAttributesAsBlob(attributes, buffer, size); ok(hr == S_OK, "Failed to serialize, hr %#x.\n", hr); @@ -4223,7 +4222,7 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); - heap_free(buffer); + free(buffer); /* Set some attributes of various types. */ IMFAttributes_SetUINT32(attributes, &MF_MT_MAJOR_TYPE, 456); @@ -4238,12 +4237,12 @@ static void test_attributes_serialization(void) ok(hr == S_OK, "Failed to get blob size, hr %#x.\n", hr); ok(size > 8, "Got unexpected size %u.\n", size); - buffer = heap_alloc(size); + buffer = malloc(size); hr = MFGetAttributesAsBlob(attributes, buffer, size); ok(hr == S_OK, "Failed to serialize, hr %#x.\n", hr); hr = MFInitAttributesFromBlob(dest, buffer, size); ok(hr == S_OK, "Failed to deserialize, hr %#x.\n", hr); - heap_free(buffer); + free(buffer); hr = IMFAttributes_GetUINT32(dest, &MF_MT_MAJOR_TYPE, &value32); ok(hr == S_OK, "Failed to get get uint32 value, hr %#x.\n", hr); -- 2.33.0

1 1

[PATCH] winegstreamer: Acquire all of the flushing locks in GST_Seeking_SetPositions().
by Zebediah Figura Dec. 14, 2021

Dec. 14, 2021

The current code unintentionally repeatedly acquires the lock for the stream currently being seeked. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50906 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index cf284cda668..8532fc1af8b 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1327,8 +1327,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, * ensures the seek is serialized between flushes. */ for (i = 0; i < filter->source_count; ++i) { - if (filter->sources[i]->pin.pin.peer) - EnterCriticalSection(&pin->flushing_cs); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + EnterCriticalSection(&flush_pin->flushing_cs); } SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); @@ -1342,8 +1344,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, for (i = 0; i < filter->source_count; ++i) { - if (filter->sources[i]->pin.pin.peer) - IPin_EndFlush(filter->sources[i]->pin.pin.peer); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + IPin_EndFlush(flush_pin->pin.pin.peer); } if (filter->reader) @@ -1353,8 +1357,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, /* Release the flushing locks. */ for (i = filter->source_count - 1; i >= 0; --i) { - if (filter->sources[i]->pin.pin.peer) - LeaveCriticalSection(&pin->flushing_cs); + struct parser_source *flush_pin = filter->sources[i]; + + if (flush_pin->pin.pin.peer) + LeaveCriticalSection(&flush_pin->flushing_cs); } return S_OK; -- 2.34.1

1 0

[PATCH] mfplat/tests: Avoid crash by async cancel callback in linux.
by Bernhard Übelacker Dec. 13, 2021

Dec. 13, 2021

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- The cancel in test_scheduled_items puts a work item to the queue by invoke_async_callback. But when this work item is processed the function test_scheduled_items is possibly already left, and the stack memory overwritten by the next test. This testbot run tried to force the crash by invalidating the callback: https://testbot.winehq.org/JobDetails.pl?Key=103981 --- dlls/mfplat/tests/mfplat.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4dfdc18bb52..d1664e81031 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2933,19 +2933,24 @@ static void test_MFHeapAlloc(void) MFHeapFree(res); } +/* Documentation for MFCancelWorkItem mentions that the callback + might still be called, even when MFCancelWorkItem is left. + In Wine implementation the cancel queues a work item + via invoke_async_callback which needs the callback later. */ +static struct test_callback scheduled_items_callback; + static void test_scheduled_items(void) { - struct test_callback callback; IMFAsyncResult *result; MFWORKITEM_KEY key, key2; HRESULT hr; - init_test_callback(&callback); + init_test_callback(&scheduled_items_callback); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); - hr = MFScheduleWorkItem(&callback.IMFAsyncCallback_iface, NULL, -5000, &key); + hr = MFScheduleWorkItem(&scheduled_items_callback.IMFAsyncCallback_iface, NULL, -5000, &key); ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); hr = MFCancelWorkItem(key); @@ -2960,7 +2965,7 @@ static void test_scheduled_items(void) return; } - hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); + hr = MFCreateAsyncResult(NULL, &scheduled_items_callback.IMFAsyncCallback_iface, NULL, &result); ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr); hr = pMFPutWaitingWorkItem(NULL, 0, result, &key); @@ -2977,7 +2982,7 @@ static void test_scheduled_items(void) IMFAsyncResult_Release(result); - hr = MFScheduleWorkItem(&callback.IMFAsyncCallback_iface, NULL, -5000, &key); + hr = MFScheduleWorkItem(&scheduled_items_callback.IMFAsyncCallback_iface, NULL, -5000, &key); ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); hr = MFCancelWorkItem(key); -- 2.33.0

2 4

[PATCH v3] ntdll: Add stub for NtSetDebugFilterState().
by Paul Gofman Dec. 13, 2021

Dec. 13, 2021

Eternal Return benefited from this function present as .spec file stub which was removed by 52202224d9ab8316896370db2af6399a5fb7b916. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix spec entry for ZwSetDebugFilterState. - added description to the patch indicating that it fixes a regression. v3: - add missing return from wow64_NtSetDebugFilterState(). dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/debug.c | 11 +++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/syscall.h | 1 + include/winternl.h | 1 + 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f16943aacd9..01302803ea2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -367,7 +367,7 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall -syscall NtSetContextThread(long ptr) -# @ stub NtSetDebugFilterState +@ stdcall -syscall NtSetDebugFilterState(long long long) # @ stub NtSetDefaultHardErrorPort @ stdcall -syscall NtSetDefaultLocale(long long) @ stdcall -syscall NtSetDefaultUILanguage(long) @@ -1389,7 +1389,7 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall -private -syscall ZwSetContextThread(long ptr) NtSetContextThread -# @ stub ZwSetDebugFilterState +@ stdcall -private -syscall ZwSetDebugFilterState(long long long) NtSetDebugFilterState # @ stub ZwSetDefaultHardErrorPort @ stdcall -private -syscall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private -syscall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 63846875c86..e840f5c6e3d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -353,3 +353,14 @@ NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, outbuf, outbuf_len, size ); return STATUS_SUCCESS; } + + +/*********************************************************************** + * NtSetDebugFilterState (NTDLL.@) + */ +NTSTATUS WINAPI NtSetDebugFilterState( ULONG component_id, ULONG level, BOOLEAN state ) +{ + FIXME( "component_id %#x, level %u, state %#x stub.\n", component_id, level, state ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 2d6b81ef651..0bb254ba700 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -294,6 +294,7 @@ static void * const syscalls[] = NtSaveKey, NtSecureConnectPort, NtSetContextThread, + NtSetDebugFilterState, NtSetDefaultLocale, NtSetDefaultUILanguage, NtSetEaFile, diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 75a5df5c453..42e852f4d28 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -269,6 +269,19 @@ NTSTATUS WINAPI wow64_NtQueryInstallUILanguage( UINT *args ) } +/********************************************************************** + * wow64_NtSetDebugFilterState + */ +NTSTATUS WINAPI wow64_NtSetDebugFilterState( UINT *args ) +{ + ULONG component_id = get_ulong( &args ); + ULONG level = get_ulong( &args ); + BOOLEAN state = get_ulong( &args ); + + return NtSetDebugFilterState( component_id, level, state ); +} + + /********************************************************************** * wow64_NtSetDefaultLocale */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 1e122e97314..0c2ba574031 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -196,6 +196,7 @@ SYSCALL_ENTRY( NtSaveKey ) \ SYSCALL_ENTRY( NtSecureConnectPort ) \ SYSCALL_ENTRY( NtSetContextThread ) \ + SYSCALL_ENTRY( NtSetDebugFilterState ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ SYSCALL_ENTRY( NtSetEaFile ) \ diff --git a/include/winternl.h b/include/winternl.h index 29ab0a7ae24..7c3a0c3cf57 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4067,6 +4067,7 @@ NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); NTSYSAPI NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*); +NTSYSAPI NTSTATUS WINAPI NtSetDebugFilterState(ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtSetDefaultHardErrorPort(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); -- 2.33.1

1 0