December 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Return E_UNEXPECTED when calling IWMReader::Stop() if no stream is open.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: 78f916f598b4e0acadbda2c095058bf8a268eb72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f916f598b4e0acadbda2c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 15 11:50:19 2021 -0600 winegstreamer: Return E_UNEXPECTED when calling IWMReader::Stop() if no stream is open. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52038 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 8 ++++++++ dlls/wmvcore/tests/wmvcore.c | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 18698a698e2..aa15a5a77f9 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -356,6 +356,14 @@ static HRESULT WINAPI WMReader_Stop(IWMReader *iface) TRACE("reader %p.\n", reader); EnterCriticalSection(&reader->reader.cs); + + if (!reader->reader.wg_parser) + { + LeaveCriticalSection(&reader->reader.cs); + WARN("No stream is open; returning E_UNEXPECTED.\n"); + return E_UNEXPECTED; + } + stop_streaming(reader); IWMReaderCallback_OnStatus(reader->callback, WMT_STOPPED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index e27011f49a0..66ad89a185e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2169,6 +2169,9 @@ static void test_async_reader_streaming(void) IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); + hr = IWMReader_Stop(reader); + ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); @@ -2257,6 +2260,9 @@ static void test_async_reader_streaming(void) ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); callback_cleanup(&callback); + hr = IWMReader_Stop(reader); + ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename);

1 0

Zebediah Figura : qasf/tests: Test that the DMO wrapper (de)commits its source pins' allocators when changing state.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: 617c9b4692a1e87e4b79dab71d8f1a7e702212ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=617c9b4692a1e87e4b79dab7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 15 11:50:49 2021 -0600 qasf/tests: Test that the DMO wrapper (de)commits its source pins' allocators when changing state. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index bd87a3494b2..9cebbda3af2 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1375,10 +1375,12 @@ static void test_sink_allocator(IMemInputPin *input) IMemAllocator_Release(ret_allocator); } -static void test_source_allocator(IFilterGraph2 *graph, IPin *source, struct testfilter *testsink) +static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, + IPin *source, struct testfilter *testsink) { ALLOCATOR_PROPERTIES props, req_props = {2, 30000, 32, 0}; IMemAllocator *allocator; + IMediaSample *sample; HRESULT hr; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt2); @@ -1392,6 +1394,22 @@ static void test_source_allocator(IFilterGraph2 *graph, IPin *source, struct tes ok(props.cbAlign == 1, "Got alignment %d.\n", props.cbAlign); ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); @@ -1500,7 +1518,8 @@ static void test_filter_state(IMediaControl *control) ok(state == State_Stopped, "Got state %u.\n", state); } -static void test_sample_processing(IMediaControl *control, IMemInputPin *input) +static void test_sample_processing(IMediaControl *control, IMemInputPin *input, + struct testfilter *testsink) { REFERENCE_TIME start, stop; IMemAllocator *allocator; @@ -1863,7 +1882,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); test_filter_state(control); - test_sample_processing(control, meminput); + test_sample_processing(control, meminput, &testsink); /* Streaming event tests are more interesting if multiple source pins are * connected. */ @@ -2007,7 +2026,7 @@ static void test_connect_pin(void) ok(!testdmo_input_mt_set, "Input type should not be set.\n"); - test_source_allocator(graph, source, &testsink); + test_source_allocator(graph, control, source, &testsink); IPin_Release(sink); IPin_Release(source);

1 0

Alexandre Julliard : ntdll/tests: Fix some exception test failures on Windows.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: c372d155ece56073138d4f1d9e5694433a114a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c372d155ece56073138d4f1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 15:31:42 2021 +0100 ntdll/tests: Fix some exception test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1a7993c75de..2bceca204be 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4367,7 +4367,8 @@ static void test_wow64_context(void) ok( ctx.Esp == context.Rsp, "cs32: esp %08x / %p\n", ctx.Esp, (void *)context.Rsp ); ok( ctx.Eax == context.Rax, "cs32: eax %08x / %p\n", ctx.Eax, (void *)context.Rax ); ok( ctx.Ebx == context.Rbx, "cs32: ebx %08x / %p\n", ctx.Ebx, (void *)context.Rbx ); - ok( ctx.Ecx == context.Rcx, "cs32: ecx %08x / %p\n", ctx.Ecx, (void *)context.Rcx ); + ok( ctx.Ecx == context.Rcx || broken(ctx.Ecx == (ULONG)context.Rcx), + "cs32: ecx %08x / %p\n", ctx.Ecx, (void *)context.Rcx ); ok( ctx.Edx == context.Rdx, "cs32: edx %08x / %p\n", ctx.Edx, (void *)context.Rdx ); ok( ctx.Esi == context.Rsi, "cs32: esi %08x / %p\n", ctx.Esi, (void *)context.Rsi ); ok( ctx.Edi == context.Rdi, "cs32: edi %08x / %p\n", ctx.Edi, (void *)context.Rdi ); @@ -4402,7 +4403,6 @@ static void test_wow64_context(void) ok( res == cpu_size, "wrong len %lx\n", res ); ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "cs32: got context flags %#x\n", ctx_ptr->ContextFlags); - ok(ctx_ptr->Eip != ctx.Eip, "cs32: got eip %08x / %08x\n", ctx_ptr->Eip, ctx.Eip); /* changing either context changes the actual cpu context */ rcx = context.Rcx; @@ -4447,9 +4447,11 @@ static void test_wow64_context(void) ok( ctx.Esp >= teb32.DeallocationStack && ctx.Esp <= teb32.Tib.StackBase, "cs64: esp not inside 32-bit stack %08x / %08x-%08x\n", ctx.Esp, teb32.DeallocationStack, teb32.Tib.StackBase ); - ok( (void *)context.Rsp >= teb.DeallocationStack && (void *)context.Rsp <= teb.Tib.StackBase, - "cs64: rsp not inside 64-bit stack %p / %p-%p\n", (void *)context.Rsp, - teb.DeallocationStack, teb.Tib.StackBase ); + ok( ((void *)context.Rsp >= teb.DeallocationStack && (void *)context.Rsp <= teb.Tib.StackBase) || + (context.Rsp >= teb32.DeallocationStack && context.Rsp <= teb32.Tib.StackBase), + "cs64: rsp not inside stack %p / 64-bit %p-%p 32-bit %p-%p\n", (void *)context.Rsp, + teb.DeallocationStack, teb.Tib.StackBase, + ULongToPtr(teb32.DeallocationStack), ULongToPtr(teb32.Tib.StackBase) ); if (pRtlWow64GetCpuAreaInfo) { @@ -4669,7 +4671,6 @@ static void test_kiuserexceptiondispatcher(void) *(ULONG_PTR *)(hook_trampoline + 34) = (ULONG_PTR)pKiUserExceptionDispatcher; trampoline_ptr = (char *)code_mem + 1024; memcpy(trampoline_ptr, hook_trampoline, sizeof(hook_trampoline)); - ok(((ULONG64)trampoline_ptr & 0xffffffff) == (ULONG64)trampoline_ptr, "Address is too long.\n"); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), PAGE_EXECUTE_READWRITE, &old_protect); @@ -8907,7 +8908,7 @@ static void test_suspend_process(void) ok(!status, "Failed to resume a process, status %#x.\n", status); ResetEvent(event2); - ret = WaitForSingleObject(event2, 200); + ret = WaitForSingleObject(event2, 1000); ok(ret == WAIT_OBJECT_0, "Wait failed.\n"); SetEvent(event);

1 0

Connor McAdams : ws2_32: Return WSAEINVAL from GetAddrInfoExOverlappedResult if overlapped is NULL.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: 2f9f126a6e7f663446e05366183f2ede16cb58a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9f126a6e7f663446e05366… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Dec 15 13:30:03 2021 -0500 ws2_32: Return WSAEINVAL from GetAddrInfoExOverlappedResult if overlapped is NULL. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 4 ++++ dlls/ws2_32/tests/protocol.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 239e4d14cd2..867e9513ca2 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -514,6 +514,10 @@ int WINAPI GetAddrInfoExW( const WCHAR *name, const WCHAR *servname, DWORD names int WINAPI GetAddrInfoExOverlappedResult( OVERLAPPED *overlapped ) { TRACE( "(%p)\n", overlapped ); + + if (!overlapped) + return WSAEINVAL; + return overlapped->Internal; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 6eebb5f6b4d..881e3a388fd 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1904,6 +1904,9 @@ static void test_GetAddrInfoExW(void) ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); pFreeAddrInfoExW(result); + ret = pGetAddrInfoExOverlappedResult(NULL); + ok(ret == WSAEINVAL, "overlapped result is %d\n", ret); + result = (void *)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); overlapped.hEvent = event;

1 0

Eric Pouech : start: Ignore Ctrl-C and let the child decides what to do with it.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: ff7ff4d0b4deb40b4580fafca15bf3bbd0bf58d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff7ff4d0b4deb40b4580fafc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 15 16:52:46 2021 +0100 start: Ignore Ctrl-C and let the child decides what to do with it. Based on a patch from Bernhard Übelacker Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51766 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/start/start.c b/programs/start/start.c index e78968e2052..dcd0a113f59 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -676,6 +676,7 @@ done: if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode; + SetConsoleCtrlHandler(NULL, TRUE); WaitForSingleObject(sei.hProcess, INFINITE); GetExitCodeProcess(sei.hProcess, &exitcode); ExitProcess(exitcode);

1 0

Alexandre Julliard : ntdll/tests: Fix some directory test failures on Windows.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: 1887df5cd8e86afeb21077b93b81031f75466bed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1887df5cd8e86afeb21077b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 15 16:19:08 2021 +0100 ntdll/tests: Fix some directory test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 6a423174664..8a8047c6392 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -381,8 +381,9 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma if (status == STATUS_BUFFER_OVERFLOW) { ok( U(io).Status == STATUS_BUFFER_OVERFLOW, "%u: wrong status %x\n", class, U(io).Status ); - ok( U(io).Information == data_size, "%u: wrong info %lx\n", class, U(io).Information ); - ok(data[0] == 0, "%u: wrong offset %x\n", class, data[0] ); + ok( U(io).Information == data_size || broken(!U(io).Information), /* win10 1709 */ + "%u: wrong info %lx\n", class, U(io).Information ); + if (U(io).Information) ok(data[0] == 0, "%u: wrong offset %x\n", class, data[0] ); } else { @@ -653,11 +654,12 @@ static void test_NtQueryDirectoryFile(void) memset( data, 0x55, data_size ); U(io).Status = 0xdeadbeef; U(io).Information = 0xdeadbeef; - status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size, + status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, (data_size + 7) & ~7, FileBothDirectoryInformation, FALSE, NULL, TRUE ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(io).Status == STATUS_SUCCESS, "wrong status %x\n", U(io).Status ); - ok( U(io).Information == data_size, "wrong info %lx / %x\n", U(io).Information, data_size ); + ok( U(io).Information == data_size || U(io).Information == ((data_size + 7) & ~7), + "wrong info %lx / %x\n", U(io).Information, data_size ); ok( fbdi->NextEntryOffset == ((offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[1] ) + 7) & ~7), "wrong offset %x\n", fbdi->NextEntryOffset ); ok( fbdi->FileNameLength == sizeof(WCHAR), "wrong length %x\n", fbdi->FileNameLength );

1 0

Dmitry Timoshkov : shell32: Add support for IDragSourceHelper2 interface.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: a6445025a3d6707a200e61e0852550c54056e192 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6445025a3d6707a200e61e0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 15 16:37:28 2021 +0300 shell32: Add support for IDragSourceHelper2 interface. The program that I have here fails if IDragSourceHelper2::SetFlags() returns E_NOTIMPL. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dragdrophelper.c | 56 +++++++++++++++++++++++++------------------ include/shobjidl.idl | 15 ++++++++++++ 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 53bbe46cb14..00db2163750 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct { IDropTargetHelper IDropTargetHelper_iface; - IDragSourceHelper IDragSourceHelper_iface; + IDragSourceHelper2 IDragSourceHelper2_iface; LONG ref; } dragdrophelper; @@ -56,9 +56,9 @@ static inline dragdrophelper *impl_from_IDropTargetHelper(IDropTargetHelper *ifa return CONTAINING_RECORD(iface, dragdrophelper, IDropTargetHelper_iface); } -static inline dragdrophelper *impl_from_IDragSourceHelper(IDragSourceHelper *iface) +static inline dragdrophelper *impl_from_IDragSourceHelper2(IDragSourceHelper2 *iface) { - return CONTAINING_RECORD(iface, dragdrophelper, IDragSourceHelper_iface); + return CONTAINING_RECORD(iface, dragdrophelper, IDragSourceHelper2_iface); } /************************************************************************** @@ -76,9 +76,9 @@ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * if { *ppvObj = &This->IDropTargetHelper_iface; } - else if (IsEqualIID (riid, &IID_IDragSourceHelper)) + else if (IsEqualIID (riid, &IID_IDragSourceHelper) || IsEqualIID (riid, &IID_IDragSourceHelper2)) { - *ppvObj = &This->IDragSourceHelper_iface; + *ppvObj = &This->IDragSourceHelper2_iface; } if (*ppvObj) { @@ -86,7 +86,7 @@ static HRESULT WINAPI IDropTargetHelper_fnQueryInterface (IDropTargetHelper * if TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); return S_OK; } - FIXME ("-- Interface: E_NOINTERFACE\n"); + FIXME ("%s: E_NOINTERFACE\n", shdebugstr_guid (riid)); return E_NOINTERFACE; } @@ -167,51 +167,61 @@ static const IDropTargetHelperVtbl DropTargetHelperVtbl = IDropTargetHelper_fnShow }; -static HRESULT WINAPI DragSourceHelper_QueryInterface (IDragSourceHelper * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI DragSourceHelper2_QueryInterface (IDragSourceHelper2 * iface, REFIID riid, LPVOID * ppv) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); return IDropTargetHelper_fnQueryInterface(&This->IDropTargetHelper_iface, riid, ppv); } -static ULONG WINAPI DragSourceHelper_AddRef (IDragSourceHelper * iface) +static ULONG WINAPI DragSourceHelper2_AddRef (IDragSourceHelper2 * iface) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); return IDropTargetHelper_fnAddRef(&This->IDropTargetHelper_iface); } -static ULONG WINAPI DragSourceHelper_Release (IDragSourceHelper * iface) +static ULONG WINAPI DragSourceHelper2_Release (IDragSourceHelper2 * iface) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); return IDropTargetHelper_fnRelease(&This->IDropTargetHelper_iface); } -static HRESULT WINAPI DragSourceHelper_InitializeFromBitmap(IDragSourceHelper *iface, +static HRESULT WINAPI DragSourceHelper2_InitializeFromBitmap(IDragSourceHelper2 *iface, SHDRAGIMAGE *dragimage, IDataObject *object) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); FIXME("(%p)->(%p, %p): stub\n", This, dragimage, object); return E_NOTIMPL; } -static HRESULT WINAPI DragSourceHelper_InitializeFromWindow(IDragSourceHelper *iface, HWND hwnd, +static HRESULT WINAPI DragSourceHelper2_InitializeFromWindow(IDragSourceHelper2 *iface, HWND hwnd, POINT *pt, IDataObject *object) { - dragdrophelper *This = impl_from_IDragSourceHelper(iface); + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); FIXME("(%p)->(%p, %s, %p): stub\n", This, hwnd, wine_dbgstr_point(pt), object); return E_NOTIMPL; } -static const IDragSourceHelperVtbl DragSourceHelperVtbl = +static HRESULT WINAPI DragSourceHelper2_SetFlags(IDragSourceHelper2 *iface, DWORD flags) { - DragSourceHelper_QueryInterface, - DragSourceHelper_AddRef, - DragSourceHelper_Release, - DragSourceHelper_InitializeFromBitmap, - DragSourceHelper_InitializeFromWindow + dragdrophelper *This = impl_from_IDragSourceHelper2(iface); + + FIXME("(%p)->(%08x): stub\n", This, flags); + + return S_OK; +} + +static const IDragSourceHelper2Vtbl DragSourceHelper2Vtbl = +{ + DragSourceHelper2_QueryInterface, + DragSourceHelper2_AddRef, + DragSourceHelper2_Release, + DragSourceHelper2_InitializeFromBitmap, + DragSourceHelper2_InitializeFromWindow, + DragSourceHelper2_SetFlags }; /************************************************************************** @@ -233,7 +243,7 @@ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, if (!dth) return E_OUTOFMEMORY; dth->IDropTargetHelper_iface.lpVtbl = &DropTargetHelperVtbl; - dth->IDragSourceHelper_iface.lpVtbl = &DragSourceHelperVtbl; + dth->IDragSourceHelper2_iface.lpVtbl = &DragSourceHelper2Vtbl; dth->ref = 1; hr = IDropTargetHelper_QueryInterface (&dth->IDropTargetHelper_iface, riid, ppv); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 92e4da36c77..c1a36ab5e93 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1576,6 +1576,21 @@ interface IDragSourceHelper : IUnknown } +/***************************************************************************** + * IDragSourceHelper2 interface + */ +[ + object, + uuid(83e07d0d-0c5f-4163-bf1a-60b274051e40), + pointer_default(unique), + local +] +interface IDragSourceHelper2 : IDragSourceHelper +{ + HRESULT SetFlags([in] DWORD dwFlags); +} + + /***************************************************************************** * IDropTargetHelper interface */

1 0

Rémi Bernon : user32: Throttle device list updates from GetRawInputDeviceList.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: a80f76819cf0e173ba17808336c0feb45254f9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a80f76819cf0e173ba178083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 14 21:24:23 2021 +0100 user32: Throttle device list updates from GetRawInputDeviceList. Up to once every 2s. This fixes a regression from c2c78a2fe0ac13e4fca7ab4c17977b65e358485c, which caused severe FPS drop in Samurai Shodown. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51282 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2660874d12c..f3dc4ae67de 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -418,7 +418,8 @@ BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_ms */ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size) { - UINT i; + static UINT last_check; + UINT i, ticks = GetTickCount(); TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); @@ -434,7 +435,11 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } - rawinput_update_device_list(); + if (ticks - last_check > 2000) + { + last_check = ticks; + rawinput_update_device_list(); + } if (!devices) {

1 0

Alex Henrie : advapi32/tests: Accept more broken values in another RegEnumValue name overflow test.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: 8efa9f7604bb2f613c9a795cd69ccf3b28fcb8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=8efa9f7604bb2f613c9a795c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 14 23:14:11 2021 -0700 advapi32/tests: Accept more broken values in another RegEnumValue name overflow test. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c4f63c6cd27..ca371f73d65 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -534,7 +534,8 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 2, "val_count set to %d\n", val_count ); - ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); + /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); ok( !strcmp( data, "xxxxxxxxxx" ), "data set to '%s'\n", data );

1 0

Rémi Bernon : user32: Update rawinput devices on WM_INPUT_DEVICE_CHANGE reception.
by Alexandre Julliard Dec. 15, 2021

Dec. 15, 2021

Module: wine Branch: master Commit: 6a30f12eeffb2a80d2f2579e5f37dd088fbb25f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a30f12eeffb2a80d2f2579e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 14 21:24:22 2021 +0100 user32: Update rawinput devices on WM_INPUT_DEVICE_CHANGE reception. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51282 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 4 +++- dlls/user32/rawinput.c | 8 +++++--- dlls/user32/user_private.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 03fa42f0ae5..d7dbc64d796 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2290,7 +2290,9 @@ static BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardwar { struct rawinput_thread_data *thread_data = rawinput_thread_data(); - if (msg->message == WM_INPUT) + if (msg->message == WM_INPUT_DEVICE_CHANGE) + rawinput_update_device_list(); + else { thread_data->buffer->header.dwSize = RAWINPUT_BUFFER_SIZE; if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) return FALSE; diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 3a316024656..2660874d12c 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -168,7 +168,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return device; } -static void find_devices(void) +void rawinput_update_device_list(void) { SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; @@ -178,6 +178,8 @@ static void find_devices(void) HDEVINFO set; DWORD idx; + TRACE("\n"); + HidD_GetHidGuid(&hid_guid); EnterCriticalSection(&rawinput_devices_cs); @@ -259,7 +261,7 @@ static struct device *find_device_from_handle(HANDLE handle) for (i = 0; i < rawinput_devices_count; ++i) if (rawinput_devices[i].handle == handle) return rawinput_devices + i; - find_devices(); + rawinput_update_device_list(); for (i = 0; i < rawinput_devices_count; ++i) if (rawinput_devices[i].handle == handle) return rawinput_devices + i; @@ -432,7 +434,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } - find_devices(); + rawinput_update_device_list(); if (!devices) { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 96704ac68ae..6923ddb2906 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -160,6 +160,7 @@ struct hardware_msg_data; extern BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_msg_data *msg_data); extern BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage); extern struct rawinput_thread_data *rawinput_thread_data(void); +extern void rawinput_update_device_list(void); extern void create_offscreen_window_surface( const RECT *visible_rect, struct window_surface **surface ) DECLSPEC_HIDDEN;

1 0