- Wine-Devel - list.winehq.org

[PATCH 2/8] d3d9/tests: Check device window rect after reset.
by Henri Verbeet July 7, 2020

July 7, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 188409. dlls/d3d9/tests/d3d9ex.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index dab5cf6d8df..f475d55cc89 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3559,6 +3559,14 @@ static void test_window_style(void) hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + GetWindowRect(device_window, &r); + if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) + todo_wine ok(EqualRect(&r, &device_rect), "Expected %s, got %s, i=%u.\n", + wine_dbgstr_rect(&device_rect), wine_dbgstr_rect(&r), i); + else + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s, i=%u.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r), i); + style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style; todo_wine_if (!(tests[i].style_flags & WS_VISIBLE)) -- 2.20.1

2 1

[PATCH 1/8] dxgi/tests: Add more complete window style checks.
by Henri Verbeet July 7, 2020

July 7, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 188407. dlls/dxgi/tests/dxgi.c | 86 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 8f52e1d9e72..92d65c8b4af 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -340,6 +340,8 @@ static BOOL output_belongs_to_adapter(IDXGIOutput *output, IDXGIAdapter *adapter struct fullscreen_state { + DWORD style; + DWORD exstyle; RECT window_rect; RECT client_rect; HMONITOR monitor; @@ -359,6 +361,9 @@ static void capture_fullscreen_state_(unsigned int line, struct fullscreen_state MONITORINFOEXW monitor_info; BOOL ret; + state->style = GetWindowLongA(window, GWL_STYLE); + state->exstyle = GetWindowLongA(window, GWL_EXSTYLE); + ret = GetWindowRect(window, &state->window_rect); ok_(__FILE__, line)(ret, "GetWindowRect failed.\n"); ret = GetClientRect(window, &state->client_rect); @@ -373,10 +378,16 @@ static void capture_fullscreen_state_(unsigned int line, struct fullscreen_state state->monitor_rect = monitor_info.rcMonitor; } -#define check_fullscreen_state(a, b) check_fullscreen_state_(__LINE__, a, b) static void check_fullscreen_state_(unsigned int line, const struct fullscreen_state *state, - const struct fullscreen_state *expected_state) + const struct fullscreen_state *expected_state, BOOL windowed) { + todo_wine_if(!windowed) + ok_(__FILE__, line)((state->style & ~WS_VISIBLE) == (expected_state->style & ~WS_VISIBLE), + "Got style %#x, expected %#x.\n", + state->style & ~(DWORD)WS_VISIBLE, expected_state->style & ~(DWORD)WS_VISIBLE); + ok_(__FILE__, line)((state->exstyle & ~WS_EX_TOPMOST) == (expected_state->exstyle & ~WS_EX_TOPMOST), + "Got exstyle %#x, expected %#x.\n", + state->exstyle & ~(DWORD)WS_EX_TOPMOST, expected_state->exstyle & ~(DWORD)WS_EX_TOPMOST); ok_(__FILE__, line)(EqualRect(&state->window_rect, &expected_state->window_rect), "Got window rect %s, expected %s.\n", wine_dbgstr_rect(&state->window_rect), wine_dbgstr_rect(&expected_state->window_rect)); @@ -391,13 +402,13 @@ static void check_fullscreen_state_(unsigned int line, const struct fullscreen_s wine_dbgstr_rect(&state->monitor_rect), wine_dbgstr_rect(&expected_state->monitor_rect)); } -#define check_window_fullscreen_state(a, b) check_window_fullscreen_state_(__LINE__, a, b) +#define check_window_fullscreen_state(a, b) check_window_fullscreen_state_(__LINE__, a, b, TRUE) static void check_window_fullscreen_state_(unsigned int line, HWND window, - const struct fullscreen_state *expected_state) + const struct fullscreen_state *expected_state, BOOL windowed) { struct fullscreen_state current_state; capture_fullscreen_state_(line, &current_state, window); - check_fullscreen_state_(line, &current_state, expected_state); + check_fullscreen_state_(line, &current_state, expected_state, windowed); } #define check_swapchain_fullscreen_state(a, b) check_swapchain_fullscreen_state_(__LINE__, a, b) @@ -411,7 +422,8 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok_(__FILE__, line)(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); - check_window_fullscreen_state_(line, swapchain_desc.OutputWindow, &expected_state->fullscreen_state); + check_window_fullscreen_state_(line, swapchain_desc.OutputWindow, + &expected_state->fullscreen_state, swapchain_desc.Windowed); ok_(__FILE__, line)(swapchain_desc.Windowed == !expected_state->fullscreen, "Got windowed %#x, expected %#x.\n", @@ -476,6 +488,9 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ new_height = mode_desc.Height; } + state->fullscreen_state.style &= WS_VISIBLE | WS_CLIPSIBLINGS; + state->fullscreen_state.exstyle &= WS_EX_TOPMOST; + state->fullscreen = TRUE; if (swapchain_desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) { @@ -1947,6 +1962,8 @@ static void test_create_swapchain(void) creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, 0, 0, 222, 222, 0, 0, 0, 0); + expected_state.fullscreen_state.style = WS_CLIPSIBLINGS | WS_CAPTION + | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX; SetRect(&expected_state.fullscreen_state.window_rect, 0, 0, 222, 222); GetClientRect(creation_desc.OutputWindow, expected_client_rect); expected_width = expected_client_rect->right; @@ -1969,6 +1986,8 @@ static void test_create_swapchain(void) creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 1, 1, 0, 0, 0, 0, 0, 0); + expected_state.fullscreen_state.style = WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + expected_state.fullscreen_state.exstyle = 0; SetRect(&expected_state.fullscreen_state.window_rect, 1, 1, 1, 1); SetRectEmpty(expected_client_rect); expected_width = expected_height = 8; @@ -5772,12 +5791,22 @@ static void test_swapchain_window_styles(void) WS_EX_WINDOWEDGE}, {WS_OVERLAPPED | WS_VISIBLE, 0, WS_OVERLAPPED | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_OVERLAPPED | WS_MAXIMIZE, 0, + WS_OVERLAPPED | WS_MAXIMIZE | WS_CLIPSIBLINGS | WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_OVERLAPPED | WS_MINIMIZE, 0, + WS_OVERLAPPED | WS_MINIMIZE | WS_CLIPSIBLINGS | WS_CAPTION, WS_EX_WINDOWEDGE}, {WS_CAPTION | WS_DISABLED, WS_EX_TOPMOST, WS_CAPTION | WS_DISABLED | WS_CLIPSIBLINGS, WS_EX_TOPMOST | WS_EX_WINDOWEDGE}, {WS_CAPTION | WS_DISABLED | WS_VISIBLE, WS_EX_TOPMOST, WS_CAPTION | WS_DISABLED | WS_VISIBLE | WS_CLIPSIBLINGS, WS_EX_TOPMOST | WS_EX_WINDOWEDGE}, {WS_CAPTION | WS_SYSMENU | WS_VISIBLE, WS_EX_APPWINDOW, WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_CLIPSIBLINGS, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE}, + {WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_BORDER | WS_DLGFRAME + | WS_VSCROLL | WS_HSCROLL | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, + 0, + WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_BORDER | WS_DLGFRAME + | WS_VSCROLL | WS_HSCROLL | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, + WS_EX_WINDOWEDGE}, }; if (!(device = create_device(0))) @@ -5819,8 +5848,11 @@ static void test_swapchain_window_styles(void) ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", i, exstyle, tests[i].expected_exstyle); - fullscreen_style = tests[i].expected_style & (WS_VISIBLE | WS_DISABLED | WS_CLIPSIBLINGS); - fullscreen_exstyle = (tests[i].expected_exstyle & WS_EX_APPWINDOW) | WS_EX_TOPMOST; + fullscreen_style = tests[i].expected_style & ~(WS_POPUP | WS_MAXIMIZEBOX + | WS_MINIMIZEBOX | WS_THICKFRAME | WS_SYSMENU | WS_DLGFRAME | WS_BORDER); + fullscreen_exstyle = tests[i].expected_exstyle & ~(WS_EX_DLGMODALFRAME + | WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP); + fullscreen_exstyle |= WS_EX_TOPMOST; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); @@ -5863,15 +5895,49 @@ static void test_swapchain_window_styles(void) ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", i, exstyle, tests[i].expected_exstyle); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to set fullscreen state, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + todo_wine + ok(style == fullscreen_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, fullscreen_style); + ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, fullscreen_exstyle); + + SetWindowLongW(swapchain_desc.OutputWindow, GWL_STYLE, fullscreen_style); + SetWindowLongW(swapchain_desc.OutputWindow, GWL_EXSTYLE, fullscreen_exstyle); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + todo_wine + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + todo_wine + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + } + else + { + skip("Test %u: Could not change fullscreen state.\n", i); + } + refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); - todo_wine_if(!(tests[i].expected_style & WS_VISIBLE)) + todo_wine ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", i, style, tests[i].expected_style); - todo_wine_if(!(tests[i].expected_exstyle & WS_EX_TOPMOST)) + todo_wine ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", i, exstyle, tests[i].expected_exstyle); -- 2.20.1

2 1

[PATCH v2] amstream/tests: Fix filter leak in test_add_stream().
by Gijs Vermeulen July 7, 2020

July 7, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 0e9c40d118..2d9f3e35f2 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -894,8 +894,6 @@ static void test_add_stream(void) hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!!graph, "Got graph %p.\n", graph); - hr = IAMMultiMediaStream_GetFilter(mmstream, &stream_filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IGraphBuilder_EnumFilters(graph, &enum_filters); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumFilters_Next(enum_filters, 3, filters, &count); @@ -907,7 +905,7 @@ static void test_add_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(IsEqualGUID(&clsid, &CLSID_DSoundRender), "Got unexpected filter %s.\n", wine_dbgstr_guid(&clsid)); IBaseFilter_Release(filters[0]); - IMediaStreamFilter_Release(stream_filter); + IBaseFilter_Release(filters[1]); IEnumFilters_Release(enum_filters); IGraphBuilder_Release(graph); } @@ -919,9 +917,10 @@ static void test_add_stream(void) AMMSF_ADDDEFAULTRENDERER, &audio_stream); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - IMediaStreamFilter_Release(stream_filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(stream_filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_media_streams(void) -- 2.27.0

2 1

[PATCH 1/2] amstream: Add graph to stream in IMediaStreamFilter::AddMediaStream().
by Gijs Vermeulen July 7, 2020

July 7, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/filter.c | 4 ++++ dlls/amstream/tests/amstream.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0e09e492cb..0a06e78180 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -497,6 +497,10 @@ static HRESULT WINAPI filter_AddMediaStream(IMediaStreamFilter *iface, IAMMediaS if (FAILED(hr)) return hr; + hr = IAMMediaStream_JoinFilterGraph(pAMMediaStream, This->graph); + if (FAILED(hr)) + return hr; + This->streams[This->nb_streams] = pAMMediaStream; This->nb_streams++; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 608bb2267f..0e9c40d118 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -686,6 +686,7 @@ static void test_add_stream(void) IEnumFilters *enum_filters; IBaseFilter *filters[3]; IGraphBuilder *graph; + FILTER_INFO info; ULONG ref, count; CLSID clsid; HRESULT hr; @@ -755,13 +756,18 @@ static void test_add_stream(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream, &IID_IUnknown, 0, &stream); ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_QueryFilterInfo(stream_filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream, &test_mspid, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream == (IMediaStream *)&teststream, "Streams didn't match.\n"); - if (hr == S_OK) IMediaStream_Release(stream); + IMediaStream_Release(stream); ok(teststream.mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n"); ok(teststream.filter == stream_filter, "IMediaStreamFilter objects didn't match.\n"); - todo_wine ok(!!teststream.graph, "Expected a non-NULL graph.\n"); + ok(teststream.graph == info.pGraph, "IFilterGraph objects didn't match.\n"); + + IFilterGraph_Release(info.pGraph); check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, audio_stream); -- 2.27.0

2 3

[PATCH v3] qdvd: Add IDvdGraphBuilder stub.
by Zebediah Figura July 7, 2020

July 7, 2020

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18072 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: Minor stylistic changes (rename "refs" to "refcount", keep the rpcproxy.h include in qdvd_main.c, restructure QueryInterface to be a bit more extensible) dlls/qdvd/Makefile.in | 2 + dlls/qdvd/graph.c | 112 +++++++++++++++++++++++++++++++++++++++ dlls/qdvd/qdvd_main.c | 89 ++++++++++++++++++++++++++++--- dlls/qdvd/qdvd_private.h | 30 +++++++++++ 4 files changed, 227 insertions(+), 6 deletions(-) create mode 100644 dlls/qdvd/graph.c create mode 100644 dlls/qdvd/qdvd_private.h diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index b3b13486ed..8f5089b3ac 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,8 +1,10 @@ MODULE = qdvd.dll +IMPORTS = strmiids uuid ole32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + graph.c \ qdvd_main.c IDL_SRCS = \ diff --git a/dlls/qdvd/graph.c b/dlls/qdvd/graph.c new file mode 100644 index 0000000000..f33293bfa4 --- /dev/null +++ b/dlls/qdvd/graph.c @@ -0,0 +1,112 @@ +/* + * Graph builder + * + * Copyright 2020 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "qdvd_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qdvd); + +struct graph_builder +{ + IDvdGraphBuilder IDvdGraphBuilder_iface; + LONG refcount; +}; + +static struct graph_builder *impl_from_IDvdGraphBuilder(IDvdGraphBuilder *iface) +{ + return CONTAINING_RECORD(iface, struct graph_builder, IDvdGraphBuilder_iface); +} + +static ULONG WINAPI graph_builder_AddRef(IDvdGraphBuilder *iface) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + ULONG refcount = InterlockedIncrement(&builder->refcount); + TRACE("%p increasing refcount to %u.\n", builder, refcount); + return refcount; +} + +static ULONG WINAPI graph_builder_Release(IDvdGraphBuilder *iface) +{ + struct graph_builder *builder = impl_from_IDvdGraphBuilder(iface); + ULONG refcount = InterlockedDecrement(&builder->refcount); + TRACE("%p decreasing refcount to %u.\n", builder, refcount); + if (!refcount) + free(builder); + return refcount; +} + +static HRESULT WINAPI graph_builder_QueryInterface(IDvdGraphBuilder *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IDvdGraphBuilder) || IsEqualGUID(iid, &IID_IUnknown)) + *out = iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT WINAPI graph_builder_GetFiltergraph(IDvdGraphBuilder *iface, IGraphBuilder **graph) +{ + FIXME("iface %p, graph %p, stub!\n", iface, graph); + return E_NOTIMPL; +} + +static HRESULT WINAPI graph_builder_GetDvdInterface(IDvdGraphBuilder *iface, REFIID iid, void **out) +{ + FIXME("iface %p, iid %s, out %p, stub!\n", iface, debugstr_guid(iid), out); + return E_NOTIMPL; +} + +static HRESULT WINAPI graph_builder_RenderDvdVideoVolume(IDvdGraphBuilder *iface, const WCHAR *path, DWORD flags, AM_DVD_RENDERSTATUS *status) +{ + FIXME("iface %p, path %s, flags %#x, status %p, stub!\n", iface, debugstr_w(path), flags, status); + return E_NOTIMPL; +} + +static const struct IDvdGraphBuilderVtbl graph_builder_vtbl = +{ + graph_builder_QueryInterface, + graph_builder_AddRef, + graph_builder_Release, + graph_builder_GetFiltergraph, + graph_builder_GetDvdInterface, + graph_builder_RenderDvdVideoVolume, +}; + +HRESULT graph_builder_create(IUnknown **out) +{ + struct graph_builder *builder; + + if (!(builder = calloc(1, sizeof(*builder)))) + return E_OUTOFMEMORY; + + builder->IDvdGraphBuilder_iface.lpVtbl = &graph_builder_vtbl; + builder->refcount = 1; + + TRACE("Created DVD graph builder %p.\n", builder); + *out = (IUnknown *)&builder->IDvdGraphBuilder_iface; + return S_OK; +} diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 72dcda7c91..9377f248ce 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -18,17 +18,89 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "oleidl.h" +#include "qdvd_private.h" #include "rpcproxy.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qdvd); static HINSTANCE qdvd_instance; +struct class_factory +{ + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(IUnknown **out); +}; + +static struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID iid, void **out) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unk; + HRESULT hr; + + TRACE("iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid(iid), out); + + *out = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (SUCCEEDED(hr = factory->create_instance(&unk))) + { + hr = IUnknown_QueryInterface(unk, iid, out); + IUnknown_Release(unk); + } + return hr; +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("lock %d, stub!\n", lock); + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +static struct class_factory graph_builder_cf = {{&class_factory_vtbl}, graph_builder_create}; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_WINE_PREATTACH) @@ -44,7 +116,12 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) { - FIXME("clsid %s, iid %s, out %p, stub!\n", debugstr_guid(clsid), debugstr_guid(iid), out); + TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + if (IsEqualGUID(clsid, &CLSID_DvdGraphBuilder)) + return IClassFactory_QueryInterface(&graph_builder_cf.IClassFactory_iface, iid, out); + + FIXME("%s not available, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/qdvd/qdvd_private.h b/dlls/qdvd/qdvd_private.h new file mode 100644 index 0000000000..b54dd3ddc1 --- /dev/null +++ b/dlls/qdvd/qdvd_private.h @@ -0,0 +1,30 @@ +/* + * DirectShow DVD filters + * + * Copyright 2020 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef QDVD_PRIVATE_H +#define QDVD_PRIVATE_H + +#define COBJMACROS +#include "dshow.h" +#include "wine/debug.h" + +HRESULT graph_builder_create(IUnknown **out) DECLSPEC_HIDDEN; + +#endif /* QDVD_PRIVATE_H */ -- 2.27.0

1 0

[PATCH] api-ms-win-core-systemtopology-l1-1-0: New DLL.
by Zebediah Figura July 7, 2020

July 7, 2020

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-systemtopology-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 3 files changed, 4 insertions(+) create mode 100644 dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec diff --git a/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in b/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in new file mode 100644 index 0000000000..beed9fb9c2 --- /dev/null +++ b/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-systemtopology-l1-1-0.dll diff --git a/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec b/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec new file mode 100644 index 0000000000..b5365eb930 --- /dev/null +++ b/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetNumaHighestNodeNumber(ptr) kernelbase.GetNumaHighestNodeNumber +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) kernelbase.GetNumaNodeProcessorMaskEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 420d850b73..f60fbbf6d2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -323,6 +323,7 @@ my @dll_groups = "api-ms-win-appmodel-runtime-l1-1-2", "api-ms-win-core-path-l1-1-0", "api-ms-win-core-quirks-l1-1-0", + "api-ms-win-core-systemtopology-l1-1-0", "api-ms-win-security-grouppolicy-l1-1-0", ], [ -- 2.27.0

1 0

[PATCH 1/2] ntdll: Bump the Windows 10 build number to 17763.
by Zebediah Figura July 7, 2020

July 7, 2020

Corresponds with the "1809" release. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 4fef2b5e439..46715575225 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -181,7 +181,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x42EE, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x4563, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, -- 2.27.0

1 1

[PATCH 4/4] server: Get rid of no longer needed write_console_input request.
by Jacek Caban July 7, 2020

July 7, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 22 ++++------------------ server/protocol.def | 8 -------- 2 files changed, 4 insertions(+), 26 deletions(-)

2 1

[PATCH 3/4] kernelbase: Use ioctl for WriteConsoleInputW implementation.
by Jacek Caban July 7, 2020

July 7, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 21 +++++++-------------- include/wine/condrv.h | 1 + server/console.c | 3 +++ 3 files changed, 11 insertions(+), 14 deletions(-)

2 1

[PATCH 2/4] kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetEditionMode.
by Jacek Caban July 7, 2020

July 7, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)

2 1