July 2020 - Wine-devel - list.winehq.org

[PATCH v3] qdvd: Add IDvdGraphBuilder stub.
by Zebediah Figura 07 Jul '20

07 Jul '20

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 07 Jul '20

07 Jul '20

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 07 Jul '20

07 Jul '20

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 07 Jul '20

07 Jul '20

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 07 Jul '20

07 Jul '20

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 07 Jul '20

07 Jul '20

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

2 1

[PATCH 2/2 v2] msvcrt: Fix _control87 ambiguous return value.
by Piotr Caban 07 Jul '20

07 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 1 + dlls/ucrtbase/tests/misc.c | 28 ++++++++++++++++++++++++++++ include/msvcrt/float.h | 3 +++ 3 files changed, 32 insertions(+)

1 0

[PATCH 1/2 v2] msvcrt: Don't reset MXCSR status in __control87_2 if control information is not changed.
by Piotr Caban 07 Jul '20

07 Jul '20

From: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 47 ++++++++++++++++++-- dlls/msvcrt/math.c | 86 ++++++++++++++++++++---------------- include/msvcrt/float.h | 2 + 3 files changed, 95 insertions(+), 40 deletions(-)

1 0

[PATCH 1/4] wineconsole: Use IOCTL_CONDRV_GET_INPUT_INFO in WINECON_GetServerConfig.
by Jacek Caban 07 Jul '20

07 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 3 +++ programs/wineconsole/wineconsole.c | 18 ++++++++---------- server/console.c | 5 ++++- 3 files changed, 15 insertions(+), 11 deletions(-)

1 0

[PATCH v2 1/2] msxml3: Set internal error on loading from IStream.
by Daniel Lehman 07 Jul '20

07 Jul '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: use shlwapi --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/tests/Makefile.in | 2 +- dlls/msxml3/tests/domdoc.c | 56 +++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 76d3fdb601..c86a4931c5 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2276,7 +2276,7 @@ static HRESULT WINAPI domdoc_load( if (hr == S_OK) { - hr = domdoc_load_from_stream(This, stream); + hr = This->error = domdoc_load_from_stream(This, stream); if (hr == S_OK) *isSuccessful = VARIANT_TRUE; ISequentialStream_Release(stream); diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index c397295142..bc1f051b09 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msxml3.dll -IMPORTS = oleaut32 ole32 user32 +IMPORTS = oleaut32 ole32 user32 shlwapi C_SRCS = \ domdoc.c \ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 49768b8dbe..0ebc5165a3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -37,8 +37,10 @@ #include "dispex.h" #include "objsafe.h" #include "mshtml.h" +#include "xmlparser.h" #include "initguid.h" #include "asptlb.h" +#include "shlwapi.h" #include "wine/heap.h" #include "wine/test.h" @@ -700,6 +702,36 @@ static void _expect_list_len(IXMLDOMNodeList *list, LONG len, int line) #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +#define EXPECT_PARSE_ERROR(doc, hr_exp, hr_todo) _expect_parse_error(doc, hr_exp, hr_todo, __LINE__) +static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_todo, int line) +{ + IXMLDOMParseError *error; + HRESULT hr; + LONG code; + + error = NULL; + hr = IXMLDOMDocument_get_parseError(doc, &error); + ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__,line)(!!error, "got NULL parseError\n"); + + code = 0xdeadbeef; + hr = IXMLDOMParseError_get_errorCode(error, &code); + if (FAILED(hr_exp)) + { + ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__,line)(FAILED(code), "expected failure HRESULT\n"); + todo_wine_if(hr_todo) + ok_(__FILE__,line)(hr_exp == code, "expected 0x%08x, got 0x%08x\n", hr_exp, code); + } + else + { + ok_(__FILE__,line)(hr == S_FALSE, "got 0x%08x\n", hr); + ok_(__FILE__,line)(SUCCEEDED(code), "expected successful HRESULT\n"); + } + + IXMLDOMParseError_Release(error); +} + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', @@ -10242,6 +10274,7 @@ static void test_load(void) IXMLDOMNodeList *list; IXMLDOMDocument *doc; BSTR bstr1, bstr2; + IStream *stream; VARIANT_BOOL b; VARIANT src; HRESULT hr; @@ -10419,6 +10452,29 @@ static void test_load(void) ok(b == VARIANT_FALSE, "got %d\n", b); VariantClear(&src); + + /* test istream with empty content */ + stream = SHCreateMemStream((const BYTE*)nocontent, strlen(nocontent)); + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = (IUnknown*)stream; + b = VARIANT_TRUE; + hr = IXMLDOMDocument_load(doc, src, &b); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + EXPECT_PARSE_ERROR(doc, XML_E_INVALIDATROOTLEVEL, TRUE); + VariantClear(&src); + + /* test istream with valid xml */ + stream = SHCreateMemStream((const BYTE*)complete4A, strlen(complete4A)); + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = (IUnknown*)stream; + b = VARIANT_FALSE; + hr = IXMLDOMDocument_load(doc, src, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + EXPECT_PARSE_ERROR(doc, S_OK, FALSE); + VariantClear(&src); + IXMLDOMDocument_Release(doc); free_bstrs(); -- 2.17.1

2 3