September 2018 - Wine-Devel

[PATCH 1/3] api-ms-win-core-comm-l1-1-0: Add dll
by André Hentschel Sept. 7, 2018

Sept. 7, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- configure.ac | 1 + dlls/api-ms-win-core-comm-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-comm-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 4 files changed, 21 insertions(+) create mode 100644 dlls/api-ms-win-core-comm-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec diff --git a/configure.ac b/configure.ac index d7d5e8e6ae..69f641ddd9 100644 --- a/configure.ac +++ b/configure.ac @@ -2864,6 +2864,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-bem-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-private-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) diff --git a/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in b/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in new file mode 100644 index 0000000000..1780e2418d --- /dev/null +++ b/dlls/api-ms-win-core-comm-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-comm-l1-1-0.dll diff --git a/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec b/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec new file mode 100644 index 0000000000..4842c98f10 --- /dev/null +++ b/dlls/api-ms-win-core-comm-l1-1-0/api-ms-win-core-comm-l1-1-0.spec @@ -0,0 +1,18 @@ +@ stdcall ClearCommBreak(long) kernel32.ClearCommBreak +@ stdcall ClearCommError(long ptr ptr) kernel32.ClearCommError +@ stdcall EscapeCommFunction(long long) kernel32.EscapeCommFunction +@ stdcall GetCommConfig(long ptr ptr) kernel32.GetCommConfig +@ stdcall GetCommMask(long ptr) kernel32.GetCommMask +@ stdcall GetCommModemStatus(long ptr) kernel32.GetCommModemStatus +@ stdcall GetCommProperties(long ptr) kernel32.GetCommProperties +@ stdcall GetCommState(long ptr) kernel32.GetCommState +@ stdcall GetCommTimeouts(long ptr) kernel32.GetCommTimeouts +@ stdcall PurgeComm(long long) kernel32.PurgeComm +@ stdcall SetCommBreak(long) kernel32.SetCommBreak +@ stdcall SetCommConfig(long ptr long) kernel32.SetCommConfig +@ stdcall SetCommMask(long long) kernel32.SetCommMask +@ stdcall SetCommState(long ptr) kernel32.SetCommState +@ stdcall SetCommTimeouts(long ptr) kernel32.SetCommTimeouts +@ stdcall SetupComm(long long long) kernel32.SetupComm +@ stdcall TransmitCommChar(long long) kernel32.TransmitCommChar +@ stdcall WaitCommEvent(long ptr ptr) kernel32.WaitCommEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index cd3af877bb..24514fcbdd 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -198,6 +198,7 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", + "api-ms-win-core-comm-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-delayload-l1-1-0", -- 2.17.1

1 0

[PATCH] shlwapi/tests: Add some tests for memory stream.
by Nikolay Sivov Sept. 7, 2018

Sept. 7, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/tests/istream.c | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 7d0cd617dd..560a822e2c 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -733,6 +733,43 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) DeleteFileW( dstFileName ); } +static void test_SHCreateMemStream(void) +{ + static const BYTE initial[10]; + IStream *stream, *stream2; + IUnknown *unk; + char buff[10]; + HRESULT hr; + + stream = SHCreateMemStream(initial, 0); + ok(stream != NULL, "Failed to create a stream.\n"); + IStream_Release(stream); + + stream = SHCreateMemStream(NULL, 10); + ok(stream != NULL, "Failed to create a stream.\n"); + IStream_Release(stream); + + stream = SHCreateMemStream(NULL, 0); + ok(stream != NULL, "Failed to create a stream.\n"); + + hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* WinXP */, "Failed to QI, hr %#x.\n", hr); + if (unk) + IUnknown_Release(unk); + + hr = IStream_Read(stream, buff, sizeof(buff), NULL); +todo_wine + ok(hr == S_FALSE || broken(hr == S_OK) /* WinXP */, "Unexpected hr %#x.\n", hr); + + hr = IStream_Clone(stream, &stream2); +todo_wine + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* < Win8 */, "Failed to clone a stream, hr %#x.\n", hr); + if (hr == S_OK) + IStream_Release(stream2); + + IStream_Release(stream); +} START_TEST(istream) { @@ -773,4 +810,5 @@ START_TEST(istream) } test_SHCreateStreamOnFileEx_CopyTo(); + test_SHCreateMemStream(); } -- 2.18.0

1 0

[PATCH v2 1/2] comctl32/listbox: Update the size in SetColumnWidth before calling UpdatePage
by Gabriel Ivăncescu Sept. 7, 2018

Sept. 7, 2018

Some applications don't forward WM_SIZE from DefWindowProc to the control, but instead only send a LB_SETCOLUMNWIDTH message, even when the column width doesn't change (but the listbox size does). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22440 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Don't call UpdateSize, just update the width & height, and also call UpdateScroll. dlls/comctl32/listbox.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 252844e..2137ef8 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1257,12 +1257,19 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) /*********************************************************************** * LISTBOX_SetColumnWidth */ -static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) +static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT column_width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); - descr->column_width = width; - LISTBOX_UpdatePage( descr ); + RECT rect; + + TRACE("[%p]: new column width = %d\n", descr->self, column_width); + + GetClientRect(descr->self, &rect); + descr->width = rect.right - rect.left; + descr->height = rect.bottom - rect.top; + descr->column_width = column_width; + + LISTBOX_UpdatePage(descr); + LISTBOX_UpdateScroll(descr); return LB_OKAY; } -- 1.9.1

2 3

[PATCH 1/3] opcservices: Implement relationships parts uri support.
by Nikolay Sivov Sept. 7, 2018

Sept. 7, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/Makefile.in | 2 +- dlls/opcservices/factory.c | 19 ++- dlls/opcservices/opc_private.h | 15 ++- dlls/opcservices/tests/opcservices.c | 167 +++++++++++++++++++++++++ dlls/opcservices/uri.c | 179 ++++++++++++++++++++++----- include/opcbase.idl | 2 + 6 files changed, 347 insertions(+), 37 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index bdc4c80ba8..42b64b3ba9 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,5 +1,5 @@ MODULE = opcservices.dll -IMPORTS = uuid ole32 advapi32 urlmon xmllite +IMPORTS = uuid ole32 advapi32 urlmon xmllite oleaut32 EXTRALIBS = $(Z_LIBS) C_SRCS = \ diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 13fa702293..2ecd5adca9 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -310,18 +310,25 @@ static ULONG WINAPI opc_factory_Release(IOpcFactory *iface) static HRESULT WINAPI opc_factory_CreatePackageRootUri(IOpcFactory *iface, IOpcUri **uri) { - static const WCHAR rootW[] = {'/',0}; - TRACE("iface %p, uri %p.\n", iface, uri); - return opc_uri_create(rootW, uri); + return opc_root_uri_create(uri); } -static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, IOpcPartUri **part_uri) +static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, IOpcPartUri **out) { - TRACE("iface %p, uri %s, part_uri %p.\n", iface, debugstr_w(uri), part_uri); + IUri *part_uri; + HRESULT hr; + + TRACE("iface %p, uri %s, out %p.\n", iface, debugstr_w(uri), out); + + if (FAILED(hr = CreateUri(uri, Uri_CREATE_ALLOW_RELATIVE, 0, &part_uri))) + { + WARN("Failed to create uri, hr %#x.\n", hr); + return hr; + } - return opc_part_uri_create(uri, part_uri); + return opc_part_uri_create(part_uri, NULL, out); } static HRESULT WINAPI opc_factory_CreateStreamOnFile(IOpcFactory *iface, LPCWSTR filename, diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index afe5c68561..c7b1d0cab3 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -45,9 +45,20 @@ static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t c return TRUE; } +struct opc_uri +{ + IOpcPartUri IOpcPartUri_iface; + LONG refcount; + BOOL is_part_uri; + + IUri *uri; + IUri *rels_part_uri; + struct opc_uri *source_uri; +}; + extern HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **package) DECLSPEC_HIDDEN; -extern HRESULT opc_part_uri_create(const WCHAR *uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; -extern HRESULT opc_uri_create(const WCHAR *uri, IOpcUri **opc_uri) DECLSPEC_HIDDEN; +extern HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; +extern HRESULT opc_root_uri_create(IOpcUri **opc_uri) DECLSPEC_HIDDEN; extern HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream) DECLSPEC_HIDDEN; diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 4bb3d6407a..63932fe832 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -26,6 +26,7 @@ #include "msopc.h" #include "urlmon.h" +#include "wine/heap.h" #include "wine/test.h" static IOpcFactory *create_factory(void) @@ -373,6 +374,171 @@ todo_wine IOpcFactory_Release(factory); } +static WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + DWORD len; + + if (!str) return ret; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static void test_rel_part_uri(void) +{ + static const struct + { + const char *uri; + const char *rel_uri; + HRESULT hr; + } rel_part_uri_tests[] = + { + { "/uri", "/_rels/uri.rels" }, + { "/uri.ext", "/_rels/uri.ext.rels" }, + { "/", "/_rels/.rels" }, + { "/_rels/uri.ext.rels", "", OPC_E_NONCONFORMING_URI }, + }; + static const struct + { + const char *uri; + BOOL ret; + } is_rel_part_tests[] = + { + { "/uri", FALSE }, + { "/_rels/uri", FALSE }, + { "/_rels/uri/uri", FALSE }, + { "/_rels/uri/uri.rels", FALSE }, + { "/uri/uri.rels", FALSE }, + { "/uri/_rels/uri.rels", TRUE }, + { "/_rels/.rels", TRUE }, + }; + static const WCHAR testuriW[] = {'/','u','r','i',0}; + IOpcPartUri *part_uri; + IOpcFactory *factory; + IOpcUri *source_uri; + unsigned int i; + WCHAR *uriW; + HRESULT hr; + + factory = create_factory(); + + hr = IOpcFactory_CreatePartUri(factory, testuriW, &part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + hr = IOpcPartUri_GetRelationshipsPartUri(part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPartUri_IsRelationshipsPartUri(part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPartUri_GetSourceUri(part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + source_uri = (void *)0xdeadbeef; + hr = IOpcPartUri_GetSourceUri(part_uri, &source_uri); + ok(hr == OPC_E_RELATIONSHIP_URI_REQUIRED, "Unexpected hr %#x.\n", hr); + ok(source_uri == NULL, "Expected null uri.\n"); + + IOpcPartUri_Release(part_uri); + + for (i = 0; i < ARRAY_SIZE(rel_part_uri_tests); ++i) + { + BOOL is_root = FALSE; + IOpcPartUri *rel_uri; + IOpcUri *part_uri; + WCHAR *rel_uriW; + + uriW = strdupAtoW(rel_part_uri_tests[i].uri); + rel_uriW = strdupAtoW(rel_part_uri_tests[i].rel_uri); + + if (!strcmp(rel_part_uri_tests[i].uri, "/")) + { + hr = IOpcFactory_CreatePackageRootUri(factory, &part_uri); + is_root = TRUE; + } + else + hr = IOpcFactory_CreatePartUri(factory, uriW, (IOpcPartUri **)&part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + rel_uri = (void *)0xdeadbeef; + hr = IOpcUri_GetRelationshipsPartUri(part_uri, &rel_uri); + if (SUCCEEDED(hr)) + { + IOpcPartUri *rel_uri2; + IOpcUri *source_uri2; + IUnknown *unk = NULL; + BOOL ret; + BSTR str; + + hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri); + ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); + hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri2); + ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); + ok(source_uri != source_uri2, "Unexpected instance.\n"); + hr = IOpcUri_IsEqual(source_uri, (IUri *)source_uri2, &ret); + todo_wine { + ok(SUCCEEDED(hr), "IsEqual failed, hr %#x.\n", hr); + ok(ret, "Expected equal uris.\n"); + } + hr = IOpcUri_QueryInterface(source_uri, &IID_IOpcPartUri, (void **)&unk); + ok(hr == (is_root ? E_NOINTERFACE : S_OK), "Unexpected hr %#x, %s.\n", hr, rel_part_uri_tests[i].uri); + if (unk) + IUnknown_Release(unk); + + IOpcUri_Release(source_uri2); + IOpcUri_Release(source_uri); + + hr = IOpcUri_GetRelationshipsPartUri(part_uri, &rel_uri2); + ok(SUCCEEDED(hr), "Failed to get rels part uri, hr %#x.\n", hr); + ok(rel_uri2 != rel_uri, "Unexpected instance.\n"); + IOpcPartUri_Release(rel_uri2); + + hr = IOpcPartUri_GetRawUri(rel_uri, &str); + ok(SUCCEEDED(hr), "Failed to get rel uri, hr %#x.\n", hr); + ok(!lstrcmpW(str, rel_uriW), "%u: unexpected rel uri %s, expected %s.\n", i, wine_dbgstr_w(str), + wine_dbgstr_w(rel_uriW)); + SysFreeString(str); + + IOpcPartUri_Release(rel_uri); + } + else + { + ok(hr == rel_part_uri_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + ok(rel_uri == NULL, "%u: unexpected out pointer.\n", i); + } + + heap_free(uriW); + heap_free(rel_uriW); + + IOpcUri_Release(part_uri); + } + + for (i = 0; i < ARRAY_SIZE(is_rel_part_tests); ++i) + { + IOpcPartUri *part_uri; + BOOL ret; + + uriW = strdupAtoW(is_rel_part_tests[i].uri); + + hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + ret = 123; + hr = IOpcPartUri_IsRelationshipsPartUri(part_uri, &ret); + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(ret == is_rel_part_tests[i].ret, "%u: unexpected result %d.\n", i, ret); + + heap_free(uriW); + + IOpcPartUri_Release(part_uri); + } + + IOpcFactory_Release(factory); +} + START_TEST(opcservices) { IOpcFactory *factory; @@ -390,6 +556,7 @@ START_TEST(opcservices) test_package(); test_file_stream(); test_relationship(); + test_rel_part_uri(); IOpcFactory_Release(factory); diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 594abc36f1..0c5afa9b29 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -23,25 +23,19 @@ #include "winbase.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "opc_private.h" WINE_DEFAULT_DEBUG_CHANNEL(msopc); -struct opc_uri -{ - IOpcPartUri IOpcPartUri_iface; - LONG refcount; - BOOL is_part_uri; - - IUri *uri; -}; - static inline struct opc_uri *impl_from_IOpcPartUri(IOpcPartUri *iface) { return CONTAINING_RECORD(iface, struct opc_uri, IOpcPartUri_iface); } +static HRESULT opc_source_uri_create(struct opc_uri *uri, IOpcUri **out); + static HRESULT WINAPI opc_uri_QueryInterface(IOpcPartUri *iface, REFIID iid, void **out) { struct opc_uri *uri = impl_from_IOpcPartUri(iface); @@ -81,6 +75,10 @@ static ULONG WINAPI opc_uri_Release(IOpcPartUri *iface) if (!refcount) { + if (uri->rels_part_uri) + IUri_Release(uri->rels_part_uri); + if (uri->source_uri) + IOpcPartUri_Release(&uri->source_uri->IOpcPartUri_iface); IUri_Release(uri->uri); heap_free(uri); } @@ -319,9 +317,20 @@ static HRESULT WINAPI opc_uri_IsEqual(IOpcPartUri *iface, IUri *comparand, BOOL static HRESULT WINAPI opc_uri_GetRelationshipsPartUri(IOpcPartUri *iface, IOpcPartUri **part_uri) { - FIXME("iface %p, part_uri %p stub!\n", iface, part_uri); + struct opc_uri *uri = impl_from_IOpcPartUri(iface); - return E_NOTIMPL; + TRACE("iface %p, part_uri %p.\n", iface, part_uri); + + if (!part_uri) + return E_POINTER; + + if (!uri->rels_part_uri) + { + *part_uri = NULL; + return OPC_E_NONCONFORMING_URI; + } + + return opc_part_uri_create(uri->rels_part_uri, uri, part_uri); } static HRESULT WINAPI opc_uri_GetRelativeUri(IOpcPartUri *iface, IOpcPartUri *part_uri, @@ -349,16 +358,25 @@ static HRESULT WINAPI opc_uri_ComparePartUri(IOpcPartUri *iface, IOpcPartUri *pa static HRESULT WINAPI opc_uri_GetSourceUri(IOpcPartUri *iface, IOpcUri **source_uri) { - FIXME("iface %p, source_uri %p stub!\n", iface, source_uri); + struct opc_uri *uri = impl_from_IOpcPartUri(iface); - return E_NOTIMPL; + TRACE("iface %p, source_uri %p.\n", iface, source_uri); + + return opc_source_uri_create(uri, source_uri); } static HRESULT WINAPI opc_uri_IsRelationshipsPartUri(IOpcPartUri *iface, BOOL *result) { - FIXME("iface %p, result %p stub!\n", iface, result); + struct opc_uri *uri = impl_from_IOpcPartUri(iface); - return E_NOTIMPL; + TRACE("iface %p, result %p.\n", iface, result); + + if (!result) + return E_POINTER; + + *result = !uri->rels_part_uri; + + return S_OK; } static const IOpcPartUriVtbl opc_part_uri_vtbl = @@ -399,56 +417,161 @@ static const IOpcPartUriVtbl opc_part_uri_vtbl = opc_uri_IsRelationshipsPartUri, }; -static HRESULT opc_part_uri_init(struct opc_uri *object, BOOL is_part_uri, const WCHAR *uri) +static IUri *opc_part_uri_get_rels_uri(IUri *uri) { + static const WCHAR relsdirW[] = {'/','_','r','e','l','s',0}; + static const WCHAR relsextW[] = {'.','r','e','l','s',0}; + WCHAR *start = NULL, *end, *ret; + IUri *rels_uri; HRESULT hr; + DWORD len; + BSTR path; + + if (FAILED(IUri_GetPath(uri, &path))) + return NULL; + + if (FAILED(IUri_GetPropertyLength(uri, Uri_PROPERTY_PATH, &len, 0))) + { + SysFreeString(path); + return NULL; + } + + end = strrchrW(path, '/'); + if (end && end >= path + ARRAY_SIZE(relsdirW) - 1) + start = end - ARRAY_SIZE(relsdirW) + 1; + if (!start) + start = end; + + /* Test if it's already relationships uri. */ + if (len > ARRAY_SIZE(relsextW)) + { + if (!strcmpW(path + len - ARRAY_SIZE(relsextW) + 1, relsextW)) + { + if (start && !memcmp(start, relsdirW, ARRAY_SIZE(relsdirW) - sizeof(WCHAR))) + { + SysFreeString(path); + return NULL; + } + } + } + ret = heap_alloc((len + ARRAY_SIZE(relsextW) + ARRAY_SIZE(relsdirW)) * sizeof(WCHAR)); + if (!ret) + { + SysFreeString(path); + return NULL; + } + ret[0] = 0; + + if (start != path) + { + memcpy(ret, path, (start - path) * sizeof(WCHAR)); + ret[start - path] = 0; + } + + strcatW(ret, relsdirW); + strcatW(ret, end); + strcatW(ret, relsextW); + + if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) + WARN("Failed to create rels uri, hr %#x.\n", hr); + heap_free(ret); + + return rels_uri; +} + +static HRESULT opc_part_uri_init(struct opc_uri *object, struct opc_uri *source_uri, BOOL is_part_uri, IUri *uri) +{ object->IOpcPartUri_iface.lpVtbl = &opc_part_uri_vtbl; object->refcount = 1; object->is_part_uri = is_part_uri; + object->uri = uri; + IUri_AddRef(object->uri); + object->rels_part_uri = opc_part_uri_get_rels_uri(object->uri); + object->source_uri = source_uri; + if (object->source_uri) + IOpcPartUri_AddRef(&object->source_uri->IOpcPartUri_iface); + + return S_OK; +} + +static HRESULT opc_source_uri_create(struct opc_uri *uri, IOpcUri **out) +{ + struct opc_uri *obj; + HRESULT hr; + + if (!out) + return E_POINTER; - if (FAILED(hr = CreateUri(uri, Uri_CREATE_ALLOW_RELATIVE, 0, &object->uri))) + *out = NULL; + + if (!uri->source_uri) + return OPC_E_RELATIONSHIP_URI_REQUIRED; + + if (!(obj = heap_alloc_zero(sizeof(*obj)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = opc_part_uri_init(obj, NULL, uri->source_uri->is_part_uri, uri->source_uri->uri))) + { + WARN("Failed to init part uri, hr %#x.\n", hr); + heap_free(obj); return hr; + } + + *out = (IOpcUri *)&obj->IOpcPartUri_iface; + + TRACE("Created source uri %p.\n", *out); return S_OK; } -HRESULT opc_part_uri_create(const WCHAR *str, IOpcPartUri **out) +HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri **out) { - struct opc_uri *uri; + struct opc_uri *obj; HRESULT hr; - if (!(uri = heap_alloc_zero(sizeof(*uri)))) + if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; - if (FAILED(hr = opc_part_uri_init(uri, TRUE, str))) + if (FAILED(hr = opc_part_uri_init(obj, source_uri, TRUE, uri))) { WARN("Failed to init part uri, hr %#x.\n", hr); - heap_free(uri); + heap_free(obj); return hr; } - *out = &uri->IOpcPartUri_iface; + *out = &obj->IOpcPartUri_iface; TRACE("Created part uri %p.\n", *out); return S_OK; } -HRESULT opc_uri_create(const WCHAR *str, IOpcUri **out) +HRESULT opc_root_uri_create(IOpcUri **out) { - struct opc_uri *uri; + static const WCHAR rootW[] = {'/',0}; + struct opc_uri *obj; HRESULT hr; + IUri *uri; - if (!(uri = heap_alloc_zero(sizeof(*uri)))) + if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; - if (FAILED(hr = opc_part_uri_init(uri, FALSE, str))) + if (FAILED(hr = CreateUri(rootW, Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) + { + WARN("Failed to create rels uri, hr %#x.\n", hr); + heap_free(obj); + return hr; + } + + hr = opc_part_uri_init(obj, NULL, FALSE, uri); + IUri_Release(uri); + if (FAILED(hr)) { WARN("Failed to init uri, hr %#x.\n", hr); heap_free(uri); return hr; } - *out = (IOpcUri *)&uri->IOpcPartUri_iface; + *out = (IOpcUri *)&obj->IOpcPartUri_iface; TRACE("Created part uri %p.\n", *out); return S_OK; } diff --git a/include/opcbase.idl b/include/opcbase.idl index ca42ceb4e3..fae5858ed6 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -41,5 +41,7 @@ typedef [v1_enum] enum OPC_URI_TARGET_MODE_EXTERNAL = 1, } OPC_URI_TARGET_MODE; +cpp_quote("#define OPC_E_NONCONFORMING_URI MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x1)") +cpp_quote("#define OPC_E_RELATIONSHIP_URI_REQUIRED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x3)") cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") cpp_quote("#define OPC_E_NO_SUCH_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x48)") -- 2.18.0

1 2

[PATCH] ntdll: Bump Win 10 version to 17134
by André Hentschel Sept. 7, 2018

Sept. 7, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 1674261507..9c9f2cc8cd 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x42EE, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d598fd4f21..6c4e6a49f2 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x42EE,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, -- 2.17.1

1 0

[PATCH] riched20: Handle NULL in ITextServices::{TxGetHScroll, TxGetVScroll}.
by Jactry Zeng Sept. 7, 2018

Sept. 7, 2018

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=43488 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 20 ++++++++++++++++++++ dlls/riched20/txtsrv.c | 30 ++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 4dee5fd269..a8cf6ff1ad 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -990,6 +990,25 @@ static void test_default_format(void) ITextHost_Release(host); } +static void test_TxGetScroll(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT ret; + + if (!init_texthost(&txtserv, &host)) + return; + + ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); + ok(ret == S_OK, "ITextSerHices_GetVScroll failed: 0x%08x.\n", ret); + + ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); + ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -1021,6 +1040,7 @@ START_TEST( txtsrv ) test_TxDraw(); test_QueryInterface(); test_default_format(); + test_TxGetScroll(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eb61e4eff6..ee65621b1d 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -182,11 +182,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetHScroll(ITextServices *iface, LONG { ITextServicesImpl *This = impl_from_ITextServices(iface); - *plMin = This->editor->horz_si.nMin; - *plMax = This->editor->horz_si.nMax; - *plPos = This->editor->horz_si.nPos; - *plPage = This->editor->horz_si.nPage; - *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; + if (plMin) + *plMin = This->editor->horz_si.nMin; + if (plMax) + *plMax = This->editor->horz_si.nMax; + if (plPos) + *plPos = This->editor->horz_si.nPos; + if (plPage) + *plPage = This->editor->horz_si.nPage; + if (pfEnabled) + *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; return S_OK; } @@ -195,11 +200,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetVScroll(ITextServices *iface, LONG { ITextServicesImpl *This = impl_from_ITextServices(iface); - *plMin = This->editor->vert_si.nMin; - *plMax = This->editor->vert_si.nMax; - *plPos = This->editor->vert_si.nPos; - *plPage = This->editor->vert_si.nPage; - *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; + if (plMin) + *plMin = This->editor->vert_si.nMin; + if (plMax) + *plMax = This->editor->vert_si.nMax; + if (plPos) + *plPos = This->editor->vert_si.nPos; + if (plPage) + *plPage = This->editor->vert_si.nPage; + if (pfEnabled) + *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; return S_OK; } -- 2.18.0

2 1

[PATCH v2 4/4] mfplat: Implement MFCreateMemoryBuffer
by Alistair Leslie-Hughes Sept. 7, 2018

Sept. 7, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45715 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 176 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 90 +++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 268 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2d87429..9f381ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2347,3 +2347,179 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, *descriptor = &object->IMFStreamDescriptor_iface; return S_OK; } + + +typedef struct _mfbuffer +{ + IMFMediaBuffer IMFMediaBuffer_iface; + LONG ref; + + BYTE *buffer; + DWORD max_length; + DWORD current; +} mfbuffer; + +static inline mfbuffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, mfbuffer, IMFMediaBuffer_iface); +} + +static HRESULT WINAPI mfbuffer_QueryInterface(IMFMediaBuffer *iface, REFIID riid, void **out) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFMediaBuffer)) + { + *out = &This->IMFMediaBuffer_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbuffer_AddRef(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbuffer_Release(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This->buffer); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI mfbuffer_Lock(IMFMediaBuffer *iface, BYTE **buffer, DWORD *max, DWORD *current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %p %p, %p\n", This, buffer, max, current); + + if(!buffer) + return E_INVALIDARG; + + *buffer = This->buffer; + if(max) + *max = This->max_length; + if(current) + *current = This->current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_Unlock(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p\n", This); + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_GetCurrentLength(IMFMediaBuffer *iface, DWORD *current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p\n", This); + + if(!current) + return E_INVALIDARG; + + *current = This->current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %u\n", This, current); + + if(current > This->max_length) + return E_INVALIDARG; + + This->current = current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_GetMaxLength(IMFMediaBuffer *iface, DWORD *max) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %p\n", This, max); + + if(!max) + return E_INVALIDARG; + + *max = This->max_length; + + return S_OK; +} + +static const IMFMediaBufferVtbl mfbuffer_vtbl = +{ + mfbuffer_QueryInterface, + mfbuffer_AddRef, + mfbuffer_Release, + mfbuffer_Lock, + mfbuffer_Unlock, + mfbuffer_GetCurrentLength, + mfbuffer_SetCurrentLength, + mfbuffer_GetMaxLength +}; + +HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer) +{ + mfbuffer *object; + BYTE *bytes; + + TRACE("%u, %p\n", max_length, buffer); + + if(!buffer) + return E_INVALIDARG; + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + bytes = heap_alloc( max_length ); + if(!bytes) + { + heap_free(object); + return E_OUTOFMEMORY; + } + + object->ref = 1; + object->max_length = max_length; + object->current = 0; + object->buffer = bytes; + object->IMFMediaBuffer_iface.lpVtbl = &mfbuffer_vtbl; + *buffer = &object->IMFMediaBuffer_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1d64420..42b0b86 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -51,7 +51,7 @@ @ stub MFCreateMediaEvent @ stdcall MFCreateMediaType(ptr) @ stub MFCreateMediaTypeFromRepresentation -@ stub MFCreateMemoryBuffer +@ stdcall MFCreateMemoryBuffer(long ptr) @ stub MFCreateMemoryStream @ stub MFCreatePathFromURL @ stub MFCreatePresentationDescriptor diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f4b5014..ccbbfb7 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,6 +38,8 @@ static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); +static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); + DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); @@ -196,6 +198,7 @@ static void init_functions(void) #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); + X(MFCreateMemoryBuffer); #undef X } @@ -274,6 +277,92 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFByteStream_Release(bytestream); } +static void test_MFCreateMemoryBuffer(void) +{ + IMFMediaBuffer *buffer; + HRESULT hr; + DWORD length, max; + BYTE *data, *data2; + + if(!pMFCreateMemoryBuffer) + { + win_skip("MFCreateMemoryBuffer() not found\n"); + return; + } + + hr = pMFCreateMemoryBuffer(1024, NULL); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + + hr = pMFCreateMemoryBuffer(0, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(buffer) + { + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 0, "got %u\n", length); + + IMFMediaBuffer_Release(buffer); + } + + hr = pMFCreateMemoryBuffer(1024, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, NULL); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1024, "got %u\n", length); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 1025); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 10); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, NULL); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 10, "got %u\n", length); + + length = 0; + max = 0; + hr = IMFMediaBuffer_Lock(buffer, NULL, &length, &max); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + ok(length == 0, "got %u\n", length); + ok(max == 0, "got %u\n", length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 10, "got %u\n", length); + ok(max == 1024, "got %u\n", max); + + /* Attempt to lock the bufer twice */ + hr = IMFMediaBuffer_Lock(buffer, &data2, &max, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(data == data2, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Extra Unlock */ + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IMFMediaBuffer_Release(buffer); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -285,6 +374,7 @@ START_TEST(mfplat) test_MFCreateMediaType(); test_MFCreateAttributes(); test_MFCreateMFByteStreamOnStream(); + test_MFCreateMemoryBuffer(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 890d7bd..5b98187 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -67,6 +67,7 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); +HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, -- 1.9.1

2 3

[PATCH v2 3/4] mfplat: Implement MFCreateMFByteStreamOnStream
by Alistair Leslie-Hughes Sept. 7, 2018

Sept. 7, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45372 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 241 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 24 +++++ include/mfidl.idl | 1 + 4 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c36a5ef..2d87429 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -32,6 +32,7 @@ #include "mfidl.h" #include "mferror.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -441,6 +442,246 @@ HRESULT WINAPI MFShutdown(void) return S_OK; } + +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1b33e2d..1d64420 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -45,7 +45,7 @@ @ stdcall MFCreateEventQueue(ptr) @ stub MFCreateFile @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer -@ stub MFCreateMFByteStreamOnStream +@ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stub MFCreateMediaEvent diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f3a4521..f4b5014 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -37,6 +37,7 @@ #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); +static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); @@ -194,6 +195,7 @@ static void init_functions(void) #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; X(MFCreateSourceResolver); + X(MFCreateMFByteStreamOnStream); #undef X } @@ -250,6 +252,27 @@ static void test_MFCreateAttributes(void) IMFAttributes_Release(attributes); } +static void test_MFCreateMFByteStreamOnStream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IMFByteStream_Release(bytestream); +} START_TEST(mfplat) { @@ -261,6 +284,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateMediaType(); test_MFCreateAttributes(); + test_MFCreateMFByteStreamOnStream(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 12b351d..84be055 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -251,6 +251,7 @@ interface IMFGetService : IUnknown } cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") -- 1.9.1

1 0

[PATCH v2 2/4] mfplat: Add MFTUnregisterLocal stub
by Alistair Leslie-Hughes Sept. 7, 2018

Sept. 7, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 7 +++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c5c8ad8..c36a5ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -240,6 +240,13 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST return S_OK; } +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) +{ + FIXME("(%p)\n", factory); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c143814..1b33e2d 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -141,7 +141,7 @@ @ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) -@ stub MFTUnregisterLocal +@ stdcall MFTUnregisterLocal(ptr) @ stub MFTUnregisterLocalByCLSID @ stub MFTraceError @ stub MFTraceFuncEnter diff --git a/include/mfapi.h b/include/mfapi.h index f889840..890d7bd 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -85,6 +85,7 @@ HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); HRESULT WINAPI MFTUnregister(CLSID clsid); +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); #endif /* __WINE_MFAPI_H */ -- 1.9.1

1 0

[PATCH v2 1/4] mfplat: Add MFTRegisterLocal stub
by Alistair Leslie-Hughes Sept. 7, 2018

Sept. 7, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45622 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index df61f3c..c5c8ad8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -230,6 +230,16 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types) +{ + FIXME("(%p, %s, %s, %x, %u, %p, %u, %p)\n", factory, debugstr_guid(category), debugstr_w(name), + flags, cinput, input_types, coutput, output_types); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index a66f4d1..c143814 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal +@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index 5aead1e..f889840 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -78,6 +78,9 @@ HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); -- 1.9.1

1 0