May 2022 - Wine-Commits - list.winehq.org

Francois Gouget : comctl32/tests: Use winetest_push_context() in tooltip:test_customdraw().
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 3a3f40602828c704071e1ed5857016b7a89b8a9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3f40602828c704071e1ed5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 13 19:57:43 2022 +0200 comctl32/tests: Use winetest_push_context() in tooltip:test_customdraw(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 3bde35250cc..b6f3ace7285 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -188,6 +188,7 @@ static void test_customdraw(void) { HWND parent, hwndTip; RECT rect; TTTOOLINFOA toolInfo = { 0 }; + winetest_push_context("%ld", iterationNumber); /* Create a main window */ parent = CreateWindowExA(0, "CustomDrawClass", NULL, @@ -196,7 +197,7 @@ static void test_customdraw(void) { 50, 50, 300, 300, NULL, NULL, NULL, 0); - ok(parent != NULL, "%ld: Creation of main window failed\n", iterationNumber); + ok(parent != NULL, "Creation of main window failed\n"); /* Make it show */ ShowWindow(parent, SW_SHOWNORMAL); @@ -208,7 +209,7 @@ static void test_customdraw(void) { CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, parent, NULL, GetModuleHandleA(NULL), 0); - ok(hwndTip != NULL, "%ld: Creation of tooltip window failed\n", iterationNumber); + ok(hwndTip != NULL, "Creation of tooltip window failed\n"); /* Set up parms for the wndproc to handle */ CD_Stages = 0; @@ -229,7 +230,7 @@ static void test_customdraw(void) { toolInfo.lParam = 0xdeadbeef; GetClientRect (parent, &toolInfo.rect); ret = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); - ok(ret, "%ld: Failed to add the tool.\n", iterationNumber); + ok(ret, "Failed to add the tool.\n"); /* Make tooltip appear quickly */ SendMessageA(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0)); @@ -243,27 +244,28 @@ static void test_customdraw(void) { { /* Check CustomDraw results */ ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls, - "%ld: CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages, + "CustomDraw stages %x, expected %x\n", CD_Stages, expectedResults[iterationNumber].ExpectedCalls); } ret = SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, 0); - ok(ret, "%ld: Failed to get current tool %#Ix.\n", iterationNumber, ret); + ok(ret, "Failed to get current tool %#Ix.\n", ret); memset(&toolInfo, 0xcc, sizeof(toolInfo)); toolInfo.cbSize = sizeof(toolInfo); toolInfo.lpszText = NULL; toolInfo.lpReserved = (void *)0xdeadbeef; SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, (LPARAM)&toolInfo); - ok(toolInfo.hwnd == parent, "%ld: Unexpected hwnd %p.\n", iterationNumber, toolInfo.hwnd); - ok(toolInfo.hinst == GetModuleHandleA(NULL), "%ld: Unexpected hinst %p.\n", iterationNumber, toolInfo.hinst); - ok(toolInfo.uId == 0x1234abcd, "%ld: Unexpected uId %Ix.\n", iterationNumber, toolInfo.uId); - ok(toolInfo.lParam == 0, "%ld: Unexpected lParam %Ix.\n", iterationNumber, toolInfo.lParam); - ok(toolInfo.lpReserved == (void *)0xdeadbeef, "%ld: Unexpected lpReserved %p.\n", iterationNumber, toolInfo.lpReserved); + ok(toolInfo.hwnd == parent, "Unexpected hwnd %p.\n", toolInfo.hwnd); + ok(toolInfo.hinst == GetModuleHandleA(NULL), "Unexpected hinst %p.\n", toolInfo.hinst); + ok(toolInfo.uId == 0x1234abcd, "Unexpected uId %Ix.\n", toolInfo.uId); + ok(toolInfo.lParam == 0, "Unexpected lParam %Ix.\n", toolInfo.lParam); + ok(toolInfo.lpReserved == (void *)0xdeadbeef, "Unexpected lpReserved %p.\n", toolInfo.lpReserved); /* Clean up */ DestroyWindow(hwndTip); DestroyWindow(parent); + winetest_pop_context(); } SetCursorPos(orig_pos.x, orig_pos.y);

1 0

Nikolay Sivov : mfreadwrite/reader: Allocate output samples on read requests.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 68fa3f673633c138596b86ad2ed1befcd0cc63c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68fa3f673633c138596b86ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 13 19:34:13 2022 +0300 mfreadwrite/reader: Allocate output samples on read requests. Instead of tracking when free notifications, simply propagate allocation error to the caller. Behavior spotted by Giovanni. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 138 +++++++++------------------------------------- 1 file changed, 25 insertions(+), 113 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index e7b7b555e68..741ef93f367 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -52,7 +52,6 @@ struct stream_response DWORD stream_flags; LONGLONG timestamp; IMFSample *sample; - unsigned int sa_pending : 1; }; enum media_stream_state @@ -87,7 +86,6 @@ struct media_stream IMFMediaType *current; struct stream_transform decoder; IMFVideoSampleAllocatorEx *allocator; - IMFVideoSampleAllocatorNotify notify_cb; DWORD id; unsigned int index; enum media_stream_state state; @@ -103,7 +101,6 @@ enum source_reader_async_op SOURCE_READER_ASYNC_SEEK, SOURCE_READER_ASYNC_FLUSH, SOURCE_READER_ASYNC_SAMPLE_READY, - SOURCE_READER_ASYNC_SA_READY, }; struct source_reader_async_command @@ -201,11 +198,6 @@ static struct source_reader_async_command *impl_from_async_command_IUnknown(IUnk return CONTAINING_RECORD(iface, struct source_reader_async_command, IUnknown_iface); } -static struct media_stream *impl_stream_from_IMFVideoSampleAllocatorNotify(IMFVideoSampleAllocatorNotify *iface) -{ - return CONTAINING_RECORD(iface, struct media_stream, notify_cb); -} - static void source_reader_release_responses(struct source_reader *reader, struct media_stream *stream); static ULONG source_reader_addref(struct source_reader *reader) @@ -394,7 +386,7 @@ static void source_reader_response_ready(struct source_reader *reader, struct st struct media_stream *stream = &reader->streams[response->stream_index]; HRESULT hr; - if (!stream->requests || response->sa_pending) + if (!stream->requests) return; if (reader->async_callback) @@ -446,20 +438,6 @@ static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst) } } -static void source_reader_set_sa_response(struct source_reader *reader, struct stream_response *response) -{ - struct media_stream *stream = &reader->streams[response->stream_index]; - IMFSample *sample; - - if (SUCCEEDED(IMFVideoSampleAllocatorEx_AllocateSample(stream->allocator, &sample))) - { - source_reader_copy_sample_buffer(response->sample, sample); - response->sa_pending = 0; - IMFSample_Release(response->sample); - response->sample = sample; - } -} - static HRESULT source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, DWORD stream_flags, LONGLONG timestamp, IMFSample *sample) { @@ -476,12 +454,6 @@ static HRESULT source_reader_queue_response(struct source_reader *reader, struct if (response->sample) IMFSample_AddRef(response->sample); - if (response->sample && stream->allocator) - { - response->sa_pending = 1; - source_reader_set_sa_response(reader, response); - } - list_add_tail(&reader->responses, &response->entry); stream->responses++; @@ -975,26 +947,37 @@ static struct stream_response * media_stream_detach_response(struct source_reade static struct stream_response *media_stream_pop_response(struct source_reader *reader, struct media_stream *stream) { struct stream_response *response; + IMFSample *sample; + HRESULT hr; LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { - if ((stream && response->stream_index != stream->index) || response->sa_pending) + if (stream && response->stream_index != stream->index) continue; - return media_stream_detach_response(reader, response); - } + if (!stream) stream = &reader->streams[response->stream_index]; - return NULL; -} + if (stream->allocator) + { + /* Return allocation error to the caller, while keeping original response sample in for later. */ + if (SUCCEEDED(hr = IMFVideoSampleAllocatorEx_AllocateSample(stream->allocator, &sample))) + { + source_reader_copy_sample_buffer(response->sample, sample); + IMFSample_Release(response->sample); + response->sample = sample; + } + else + { + if (!(response = calloc(1, sizeof(*response)))) + return NULL; -static struct stream_response *media_stream_pick_pending_response(struct source_reader *reader, unsigned int stream) -{ - struct stream_response *response; + response->status = hr; + response->stream_flags = MF_SOURCE_READERF_ERROR; + return response; + } + } - LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) - { - if (response->stream_index == stream && response->sa_pending) - return response; + return media_stream_detach_response(reader, response); } return NULL; @@ -1070,7 +1053,7 @@ static BOOL source_reader_got_response_for_stream(struct source_reader *reader, LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { - if (response->stream_index == stream->index && !response->sa_pending) + if (response->stream_index == stream->index) return TRUE; } @@ -1308,18 +1291,6 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb break; - case SOURCE_READER_ASYNC_SA_READY: - - EnterCriticalSection(&reader->cs); - if ((response = media_stream_pick_pending_response(reader, command->u.sa.stream_index))) - { - source_reader_set_sa_response(reader, response); - source_reader_response_ready(reader, response); - } - LeaveCriticalSection(&reader->cs); - - break; - case SOURCE_READER_ASYNC_SAMPLE_READY: EnterCriticalSection(&reader->cs); @@ -1683,7 +1654,6 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index) { struct media_stream *stream = &reader->streams[index]; - IMFVideoSampleAllocatorCallback *callback; GUID major = { 0 }; HRESULT hr; @@ -1713,13 +1683,6 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, stream->current))) WARN("Failed to initialize sample allocator, hr %#lx.\n", hr); - if (SUCCEEDED(IMFVideoSampleAllocatorEx_QueryInterface(stream->allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&callback))) - { - if (FAILED(hr = IMFVideoSampleAllocatorCallback_SetCallback(callback, &stream->notify_cb))) - WARN("Failed to set allocator callback, hr %#lx.\n", hr); - IMFVideoSampleAllocatorCallback_Release(callback); - } - return hr; } @@ -2283,56 +2246,6 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor return MF_SOURCE_READER_INVALID_STREAM_INDEX; } -static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAllocatorNotify *iface, - REFIID riid, void **obj) -{ - if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || - IsEqualIID(riid, &IID_IUnknown)) - { - *obj = iface; - IMFVideoSampleAllocatorNotify_AddRef(iface); - return S_OK; - } - - *obj = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) -{ - 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) -{ - 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) -{ - struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); - struct source_reader_async_command *command; - - if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SA_READY, &command))) - { - command->u.sa.stream_index = stream->index; - MFPutWorkItem(stream->reader->queue, &stream->reader->async_commands_callback, &command->IUnknown_iface); - IUnknown_Release(&command->IUnknown_iface); - } - - return S_OK; -} - -static const IMFVideoSampleAllocatorNotifyVtbl stream_sample_allocator_cb_vtbl = -{ - stream_sample_allocator_cb_QueryInterface, - stream_sample_allocator_cb_AddRef, - stream_sample_allocator_cb_Release, - stream_sample_allocator_cb_NotifyRelease, -}; - static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, BOOL shutdown_on_release, REFIID riid, void **out) { @@ -2404,7 +2317,6 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr)) break; - object->streams[i].notify_cb.lpVtbl = &stream_sample_allocator_cb_vtbl; object->streams[i].reader = object; object->streams[i].index = i; }

1 0

Paul Gofman : ntdll: Collect logical processor info at process start.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 05676e83e975816b3c0d87b4b18b5cd15a372489 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05676e83e975816b3c0d87b4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 3 18:35:04 2022 -0500 ntdll: Collect logical processor info at process start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 533 +++++++++++++++++++++-------------------------- 1 file changed, 239 insertions(+), 294 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05676e83e975816b3c0d…

1 0

Paul Gofman : ntdll: Refactor logical processor info manipulation functions.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 6aa437de6aa3549abd885c387ea79d18eb0eba56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa437de6aa3549abd885c38… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 3 18:48:18 2022 -0500 ntdll: Refactor logical processor info manipulation functions. To reduce the diff in the next patch. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 175 +++++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aa437de6aa3549abd88…

1 0

Rémi Bernon : windows.gaming.input: Add a type parameter to force_feedback_effect_create.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 7a82be5d977154bca942dbcd0de3ad537bda1c3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a82be5d977154bca942dbcd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 29 13:53:35 2022 +0200 windows.gaming.input: Add a type parameter to force_feedback_effect_create. And convert it to IDirectInputEffect type GUID. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/constant_effect.c | 2 +- dlls/windows.gaming.input/force_feedback.c | 28 +++++++++++++++++++++++++++- dlls/windows.gaming.input/private.h | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/windows.gaming.input/constant_effect.c b/dlls/windows.gaming.input/constant_effect.c index ae0c0f9904d..928927144b9 100644 --- a/dlls/windows.gaming.input/constant_effect.c +++ b/dlls/windows.gaming.input/constant_effect.c @@ -205,7 +205,7 @@ static HRESULT WINAPI activation_ActivateInstance( IActivationFactory *iface, II impl->IConstantForceEffect_iface.lpVtbl = &effect_vtbl; impl->ref = 1; - if (FAILED(hr = force_feedback_effect_create( (IInspectable *)&impl->IConstantForceEffect_iface, + if (FAILED(hr = force_feedback_effect_create( WineForceFeedbackEffectType_Constant, (IInspectable *)&impl->IConstantForceEffect_iface, &impl->IWineForceFeedbackEffectImpl_inner ))) { free( impl ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index ab29a179c6a..9d3ead5fc2b 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -33,6 +33,12 @@ struct effect IForceFeedbackEffect IForceFeedbackEffect_iface; IInspectable *IInspectable_outer; LONG ref; + + GUID type; + DWORD axes[3]; + LONG directions[3]; + DICONSTANTFORCE constant_force; + DIEFFECT params; }; static inline struct effect *impl_from_IWineForceFeedbackEffectImpl( IWineForceFeedbackEffectImpl *iface ) @@ -143,7 +149,7 @@ static const struct IForceFeedbackEffectVtbl effect_vtbl = effect_Stop, }; -HRESULT force_feedback_effect_create( IInspectable *outer, IWineForceFeedbackEffectImpl **out ) +HRESULT force_feedback_effect_create( enum WineForceFeedbackEffectType type, IInspectable *outer, IWineForceFeedbackEffectImpl **out ) { struct effect *impl; @@ -155,6 +161,26 @@ HRESULT force_feedback_effect_create( IInspectable *outer, IWineForceFeedbackEff impl->IInspectable_outer = outer; impl->ref = 1; + switch (type) + { + case WineForceFeedbackEffectType_Constant: + impl->type = GUID_ConstantForce; + impl->params.lpvTypeSpecificParams = &impl->constant_force; + impl->params.cbTypeSpecificParams = sizeof(impl->constant_force); + break; + } + + impl->params.dwSize = sizeof(DIEFFECT); + impl->params.rgdwAxes = impl->axes; + impl->params.rglDirection = impl->directions; + impl->params.dwTriggerButton = -1; + impl->params.dwGain = 10000; + impl->params.dwFlags = DIEFF_CARTESIAN|DIEFF_OBJECTOFFSETS; + impl->params.cAxes = 0; + impl->axes[0] = DIJOFS_X; + impl->axes[1] = DIJOFS_Y; + impl->axes[2] = DIJOFS_Z; + *out = &impl->IWineForceFeedbackEffectImpl_iface; TRACE( "created ForceFeedbackEffect %p\n", *out ); return S_OK; diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 58378304a26..f8edff61455 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -71,7 +71,7 @@ extern HRESULT event_handlers_remove( struct list *list, EventRegistrationToken extern void event_handlers_notify( struct list *list, IInspectable *element ); extern HRESULT force_feedback_motor_create( IDirectInputDevice8W *device, IForceFeedbackMotor **out ); -extern HRESULT force_feedback_effect_create( IInspectable *outer, IWineForceFeedbackEffectImpl **out ); +extern HRESULT force_feedback_effect_create( enum WineForceFeedbackEffectType type, IInspectable *outer, IWineForceFeedbackEffectImpl **out ); typedef HRESULT (WINAPI *async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result ); extern HRESULT async_operation_boolean_create( IUnknown *invoker, IUnknown *param, async_operation_callback callback,

1 0

Rémi Bernon : ntdll: Simplify validate_block_pointer.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 585f52231df70566f64ea6f5620f1ae4ac735df6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=585f52231df70566f64ea6f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 21:11:32 2022 +0200 ntdll: Simplify validate_block_pointer. And rename it to unsafe_block_from_ptr. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 84 ++++++++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 7ccaf5748e2..295b215b3b2 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -930,7 +930,7 @@ static ARENA_LARGE *find_large_block( const HEAP *heap, const void *ptr ) /*********************************************************************** * validate_large_arena */ -static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL quiet ) +static BOOL validate_large_arena( const HEAP *heap, const ARENA_LARGE *arena, BOOL quiet ) { DWORD flags = heap->flags; @@ -1437,7 +1437,7 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * } -static BOOL heap_validate_ptr( HEAP *heap, const void *ptr, SUBHEAP **subheap ) +static BOOL heap_validate_ptr( const HEAP *heap, const void *ptr, SUBHEAP **subheap ) { const ARENA_INUSE *arena = (const ARENA_INUSE *)ptr - 1; const ARENA_LARGE *large_arena; @@ -1494,48 +1494,43 @@ static BOOL heap_validate( HEAP *heap, BOOL quiet ) return TRUE; } - -/*********************************************************************** - * validate_block_pointer - * - * Minimum validation needed to catch bad parameters in heap functions. - */ -static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARENA_INUSE *arena ) +static inline struct block *unsafe_block_from_ptr( const HEAP *heap, const void *ptr, SUBHEAP **subheap ) { - SUBHEAP *subheap; - BOOL ret = FALSE; + struct block *block = (struct block *)ptr - 1; + const char *err = NULL, *base, *commit_end; + SIZE_T blocks_size; - if (heap->flags & HEAP_VALIDATE) return heap_validate_ptr( heap, arena + 1, ret_subheap ); + if (heap->flags & HEAP_VALIDATE) + { + if (!heap_validate_ptr( heap, ptr, subheap )) return NULL; + return block; + } - if (!(*ret_subheap = subheap = find_subheap( heap, arena ))) + if ((*subheap = find_subheap( heap, block ))) { - if (!find_large_block( heap, arena + 1 )) - { - WARN( "Heap %p: pointer %p is not inside heap\n", heap, arena + 1 ); - return FALSE; - } - return TRUE; - } - - if ((const char *)arena < (char *)subheap->base + subheap->headerSize) - WARN( "Heap %p: pointer %p is inside subheap %p header\n", subheap->heap, arena + 1, subheap ); - else if ((ULONG_PTR)arena % ALIGNMENT != ARENA_OFFSET) - WARN( "Heap %p: unaligned arena pointer %p\n", subheap->heap, arena ); - else if (arena->magic == ARENA_PENDING_MAGIC) - WARN( "Heap %p: block %p used after free\n", subheap->heap, arena + 1 ); - else if (arena->magic != ARENA_INUSE_MAGIC) - WARN( "Heap %p: invalid in-use arena magic %08x for %p\n", subheap->heap, arena->magic, arena ); - else if (arena->size & ARENA_FLAG_FREE) - ERR( "Heap %p: bad flags %08x for in-use arena %p\n", - subheap->heap, arena->size & ~ARENA_SIZE_MASK, arena ); - else if ((const char *)(arena + 1) + (arena->size & ARENA_SIZE_MASK) > (const char *)subheap->base + subheap->size || - (const char *)(arena + 1) + (arena->size & ARENA_SIZE_MASK) < (const char *)(arena + 1)) - ERR( "Heap %p: bad size %08x for in-use arena %p\n", - subheap->heap, arena->size & ARENA_SIZE_MASK, arena ); - else - ret = TRUE; + base = subheap_base( *subheap ); + commit_end = subheap_commit_end( *subheap ); + blocks_size = (char *)last_block( *subheap ) - (char *)first_block( *subheap ); + } - return ret; + if (!*subheap) + { + if (find_large_block( heap, ptr )) return block; + err = "block region not found"; + } + else if ((ULONG_PTR)ptr % ALIGNMENT) + err = "invalid ptr alignment"; + else if (!contains( first_block( *subheap ), blocks_size, block, sizeof(*block) )) + err = "invalid block pointer"; + else if (block_get_type( block ) == ARENA_PENDING_MAGIC || (block_get_flags( block ) & ARENA_FLAG_FREE)) + err = "already freed block"; + else if (block_get_type( block ) != ARENA_INUSE_MAGIC) + err = "invalid block header"; + else if (!contains( base, commit_end - base, block, block_get_size( block ) )) + err = "invalid block size"; + + if (err) WARN( "heap %p, block %p: %s\n", heap, block, err ); + return err ? NULL : block; } static DWORD heap_flags_from_global_flag( DWORD flag ) @@ -1826,9 +1821,7 @@ static NTSTATUS heap_free( HEAP *heap, void *ptr ) /* Inform valgrind we are trying to free memory, so it can throw up an error message */ notify_free( ptr ); - block = (ARENA_INUSE *)ptr - 1; - if (!validate_block_pointer( heap, &subheap, block )) return STATUS_INVALID_PARAMETER; - + if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (!subheap) free_large_block( heap, ptr ); else HEAP_MakeInUseBlockFree( subheap, block ); @@ -1870,9 +1863,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size if (rounded_size < size) return STATUS_NO_MEMORY; /* overflow */ if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; - pArena = (ARENA_INUSE *)ptr - 1; - if (!validate_block_pointer( heap, &subheap, pArena )) return STATUS_INVALID_PARAMETER; - + if (!(pArena = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (!subheap) { if (!(*ret = realloc_large_block( heap, flags, ptr, size ))) return STATUS_NO_MEMORY; @@ -2056,8 +2047,7 @@ static NTSTATUS heap_size( HEAP *heap, const void *ptr, SIZE_T *size ) const ARENA_INUSE *block; SUBHEAP *subheap; - block = (const ARENA_INUSE *)ptr - 1; - if (!validate_block_pointer( heap, &subheap, block )) return STATUS_INVALID_PARAMETER; + if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (!subheap) { const ARENA_LARGE *large_arena = (const ARENA_LARGE *)ptr - 1;

1 0

Rémi Bernon : windows.gaming.input: Implement IForceFeedbackEffect interface for ConstantForceEffect.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: d5edf656efc5710a0ede1303b41ac4b869a5caeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5edf656efc5710a0ede1303… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 17:45:09 2022 +0200 windows.gaming.input: Implement IForceFeedbackEffect interface for ConstantForceEffect. Using COM aggregation and a new IWineForceFeedbackEffectImpl interface, deriving from IUnknown as it is only used internally. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 +- dlls/windows.gaming.input/constant_effect.c | 21 ++++- dlls/windows.gaming.input/force_feedback.c | 133 ++++++++++++++++++++++++++++ dlls/windows.gaming.input/private.h | 3 + dlls/windows.gaming.input/provider.idl | 14 +++ 5 files changed, 168 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5edf656efc5710a0ede…

1 0

Dmitry Timoshkov : d2d1/tests: Add some tests for ID2D1DeviceContext::CreateImageBrush().
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 8151e695e31d52c9a739d9648afd9a27265e1f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8151e695e31d52c9a739d964… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 16 08:22:13 2022 +0300 d2d1/tests: Add some tests for ID2D1DeviceContext::CreateImageBrush(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ca80a8e946b..035915491fd 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2291,6 +2291,120 @@ static void test_bitmap_brush(BOOL d3d11) release_test_context(&ctx); } +static void test_image_brush(BOOL d3d11) +{ + D2D1_IMAGE_BRUSH_PROPERTIES image_brush_desc; + D2D1_INTERPOLATION_MODE interp_mode; + ID2D1DeviceContext *device_context; + D2D1_BITMAP_PROPERTIES bitmap_desc; + D2D1_BRUSH_PROPERTIES brush_desc; + ID2D1Image *image, *tmp_image; + struct d2d1_test_context ctx; + D2D1_EXTEND_MODE extend_mode; + D2D1_MATRIX_3X2_F matrix; + ID2D1ImageBrush *brush; + ID2D1Bitmap *bitmap; + D2D1_SIZE_U size; + D2D1_RECT_F rect; + ULONG refcount; + float opacity; + HRESULT hr; + BOOL match; + + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + 0xff0000ff, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + static const D2D1_MATRIX_3X2_F identity = + {{{ + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }}}; + + if (!init_test_context(&ctx, d3d11)) + return; + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Image, (void **)&image); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Only image brush description is required. */ + set_rect(&image_brush_desc.sourceRectangle, 1.0f, 2.0f, 3.0f, 4.0f); + image_brush_desc.extendModeX = D2D1_EXTEND_MODE_WRAP; + image_brush_desc.extendModeY = D2D1_EXTEND_MODE_MIRROR; + image_brush_desc.interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR; + + hr = ID2D1DeviceContext_CreateImageBrush(device_context, NULL, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + tmp_image = (void *)0xdeadbeef; + ID2D1ImageBrush_GetImage(brush, &tmp_image); + ok(!tmp_image, "Unexpected image %p.\n", image); + + opacity = ID2D1ImageBrush_GetOpacity(brush); + ok(opacity == 1.0f, "Unexpected opacity %.8e.\n", opacity); + ID2D1ImageBrush_GetTransform(brush, &matrix); + ok(!memcmp(&matrix, &identity, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + matrix._11, matrix._12, matrix._21, matrix._22, matrix._31, matrix._32); + + ID2D1ImageBrush_GetSourceRectangle(brush, &rect); + match = compare_rect(&rect, 1.0f, 2.0f, 3.0f, 4.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + extend_mode = ID2D1ImageBrush_GetExtendModeX(brush); + ok(extend_mode == D2D1_EXTEND_MODE_WRAP, "Unexpected extend mode %u.\n", extend_mode); + extend_mode = ID2D1ImageBrush_GetExtendModeY(brush); + ok(extend_mode == D2D1_EXTEND_MODE_MIRROR, "Unexpected extend mode %u.\n", extend_mode); + interp_mode = ID2D1ImageBrush_GetInterpolationMode(brush); + ok(interp_mode == D2D1_INTERPOLATION_MODE_LINEAR, "Unexpected interpolation mode %u.\n", interp_mode); + + ID2D1ImageBrush_Release(brush); + + /* Custom brush description and image pointer. */ + brush_desc.opacity = 2.0f; + set_matrix_identity(&brush_desc.transform); + scale_matrix(&brush_desc.transform, 2.0f, 3.0f); + + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, &brush_desc, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_GetImage(brush, &tmp_image); + ok(tmp_image == image, "Got unexpected image %p, expected %p.\n", tmp_image, image); + ID2D1Image_Release(tmp_image); + + opacity = ID2D1ImageBrush_GetOpacity(brush); + ok(opacity == 2.0f, "Unexpected opacity %.8e.\n", opacity); + ID2D1ImageBrush_GetTransform(brush, &matrix); + ok(!memcmp(&matrix, &brush_desc.transform, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + matrix._11, matrix._12, matrix._21, matrix._22, matrix._31, matrix._32); + + ID2D1ImageBrush_Release(brush); + + ID2D1Image_Release(image); + refcount = ID2D1Bitmap_Release(bitmap); + ok(!refcount, "Bitmap has %lu references left.\n", refcount); + + ID2D1DeviceContext_Release(device_context); + release_test_context(&ctx); +} + static void test_linear_brush(BOOL d3d11) { D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES gradient_properties; @@ -10919,6 +11033,7 @@ START_TEST(d2d1) queue_test(test_state_block); queue_test(test_color_brush); queue_test(test_bitmap_brush); + queue_test(test_image_brush); queue_test(test_linear_brush); queue_test(test_radial_brush); queue_test(test_path_geometry);

1 0

Zebediah Figura : include: Constify the RAWINPUTDEVICE pointer parameter to RegisterRawInputDevices().
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: ab34fb78f86698e7c1bb98b673aea33e908bfaaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab34fb78f86698e7c1bb98b6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 18:31:23 2022 -0500 include: Constify the RAWINPUTDEVICE pointer parameter to RegisterRawInputDevices(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 2 +- include/winuser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a774f12231b..a014066f988 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -470,7 +470,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun /*********************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, UINT device_count, UINT size) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(const RAWINPUTDEVICE *devices, UINT device_count, UINT size) { struct rawinput_device *d; BOOL ret; diff --git a/include/winuser.h b/include/winuser.h index a227b912e0e..fd3ea879731 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4120,7 +4120,7 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); -WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); +WINUSERAPI BOOL WINAPI RegisterRawInputDevices(const RAWINPUTDEVICE *,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG);

1 0

James McDonnell : d2d1: Add a stub for ID2D1PathGeometry1.
by Alexandre Julliard May 16, 2022

May 16, 2022

Module: wine Branch: master Commit: 67b70b867e9a9e93fc7e1bfe36acdca358baa5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=67b70b867e9a9e93fc7e1bfe… Author: James McDonnell <topgamer7(a)gmail.com> Date: Mon May 16 08:38:08 2022 +0300 d2d1: Add a stub for ID2D1PathGeometry1. Signed-off-by: James McDonnell <topgamer7(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/factory.c | 14 +++++++-- dlls/d2d1/geometry.c | 82 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 59 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67b70b867e9a9e93fc7e…

1 0