- Wine-Devel - list.winehq.org

[PATCH] ws2_32: Always return WSAEINVAL from GetAddrInfoExOverlappedResult if overlapped is NULL.
by Connor McAdams Dec. 15, 2021

Dec. 15, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- 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; -- 2.25.1

1 0

[PATCH vkd3d 1/3] vkd3d: Initialise root signature descriptor offset buffer to NULL.
by Conor McCarthy Dec. 15, 2021

Dec. 15, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/state.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index cb3f99ad..7c9575f6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1141,6 +1141,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->parameters = NULL; root_signature->flags = desc->Flags; root_signature->descriptor_mapping = NULL; + root_signature->descriptor_offsets = NULL; root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; root_signature->device = device; -- 2.33.0

3 5

[PATCH vkd3d 1/6] vkd3d: Change strip cut value FIXMEs to FIXME_ONCE.
by Conor McCarthy Dec. 15, 2021

Dec. 15, 2021

These can generate many messages per frame in some games, e.g. Control. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1db624e0..37159a7f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3070,7 +3070,7 @@ static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_c case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) { - FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", + FIXME_ONCE("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); } break; @@ -3078,7 +3078,7 @@ static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_c case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) { - FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", + FIXME_ONCE("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); } break; -- 2.33.0

3 9

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

Dec. 15, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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); -- 2.34.1

1 0

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

Dec. 15, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52038 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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); -- 2.34.1

1 0

Wayland driver development - December 2021 update and next steps
by Alexandros Frantzis Dec. 15, 2021

Dec. 15, 2021

Hi everyone! Since the last Wayland driver update [1] a lot of work has been done to improve the functionality and stability of the Wine Wayland driver, and to provide a cleaner and more reviewable/upstreamable patchset. The driver has now reached a point where it would benefit from wider community testing. In the mailing list discussions earlier this year it was recommended that we go through wine-staging as a stepping stone towards upstream. To this end, I have prepared a patchset and attached it to the existing bug for a Wayland driver, as per the wine-staging guidelines, at: https://bugs.winehq.org/show_bug.cgi?id=42284 This is intended to be an active patchset, meaning that it will receive updates regularly, as feedback is received and issues are fixed. Development will continue in the development branch (currently at [2]) which will be used as the canonical source for any updated patchsets for wine-staging. The vast majority (but not all) of the commits in the series affect only the driver itself. However, there is still a lot of surface area, mostly in terms of interfaces used to interact with Wine core, that could lead to broken code when upstream is updated. This has been more pronounced the last few weeks with the various changes in the driver interface. I will be tracking upstream and providing updated patchsets as needed and as timely as I can. I want to make sure that this patchset will not cause undue burden on the wine-staging maintainers. However, if the maintainers feel that this patchset will make life difficult for them, I am open to different ideas about how to move this driver towards upstream. A related question now that holiday season is approaching: what happens if a wine-staging patch breaks due to an upstream change, such that it requires intervention from the original author, but this is not provided in time for the next release? Is the patchset disabled for that wine-staging release and re-enabled when fixed? Let me stress again that my aim is to track upstream and respond in a timely manner, but sometimes this is not possible, and I want to be clear about how the situation is handled. --- Now, some information about the state of the driver. First of all a non-exhaustive list of what's supported, minus bugs: * Window state handling: resizing, maximization, minimization (often no proper minimized window contents, though), fullscreen. * OpenGL and Vulkan (including using wined3d and DXVK). * Display mode changes (emulated with compositor scaling, rather than real display hardware mode changes). * Multiple monitors. * Mouse capture/clipping/relative motion (but note that Wayland compositors don't tend to deal with non-fullscreen cases very well). * Popups, menus and other transient windows (except when cross-process, see below). * Keymaps set/updated from the Wayland compositor should work transparently. * HiDPI scaling (configurable to use either application/wine or compositor scaling). * Copy/paste both ways, drag and drop in the direction from native Wayland to Wine. * Systray (minus right-click menu positioning, see below). TL;DR of how to use the development branch: $ git clone -b wayland https://gitlab.collabora.com/alf/wine/ $ cd wine $ ./configure --with-wayland [--with-vulkan --with-vkd3d] $ make [-jN] $ DISPLAY= WAYLAND_DISPLAY=wayland-0 ./wine ... There are some known cases where the driver doesn't work properly, that I think deserve an explicit mention since they may trip people up. The first is when applications try to render to window created by another process. Although this not a typical scenario, it's how Chrome/Chromium and thus applications using CEF, including some game store apps, work. For now, the workaround is to instruct the application to use "in-process" GPU handling (with the "--in-process-gpu" command-line) or turn-off GPU rendering completely (typically with "--disable-gpu --disable-software-rasterizer"). For example, one can run GOG Galaxy with: "GalaxyClient.exe --in-process-gpu [--use-angle=d3d11]" Some applications launch a separate CEF process internally, so passing the flag in the command line doesn't work, it needs to be passed to the CEF process instead. I have had some good results with detecting and overriding the arguments in CreateProcessInternalW (e.g., Rockstar Launcher), but of course that's a complete hack. I am trying to find a way to resolve this issue, but the solution is still an open question, and could require a Wayland extension, although there other (more complex) possibilities I need to explore further. The second case involves the standalone systray included in the driver, based on the one from winex11. Due to the context/right-click menu being drawn from a process different from the one owning the systray window, the driver heuristics to anchor the window to its effective Wayland surface parent don't work. The practical effect is that the menu is rendered as a Wayland toplevel and thus placed by the Wayland compositor at arbitrary locations on screen (although it's still usable). Finally, please note that although there are certainly still bugs in the Wayland driver, Wayland compositors also have their share fair of issues (my main testing happens on Weston, GNOME and occasionally kwin). So, please try to use a recent version of your favorite compositor, so that you can enjoy the best possible experience. Thanks, Alexandros [1] https://www.winehq.org/pipermail/wine-devel/2021-June/188412.html [2] https://gitlab.collabora.com/alf/wine/-/commits/wayland

7 17

[PATCH v3] wined3d: Do not bind buffers in state_cb() if the shader is not set.
by Conor McCarthy Dec. 15, 2021

Dec. 15, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52020 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v3: Set the constant buffer dirty flag when shaders change from null to non-null. --- dlls/wined3d/cs.c | 3 +++ dlls/wined3d/state.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bb629d9b2..009ad561b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1768,6 +1768,9 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_shader *op = data; + /* CB binding may have been skipped earlier if the shader wasn't set, so make it happen. */ + if (!cs->state.shader[op->type] && op->shader) + device_invalidate_state(cs->c.device, STATE_CONSTANT_BUFFER(op->type)); cs->state.shader[op->type] = op->shader; device_invalidate_state(cs->c.device, STATE_SHADER(op->type)); if (op->type != WINED3D_SHADER_TYPE_COMPUTE) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 865c60d18..208014e20 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4579,6 +4579,10 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state else shader_type = WINED3D_SHADER_TYPE_COMPUTE; + /* If a shader has not been set, buffer objects are not yet initialised. */ + if (!state->shader[shader_type]) + return; + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, &count); for (i = 0; i < count; ++i) { -- 2.33.0

2 1

[PATCH 0/2] Debuggers and ctrl-C
by Eric Pouech Dec. 15, 2021

Dec. 15, 2021

WineDbg both in regular mode and in gdb proxy mode, no longer properly reacts to ctrl-c (which is supposed when debuggee is running, to stop the debuggee execution and reenter debugger where the debuggee has stopped). Currently, it just terminates WineDbg (and gdb in proxy mode). First, start.exe, for any child process shouldn't handle the ctrl-c event. It's up to child to decide what to do with it. Quitting start.exe too early detaches all start.exe's children and grand* children from the Unix console, which prevents any user input. Then in proxy mode, only gdb should handle ctrl-c (winedbg must be transparent). With those two patches applied, both situations are now properly handled. A+ --- Eric Pouech (2): programs/start: ignore Ctrl-C and let the child decides what to do with it. programs/winedbg: in gdb proxy mode, ignore ctrl-c programs/start/start.c | 1 + programs/winedbg/gdbproxy.c | 2 ++ 2 files changed, 3 insertions(+)

1 2

[PATCH] shell32: Add support for IDragSourceHelper2 interface.
by Dmitry Timoshkov Dec. 15, 2021

Dec. 15, 2021

The program that I have here fails if IDragSourceHelper2::SetFlags() returns E_NOTIMPL. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 */ -- 2.34.1

1 0

[PATCH v2] wined3d: Do not bind buffers in state_cb() if the shader is not set.
by Conor McCarthy Dec. 15, 2021

Dec. 15, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52020 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Check for null shader instead of null for each buffer. Supersedes 222083. --- dlls/wined3d/state.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 865c60d18..85d52fc8b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4579,6 +4579,10 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state else shader_type = WINED3D_SHADER_TYPE_COMPUTE; + /* If a shader has not been set, buffer objects are not initialised. */ + if (!state->shader[shader_type]) + return; + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, &count); for (i = 0; i < count; ++i) { -- 2.33.0

2 1