April 2022 - Wine-devel - list.winehq.org

[PATCH v2 1/2] mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader.
by Giovanni Mascellani 08 Apr '22

08 Apr '22

The stream sample allocator callback NotifyRelease() method assumes that the source reader is valid. Therefore it must own a reference to it, otherwise it might get called while the source reader is being destroyed, causing a crash. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index bdf2e7f5a6f..2d3da19db10 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2282,12 +2282,14 @@ static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAl static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) { - return 2; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_addref(stream->reader); } static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) { - return 1; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_release(stream->reader); } static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) -- 2.35.1

1 1

[PATCH 1/2] mfreadwrite/reader: Make the stream sample allocator callback own a reference to the source reader.
by Giovanni Mascellani 08 Apr '22

08 Apr '22

The stream sample allocator callback NotifyRelease() method assumes that the source reader is valid. Therefore it must own a reference to it, otherwise it might get called while the source reader is being destroyed, causing a crash. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index bdf2e7f5a6f..2d3da19db10 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2282,12 +2282,14 @@ static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAl static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) { - return 2; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_addref(stream->reader); } static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) { - return 1; + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + return source_reader_release(stream->reader); } static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) -- 2.35.1

2 2

[PATCH] win32u: Use more consistent NtUserMessageCall constant names.
by Jacek Caban 08 Apr '22

08 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 12 ++++++------ dlls/user32/message.c | 20 ++++++++++---------- dlls/user32/nonclient.c | 2 +- dlls/user32/user_main.c | 4 ++-- dlls/user32/winproc.c | 4 ++-- dlls/win32u/clipboard.c | 4 ++-- dlls/win32u/input.c | 4 ++-- dlls/win32u/message.c | 22 +++++++++++----------- dlls/win32u/tests/win32u.c | 24 ++++++++++++------------ dlls/win32u/window.c | 10 +++++----- include/ntuser.h | 18 +++++++++--------- 11 files changed, 62 insertions(+), 62 deletions(-)

3 2

[PATCH 1/5] kernel32/tests: Add invalid pointer heap validation tests.
by Rémi Bernon 08 Apr '22

08 Apr '22

Adding commented-out crashing tests to make it obvious that they were tested and that HeapFree or HeapReAlloc don't validate pointers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 6f85ecc6425..190e83cc208 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -78,6 +78,7 @@ struct heap static void test_HeapCreate(void) { + static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; BYTE *ptr, *ptr1, *ptrs[128]; HANDLE heap, heap1; @@ -107,12 +108,49 @@ static void test_HeapCreate(void) ret = HeapFree( heap, 0, NULL ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); +#if 0 /* crashes */ + SetLastError( 0xdeadbeef ); + ret = HeapFree( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapFree( heap, 0, ptr ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); +#endif SetLastError( 0xdeadbeef ); ptr = HeapReAlloc( heap, 0, NULL, 1 ); ok( !ptr, "HeapReAlloc succeeded\n" ); todo_wine ok( GetLastError() == NO_ERROR, "got error %lu\n", GetLastError() ); +#if 0 /* crashes */ + SetLastError( 0xdeadbeef ); + ptr1 = HeapReAlloc( heap, 0, (void *)0xdeadbe00, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ptr1 = HeapReAlloc( heap, 0, ptr, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); +#endif + + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, NULL ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapValidate succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapValidate( heap, 0, ptr ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); ptr = HeapAlloc( heap, 0, 0 ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); @@ -122,8 +160,14 @@ static void test_HeapCreate(void) ok( !ptr1, "HeapReAlloc succeeded\n" ); ptr1 = pHeapReAlloc( heap, 0, ptr, ~(SIZE_T)0 ); ok( !ptr1, "HeapReAlloc succeeded\n" ); + ret = HeapValidate( heap, 0, ptr ); + ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HeapValidate( heap, 0, ptr ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); ptr = pHeapAlloc( heap, 0, ~(SIZE_T)0 ); ok( !ptr, "HeapAlloc succeeded\n" ); @@ -247,6 +291,7 @@ static void test_HeapCreate(void) ptr1 = HeapReAlloc( heap, HEAP_REALLOC_IN_PLACE_ONLY, ptr, 2 * alloc_size ); todo_wine ok( ptr1 != ptr, "HeapReAlloc HEAP_REALLOC_IN_PLACE_ONLY succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr1 ); -- 2.35.1

2 5

[PATCH vkd3d v2 1/5] tests: Use a vertex buffer to draw quads for shader tests.
by Zebediah Figura 08 Apr '22

08 Apr '22

For compatibility with shader models before 4.0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Draw a large triangle anyway. Also, make it large enough to avoid depending on pixel-exact rendering near the viewport edges. tests/shader_runner.c | 69 ++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index d3d131164..ffa4cf61b 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -314,6 +314,24 @@ static void parse_input_layout_directive(struct shader_runner *runner, const cha element->index = 0; } +static void set_resource(struct shader_runner *runner, struct resource *resource) +{ + size_t i; + + for (i = 0; i < runner->resource_count; ++i) + { + if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) + { + runner->ops->destroy_resource(runner, runner->resources[i]); + runner->resources[i] = resource; + return; + } + } + + runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); + runner->resources[runner->resource_count++] = resource; +} + static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) { runner->uniform_count = align(max(runner->uniform_count, offset + count), 4); @@ -326,13 +344,40 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "draw quad", &line)) { + struct resource_params params; + struct input_element *element; + + /* For simplicity, draw a large triangle instead. */ + static const struct vec2 quad[] = + { + {-2.0f, -2.0f}, + {-2.0f, 4.0f}, + { 4.0f, -2.0f}, + }; + static const char vs_source[] = - "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" + "void main(inout float4 position : sv_position)\n" "{\n" - " float2 coords = float2((id << 1) & 2, id & 2);\n" - " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" "}"; + vkd3d_array_reserve((void **)&runner->input_elements, &runner->input_element_capacity, + 1, sizeof(*runner->input_elements)); + element = &runner->input_elements[0]; + element->name = strdup("sv_position"); + element->slot = 0; + element->format = DXGI_FORMAT_R32G32_FLOAT; + element->texel_size = sizeof(*quad); + element->index = 0; + runner->input_element_count = 1; + + memset(&params, 0, sizeof(params)); + params.slot = 0; + params.type = RESOURCE_TYPE_VERTEX_BUFFER; + params.data = malloc(sizeof(quad)); + memcpy(params.data, quad, sizeof(quad)); + params.data_size = sizeof(quad); + set_resource(runner, runner->ops->create_resource(runner, &params)); + if (!runner->vs_source) runner->vs_source = strdup(vs_source); @@ -482,24 +527,6 @@ static struct sampler *get_sampler(struct shader_runner *runner, unsigned int sl return NULL; } -static void set_resource(struct shader_runner *runner, struct resource *resource) -{ - size_t i; - - for (i = 0; i < runner->resource_count; ++i) - { - if (runner->resources[i]->slot == resource->slot && runner->resources[i]->type == resource->type) - { - runner->ops->destroy_resource(runner, runner->resources[i]); - runner->resources[i] = resource; - return; - } - } - - runner->resources = realloc(runner->resources, (runner->resource_count + 1) * sizeof(*runner->resources)); - runner->resources[runner->resource_count++] = resource; -} - unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot) { unsigned int stride = 0; -- 2.35.1

2 9

[PATCH] ncrypt: Map STATUS_NO_MEMORY to NTE_NO_MEMORY.
by Mohamad Al-Jaf 08 Apr '22

08 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- BCryptEnumAlgorithms can return this as an NTSTATUS. --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 10cec633269..58503338d6e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -40,6 +40,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; case STATUS_SUCCESS: return ERROR_SUCCESS; case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case STATUS_NO_MEMORY: return NTE_NO_MEMORY; case STATUS_NOT_SUPPORTED: return NTE_NOT_SUPPORTED; case NTE_BAD_DATA: return NTE_BAD_DATA; default: -- 2.35.1

2 1

[PATCH] msado15: _Recordset Clone return valid object.
by Alistair Leslie-Hughes 08 Apr '22

08 Apr '22

This is just to stop a crash when Clone is called. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 3bbb4bd3300..766c17598ce 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1794,8 +1794,12 @@ static HRESULT WINAPI recordset_CompareBookmarks( _Recordset *iface, VARIANT boo static HRESULT WINAPI recordset_Clone( _Recordset *iface, LockTypeEnum lock_type, _Recordset **obj ) { - FIXME( "%p, %d, %p\n", iface, lock_type, obj ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p, %d, %p\n", recordset, lock_type, obj ); + + *obj = iface; + recordset_AddRef( iface ); + return S_OK; } static HRESULT WINAPI recordset_Resync( _Recordset *iface, AffectEnum affect_records, ResyncEnum resync_values ) -- 2.35.1

1 0

[PATCH v3 1/2] winex11: Prevent the call sequence change between xim preedit callback and key event handlers.
by Byeongsik Jeon 08 Apr '22

08 Apr '22

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: rework. update merge_events(). v3: remove the wrong explanatory paragraph. "xim preedit callback" is called from within the XFilterEvent(). ### xim server sended event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: lookup chars:: keycode 0 string 3 '가' <== HERE preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' <== HERE ### Wine process_events() simulated event sequence ### preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string 'ㄱ' preedit draw:: caret 1 chg_first 0 chg_length 1 string '가' preedit draw:: caret 1 chg_first 0 chg_length 1 string '간' preedit draw:: caret 0 chg_first 0 chg_length 1 NULL preedit done:: preedit start:: preedit draw:: caret 1 chg_first 0 chg_length 0 string '나' <== HERE lookup chars:: keycode 0 string 3 '가' <== HERE dlls/winex11.drv/event.c | 60 ++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c20ceeacca1..581e28787a0 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -261,10 +261,11 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) enum event_merge_action { - MERGE_DISCARD, /* discard the old event */ - MERGE_HANDLE, /* handle the old event */ + MERGE_FLUSH, /* handle all the events */ MERGE_KEEP, /* keep the old event for future merging */ - MERGE_IGNORE /* ignore the new event, keep the old one */ + MERGE_IGNORE, /* ignore the new event, keep the old one */ + MERGE_DISCARD, /* discard the old event */ + MERGE_HANDLE /* handle the old event */ }; /*********************************************************************** @@ -316,6 +317,19 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) { switch (prev->type) { + case 0: + switch (next->type) + { + case ConfigureNotify: + case MotionNotify: +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: +#endif + return MERGE_DISCARD; + default: + return MERGE_KEEP; + } + break; case ConfigureNotify: switch (next->type) { @@ -325,7 +339,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; case Expose: case PropertyNotify: return MERGE_KEEP; @@ -340,30 +354,30 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return MERGE_KEEP; } break; case GenericEvent: - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; + if (prev->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (prev->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; switch (next->type) { case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - if (x11drv_thread_data()->warp_serial) break; + if (next->xcookie.extension != xinput2_opcode) return MERGE_HANDLE; + if (next->xcookie.evtype != XI_RawMotion) return MERGE_HANDLE; + if (x11drv_thread_data()->warp_serial) return MERGE_HANDLE; return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); #endif } break; } - return MERGE_HANDLE; + return MERGE_FLUSH; } @@ -445,23 +459,29 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + get_event_data( &event ); - if (prev_event.type) action = merge_events( &prev_event, &event ); + action = merge_events( &prev_event, &event ); switch( action ) { - case MERGE_HANDLE: /* handle prev, keep new */ + case MERGE_FLUSH: /* handle all the events */ queued |= call_event_handler( display, &prev_event ); - /* fall through */ - case MERGE_DISCARD: /* discard prev, keep new */ free_event_data( &prev_event ); - prev_event = event; - break; + prev_event.type = 0; + /* fall through */ case MERGE_KEEP: /* handle new, keep prev for future merging */ queued |= call_event_handler( display, &event ); /* fall through */ case MERGE_IGNORE: /* ignore new, keep prev for future merging */ free_event_data( &event ); break; + case MERGE_HANDLE: /* handle prev, keep new */ + queued |= call_event_handler( display, &prev_event ); + /* fall through */ + case MERGE_DISCARD: /* discard prev, keep new */ + free_event_data( &prev_event ); + prev_event = event; + break; } } if (prev_event.type) queued |= call_event_handler( display, &prev_event ); -- 2.35.1

1 1

[PATCH] programs/winedbg: trace 64-bit integers with I64 width modifier
by Eric Pouech 08 Apr '22

08 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 208526739e2e..3118637cb5ef 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -114,8 +114,8 @@ BOOL memory_write_value(const struct dbg_lvalue* lvalue, DWORD size, void* value if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &os)) return FALSE; if (size != os) { - dbg_printf("Size mismatch in memory_write_value, got %lu from type while expecting %lu\n", - (DWORD)os, size); + dbg_printf("Size mismatch in memory_write_value, got %I64u from type while expecting %lu\n", + os, size); return FALSE; }

1 0

[PATCH] dlls/snmpapi: trace 64-bit integers with I64 width modifier
by Eric Pouech 08 Apr '22

08 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/snmpapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 7020c6062283..4c647b6d2bee 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -579,7 +579,7 @@ VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) case ASN_TIMETICKS: TRACE("Timeticks %lu\n", any->asnValue.ticks); return; case ASN_COUNTER64: { - TRACE("Counter64 %lx%08lx\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); + TRACE("Counter64 %I64x\n", any->asnValue.counter64.QuadPart); return; } case ASN_OCTETSTRING:

1 0