April 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Only apply horizontal offset when setting header position.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: d92906249fd4abd75d5d2ee2fba966855fac2e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d92906249fd4abd75d5d2ee2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 11:43:39 2020 +0300 comctl32/listview: Only apply horizontal offset when setting header position. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2dd25908db..f1f09d201e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11086,7 +11086,6 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) rect = infoPtr->rcList; rect.left += origin.x; - rect.top += origin.y; hl.prc = &rect; hl.pwpos = &wp;

1 0

Brendan Shanks : dinput/tests: Test IDirectInputEffect::SetParameters() with a zeroed DIEFFECT and flags=0.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 23a55927af29db5a9634b98c388f09cf383ad39d URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a55927af29db5a9634b98c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 23 22:40:16 2020 -0700 dinput/tests: Test IDirectInputEffect::SetParameters() with a zeroed DIEFFECT and flags=0. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index a3d7440367..810707c02a 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -600,6 +600,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) struct DIPROPDWORD diprop_word; void *tmp; GUID guid = {0}; + DIEFFECT effect_empty; hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &effect_data.guid); @@ -658,7 +659,15 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); - hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_START); + /* SetParameters with a zeroed-out DIEFFECT and flags=0 should do nothing. */ + memset(&effect_empty, 0, sizeof(effect_empty)); + effect_empty.dwSize = sizeof(effect_empty); + hr = IDirectInputEffect_SetParameters(effect, &effect_empty, 0); + todo_wine + ok(hr==DI_NOEFFECT,"IDirectInputEffect_SetParameters failed: %08x\n", hr); + /* Start effect with SetParameters and a zeroed-out DIEFFECT. */ + hr = IDirectInputEffect_SetParameters(effect, &effect_empty, DIEP_START); + todo_wine ok(hr==DI_OK,"IDirectInputEffect_SetParameters failed: %08x\n", hr); hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr);

1 0

Zebediah Figura : qcap/filewriter: Post EC_COMPLETE on receiving EOS.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: dc78a97c30e872dac3083a09ec728ba42fda09d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc78a97c30e872dac3083a09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 23 20:47:07 2020 -0500 qcap/filewriter: Post EC_COMPLETE on receiving EOS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 42 +++++++++++++++++++++++++++++++++++ dlls/qcap/tests/filewriter.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 4d9262e757..5e63facf7b 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -36,6 +36,8 @@ struct file_writer WCHAR *filename; HANDLE file; + + BOOL eos; }; static inline struct file_writer *impl_from_strmbase_pin(struct strmbase_pin *iface) @@ -90,11 +92,40 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed return S_OK; } +static void deliver_ec_complete(struct file_writer *filter) +{ + IMediaEventSink *event_sink; + + if (SUCCEEDED(IFilterGraph_QueryInterface(filter->filter.graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } +} + +static HRESULT file_writer_sink_eos(struct strmbase_sink *iface) +{ + struct file_writer *filter = impl_from_strmbase_pin(&iface->pin); + + EnterCriticalSection(&filter->filter.csFilter); + + if (filter->filter.state == State_Running) + deliver_ec_complete(filter); + else + filter->eos = TRUE; + + LeaveCriticalSection(&filter->filter.csFilter); + return S_OK; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = file_writer_sink_query_interface, .base.pin_query_accept = file_writer_sink_query_accept, .pfnReceive = file_writer_sink_receive, + .sink_eos = file_writer_sink_eos, }; static inline struct file_writer *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -151,6 +182,16 @@ static HRESULT file_writer_init_stream(struct strmbase_filter *iface) return S_OK; } +static HRESULT file_writer_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start) +{ + struct file_writer *filter = impl_from_strmbase_filter(iface); + + if (filter->eos) + deliver_ec_complete(filter); + filter->eos = FALSE; + return S_OK; +} + static HRESULT file_writer_cleanup_stream(struct strmbase_filter *iface) { struct file_writer *filter = impl_from_strmbase_filter(iface); @@ -165,6 +206,7 @@ static struct strmbase_filter_ops filter_ops = .filter_get_pin = file_writer_get_pin, .filter_destroy = file_writer_destroy, .filter_init_stream = file_writer_init_stream, + .filter_start_stream = file_writer_start_stream, .filter_cleanup_stream = file_writer_cleanup_stream, }; diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index 7e8a91d3fb..e3bdcb7656 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -678,6 +678,57 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, IMediaSample_Release(sample); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IFilterGraph2 *graph, IMediaControl *control, IPin *pin) +{ + IMediaEvent *eventsrc; + HRESULT hr; + BOOL ret; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaEvent_Release(eventsrc); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -738,6 +789,7 @@ static void test_connect_pin(void) test_allocator(meminput, allocator); test_filter_state(control); test_sample_processing(control, meminput, allocator, filename); + test_eos(graph, control, pin); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Jacek Caban : msvcp60: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 281c58bc43e783050b8b8b2d8500150965a7b867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=281c58bc43e783050b8b8b2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:23 2020 +0200 msvcp60: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index ed1be5b693..7e62f60574 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -675,9 +675,7 @@ DEFINE_RTTI_DATA8(strstream, sizeof(strstream), &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, "?AVstrstream(a)std@@") -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(ios_vtables) __ASM_VTABLE(iosb, VTABLE_ADD_FUNC(iosb_vector_dtor)); __ASM_VTABLE(ios_base, @@ -940,9 +938,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ostrstream_vector_dtor)); __ASM_VTABLE(strstream, VTABLE_ADD_FUNC(strstream_vector_dtor)); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END /* ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAD00(a)Z */ /* ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXPEAD00(a)Z */

1 0

Jacek Caban : msvcirt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: fff313f1832cd81b37c718b81697ad68e74d7170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fff313f1832cd81b37c718b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:16 2020 +0200 msvcirt: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 797b0b1b56..360d34653f 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -199,9 +199,7 @@ extern const vtable_ptr MSVCP_strstream_vtable; /* ??_7stdiostream@@6B@ */ extern const vtable_ptr MSVCP_stdiostream_vtable; -#ifndef __GNUC__ -void __asm_dummy_vtables(void) { -#endif +__ASM_BLOCK_BEGIN(vtables) __ASM_VTABLE(streambuf, VTABLE_ADD_FUNC(streambuf_vector_dtor) VTABLE_ADD_FUNC(streambuf_sync) @@ -270,9 +268,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(iostream_vector_dtor)); __ASM_VTABLE(stdiostream, VTABLE_ADD_FUNC(iostream_vector_dtor)); -#ifndef __GNUC__ -} -#endif +__ASM_BLOCK_END #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) #define VBTABLE_ENTRY(class, offset, vbase) ALIGNED_SIZE(sizeof(class), TYPE_ALIGNMENT(vbase))-offset

1 0

Jacek Caban : wine/asm.h: Introduce __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 541048868d44512fbd074cbfb7dea28c620ba7d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=541048868d44512fbd074cbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:10:07 2020 +0200 wine/asm.h: Introduce __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index a036744674..2a4f06cb92 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -55,16 +55,20 @@ # define __ASM_FUNC_TYPE(name) ".type " name ",@function" #endif -#ifdef __GNUC__ -# define __ASM_DEFINE_FUNC(name,code) \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); +#if !defined(__GNUC__) && !defined(__clang__) +# define __ASM_BLOCK_BEGIN(name) void __asm_dummy_##name(void) { +# define __ASM_BLOCK_END } #else -# define __ASM_DEFINE_FUNC(name,code) void __asm_dummy_##__LINE__(void) { \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); } +# define __ASM_BLOCK_BEGIN(name) +# define __ASM_BLOCK_END #endif +#define __ASM_DEFINE_FUNC(name,code) \ + __ASM_BLOCK_BEGIN(__LINE__) \ + asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ + __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); \ + __ASM_BLOCK_END + #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code)

1 0

Zebediah Figura : wineusb.sys: Correctly implement device removal.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 23081e8ebdf57757aa8c149fede66d19f05e94bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=23081e8ebdf57757aa8c149f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 11:44:01 2020 -0500 wineusb.sys: Correctly implement device removal. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 55bd84ea30..d79112b479 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -69,6 +69,7 @@ static struct list device_list = LIST_INIT(device_list); struct usb_device { struct list entry; + BOOL removed; DEVICE_OBJECT *device_obj; @@ -126,6 +127,7 @@ static void add_usb_device(libusb_device *libusb_device) EnterCriticalSection(&wineusb_cs); list_add_tail(&device_list, &device->entry); + device->removed = FALSE; LeaveCriticalSection(&wineusb_cs); IoInvalidateDeviceRelations(bus_pdo, BusRelations); @@ -142,15 +144,14 @@ static void remove_usb_device(libusb_device *libusb_device) { if (device->libusb_device == libusb_device) { - libusb_unref_device(device->libusb_device); - libusb_close(device->handle); list_remove(&device->entry); - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - IoDeleteDevice(device->device_obj); + device->removed = TRUE; break; } } LeaveCriticalSection(&wineusb_cs); + + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } static BOOL thread_shutdown; @@ -378,8 +379,38 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) case IRP_MN_START_DEVICE: case IRP_MN_QUERY_CAPABILITIES: + case IRP_MN_SURPRISE_REMOVAL: + ret = STATUS_SUCCESS; + break; + + case IRP_MN_REMOVE_DEVICE: + { + LIST_ENTRY *entry; + + EnterCriticalSection(&wineusb_cs); + while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) + { + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp->IoStatus.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + LeaveCriticalSection(&wineusb_cs); + + if (device->removed) + { + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + IoDeleteDevice(device->device_obj); + return STATUS_SUCCESS; + } + ret = STATUS_SUCCESS; break; + } default: FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);

1 0

Damjan Jovanovic : mshtml: Fix handling res protocol resource type ids without leading '#'.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: f9da9675f001ab5731212e8bd2b9d17c19adb16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9da9675f001ab5731212e8b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 24 18:37:27 2020 +0200 mshtml: Fix handling res protocol resource type ids without leading '#'. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/protocol.c | 5 +++++ dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 0f06896c49..8677030c35 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -585,7 +585,12 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, *res_type++ = 0; if ((url_file = wcschr(res_type, '/'))) { + DWORD res_type_id; + WCHAR *endpoint; *url_file++ = 0; + res_type_id = wcstol(res_type, &endpoint, 10); + if(!*endpoint) + res_type = MAKEINTRESOURCEW(res_type_id); }else { url_file = res_type; res_type = (LPWSTR)RT_HTML; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index ba767d21c6..75063f5ecf 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -596,6 +596,13 @@ static void test_res_protocol(void) IUnknown_Release(unk); + test_res_url("/blank.html"); + test_res_url("/123"); + test_res_url("/#23/blank.html"); + test_res_url("/#23/123"); + test_res_url("/23/blank.html"); + test_res_url("/23/123"); + test_res_url("/jstest.html"); test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html");

1 0

Nikolay Sivov : mf: Handle null marker context for sample grabber stream.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: a12b5fe084510fab7f5b0e3a6665160becb59511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a12b5fe084510fab7f5b0e3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 17:47:03 2020 +0300 mf: Handle null marker context for sample grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 21f89c0ad0..2167b5001e 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -446,7 +446,7 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ const PROPVARIANT *context_value) { struct scheduled_item *item; - HRESULT hr; + HRESULT hr = S_OK; if (list_empty(&grabber->items)) { @@ -460,7 +460,9 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ item->type = ITEM_TYPE_MARKER; item->u.marker.type = marker_type; list_init(&item->entry); - hr = PropVariantCopy(&item->u.marker.context, context_value); + PropVariantInit(&item->u.marker.context); + if (context_value) + hr = PropVariantCopy(&item->u.marker.context, context_value); if (SUCCEEDED(hr)) list_add_tail(&grabber->items, &item->entry); else

1 0

Brendan Shanks : dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: cf40880c69a3095c0c7f0e8a30b72e53ccbb5648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf40880c69a3095c0c7f0e8a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 23 22:31:12 2020 -0700 dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 19dd9ad736..2eab4d3a33 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -241,34 +241,42 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) if (type == DIEFT_CONSTANTFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) { WARN("Effect claims to be a constant force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DICONSTANTFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_PERIODIC) { if (eff->cbTypeSpecificParams != sizeof(DIPERIODIC)) { WARN("Effect claims to be a periodic force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DIPERIODIC(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_RAMPFORCE) { if (eff->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) { WARN("Effect claims to be a ramp force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DIRAMPFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_CONDITION) { - if (eff->cbTypeSpecificParams == sizeof(DICONDITION)) { + if (eff->cbTypeSpecificParams == sizeof(DICONDITION) && eff->lpvTypeSpecificParams) { _dump_DICONDITION(eff->lpvTypeSpecificParams); - } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION)) { + } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION) && eff->lpvTypeSpecificParams) { DICONDITION *condition = eff->lpvTypeSpecificParams; _dump_DICONDITION(&condition[0]); _dump_DICONDITION(&condition[1]); } else { - WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n"); + WARN("Effect claims to be a condition but the type-specific params are the wrong size or NULL!\n"); } } else if (type == DIEFT_CUSTOMFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICUSTOMFORCE)) { WARN("Effect claims to be a custom force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DICUSTOMFORCE(eff->lpvTypeSpecificParams); }

1 0