September 2018 - Wine-Commits

Nikolay Sivov : opcservices: Write full content type stream.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: adccf12e3b68d9cd0a58e5a2ef34acbe87648c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=adccf12e3b68d9cd0a58e5a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:38 2018 +0300 opcservices: Write full content type stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 3 + dlls/opcservices/package.c | 244 +++++++++++++++++++++++++++++++++-- dlls/opcservices/tests/opcservices.c | 79 ++++++++++++ 3 files changed, 317 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adccf12e3b68d9cd0a58…

1 0

Józef Kucia : user32: Call DefWindowProc() in DesktopWndProc().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: a8e7348a3da311377f01605617adf8ef583c17be URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e7348a3da311377f016056… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 12:07:27 2018 +0200 user32: Call DefWindowProc() in DesktopWndProc(). This fixes a regression introduced by commit fc14753dc0188a52a05243d5d82c4062b93daaff. WM_NCCALCSIZE is not handled yet because it initiates loading the driver again. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45485 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/desktop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index d22e732..fe66494 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -127,8 +127,10 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP } return TRUE; } + case WM_NCCALCSIZE: + return 0; default: - return 0; /* all other messages are ignored */ + return DefWindowProcW( hwnd, message, wParam, lParam ); } }

1 0

Zebediah Figura : quartz/tests: Add some tests for IFilterGraph_FindFilterByName().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 5f0bb5bd34efc9f20f812b63e7444d7b522a8d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f0bb5bd34efc9f20f812b63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:12 2018 -0500 quartz/tests: Add some tests for IFilterGraph_FindFilterByName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4d49772..2374e2f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1878,15 +1878,25 @@ static void test_add_remove_filter(void) struct testfilter filter; IFilterGraph2 *graph = create_graph(); + IBaseFilter *ret_filter; HRESULT hr; testfilter_init(&filter, NULL, 0); + hr = IFilterGraph2_FindFilterByName(graph, testid, &ret_filter); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + ok(!ret_filter, "Got filter %p.\n", ret_filter); + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, testid); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(filter.graph == (IFilterGraph *)graph, "Got graph %p.\n", filter.graph); ok(!lstrcmpW(filter.name, testid), "Got name %s.\n", wine_dbgstr_w(filter.name)); + hr = IFilterGraph2_FindFilterByName(graph, testid, &ret_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_filter == &filter.IBaseFilter_iface, "Got filter %p.\n", ret_filter); + IBaseFilter_Release(ret_filter); + hr = IFilterGraph2_RemoveFilter(graph, &filter.IBaseFilter_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!filter.graph, "Got graph %p.\n", filter.graph); @@ -1894,11 +1904,20 @@ static void test_add_remove_filter(void) ok(!filter.clock, "Got clock %p,\n", filter.clock); ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); + hr = IFilterGraph2_FindFilterByName(graph, testid, &ret_filter); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + ok(!ret_filter, "Got filter %p.\n", ret_filter); + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(filter.graph == (IFilterGraph *)graph, "Got graph %p.\n", filter.graph); ok(!lstrcmpW(filter.name, defaultid), "Got name %s.\n", wine_dbgstr_w(filter.name)); + hr = IFilterGraph2_FindFilterByName(graph, defaultid, &ret_filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_filter == &filter.IBaseFilter_iface, "Got filter %p.\n", ret_filter); + IBaseFilter_Release(ret_filter); + /* test releasing the filter graph while filters are still connected */ hr = IFilterGraph2_Release(graph); ok(!hr, "Got outstanding refcount %d.\n", hr);

1 0

Zebediah Figura : quartz/tests: Add some tests for IFilterGraph_Add/ RemoveFilter().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: e0b98935d4ea939093b6268647450d0ec8982de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b98935d4ea939093b62686… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:10 2018 -0500 quartz/tests: Add some tests for IFilterGraph_Add/RemoveFilter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 52 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 82f895f..7425e29 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1166,6 +1166,7 @@ struct testfilter LONG ref; IFilterGraph *graph; WCHAR *name; + IReferenceClock *clock; IEnumPins IEnumPins_iface; struct testpin *pins; @@ -1314,8 +1315,15 @@ static HRESULT WINAPI testfilter_GetState(IBaseFilter *iface, DWORD timeout, FIL static HRESULT WINAPI testfilter_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) { - if (winetest_debug > 1) trace("%p->SetSyncSource(%p)\n", iface, clock); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IBaseFilter(iface); + if (winetest_debug > 1) trace("%p->SetSyncSource(%p)\n", filter, clock); + + if (filter->clock) + IReferenceClock_Release(filter->clock); + if (clock) + IReferenceClock_AddRef(clock); + filter->clock = clock; + return S_OK; } static HRESULT WINAPI testfilter_GetSyncSource(IBaseFilter *iface, IReferenceClock **clock) @@ -1863,6 +1871,45 @@ static void test_control_delegation(void) IFilterGraph2_Release(graph); } +static void test_add_remove_filter(void) +{ + static const WCHAR defaultid[] = {'0','0','0','1',0}; + static const WCHAR testid[] = {'t','e','s','t','i','d',0}; + struct testfilter filter; + + IFilterGraph2 *graph = create_graph(); + HRESULT hr; + + testfilter_init(&filter, NULL, 0); + + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, testid); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter.graph == (IFilterGraph *)graph, "Got graph %p.\n", filter.graph); + ok(!lstrcmpW(filter.name, testid), "Got name %s.\n", wine_dbgstr_w(filter.name)); + + hr = IFilterGraph2_RemoveFilter(graph, &filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!filter.graph, "Got graph %p.\n", filter.graph); +todo_wine + ok(!filter.name, "Got name %s.\n", wine_dbgstr_w(filter.name)); + ok(!filter.clock, "Got clock %p,\n", filter.clock); + ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); + + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter.graph == (IFilterGraph *)graph, "Got graph %p.\n", filter.graph); + ok(!lstrcmpW(filter.name, defaultid), "Got name %s.\n", wine_dbgstr_w(filter.name)); + + /* test releasing the filter graph while filters are still connected */ + hr = IFilterGraph2_Release(graph); + ok(!hr, "Got outstanding refcount %d.\n", hr); + ok(!filter.graph, "Got graph %p.\n", filter.graph); +todo_wine + ok(!filter.name, "Got name %s.\n", wine_dbgstr_w(filter.name)); + ok(!filter.clock, "Got clock %p.\n", filter.clock); + ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1875,6 +1922,7 @@ START_TEST(filtergraph) test_graph_builder_render(); test_aggregate_filter_graph(); test_control_delegation(); + test_add_remove_filter(); CoUninitialize(); test_render_with_multithread();

1 0

Nikolay Sivov : d2d1: Implement CreateBitmapFromDxgiSurface().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: bdd3f7b1eeb6f17c9da67ef4f7bf2d1c15bcf7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdd3f7b1eeb6f17c9da67ef4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:55:08 2018 +0300 d2d1: Implement CreateBitmapFromDxgiSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index d779fb0..d20377b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1825,9 +1825,33 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromWicCol static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface(ID2D1DeviceContext *iface, IDXGISurface *surface, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) { - FIXME("iface %p, surface %p, desc %p, bitmap %p stub!\n", iface, surface, desc, bitmap); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d_bitmap *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, surface %p, desc %p, bitmap %p.\n", iface, surface, desc, bitmap); + + if (!desc) + { + DXGI_SURFACE_DESC surface_desc; + + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + return hr; + } + + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + bitmap_desc.pixelFormat.format = surface_desc.Format; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + desc = &bitmap_desc; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_shared(context, &IID_IDXGISurface, surface, desc, &object))) + *bitmap = &object->ID2D1Bitmap1_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface,

1 0

Zebediah Figura : quartz/tests: Test interfaces exposed by the filter graph.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 45e618162dcaabb8ad5642186d150e1aecb2d573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45e618162dcaabb8ad564218… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:09 2018 -0500 quartz/tests: Test interfaces exposed by the filter graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 37304d6..82f895f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -76,6 +76,46 @@ static IFilterGraph2 *create_graph(void) return ret; } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IFilterGraph2 *graph = create_graph(); + + check_interface(graph, &IID_IBasicAudio, TRUE); + check_interface(graph, &IID_IBasicVideo2, TRUE); + check_interface(graph, &IID_IFilterGraph2, TRUE); + check_interface(graph, &IID_IFilterMapper, TRUE); + check_interface(graph, &IID_IFilterMapper3, TRUE); + check_interface(graph, &IID_IGraphConfig, TRUE); + check_interface(graph, &IID_IGraphVersion, TRUE); + check_interface(graph, &IID_IMediaControl, TRUE); + check_interface(graph, &IID_IMediaEvent, TRUE); + check_interface(graph, &IID_IMediaFilter, TRUE); + check_interface(graph, &IID_IMediaEventSink, TRUE); + check_interface(graph, &IID_IMediaPosition, TRUE); + check_interface(graph, &IID_IMediaSeeking, TRUE); + check_interface(graph, &IID_IObjectWithSite, TRUE); + check_interface(graph, &IID_IVideoWindow, TRUE); + + check_interface(graph, &IID_IBaseFilter, FALSE); + + IFilterGraph2_Release(graph); +} + static void test_basic_video(IFilterGraph2 *graph) { IBasicVideo* pbv; @@ -1827,6 +1867,7 @@ START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + test_interfaces(); test_render_run(avifile); test_render_run(mpegfile); test_enum_filters();

1 0

Nikolay Sivov : opcservices: Implement GetPart().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: f663745ca5c0496604a35d318efc8a914b3853b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f663745ca5c0496604a35d31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:36 2018 +0300 opcservices: Implement GetPart(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 52 +++++++++++++++++++++++++++++++----- dlls/opcservices/tests/opcservices.c | 51 ++++++++++++++++++++++++++++++++--- include/opcbase.idl | 2 ++ 3 files changed, 96 insertions(+), 9 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index c865cf3..6e1a024 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -861,9 +861,6 @@ static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, cons { struct opc_part *part; - if (!name) - return E_POINTER; - if (!opc_array_reserve((void **)&set->parts, &set->size, set->count + 1, sizeof(*set->parts))) return E_OUTOFMEMORY; @@ -898,6 +895,21 @@ static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, cons return S_OK; } +static struct opc_part *opc_part_set_get_part(const struct opc_part_set *part_set, IOpcPartUri *name) +{ + BOOL is_equal; + size_t i; + + for (i = 0; i < part_set->count; ++i) + { + is_equal = FALSE; + if (IOpcPartUri_IsEqual(part_set->parts[i]->name, (IUri *)name, &is_equal) == S_OK && is_equal) + return part_set->parts[i]; + } + + return NULL; +} + static HRESULT WINAPI opc_part_set_QueryInterface(IOpcPartSet *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -944,11 +956,28 @@ static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface) return refcount; } -static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name, IOpcPart **part) +static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name, IOpcPart **out) { - FIXME("iface %p, name %p, part %p stub!\n", iface, name, part); + struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); + struct opc_part *part; - return E_NOTIMPL; + TRACE("iface %p, name %p, out %p.\n", iface, name, out); + + if (!out) + return E_POINTER; + + *out = NULL; + + if (!name) + return E_POINTER; + + if ((part = opc_part_set_get_part(part_set, name))) + { + *out = &part->IOpcPart_iface; + IOpcPart_AddRef(*out); + } + + return *out ? S_OK : OPC_E_NO_SUCH_PART; } static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *name, LPCWSTR content_type, @@ -959,6 +988,17 @@ static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *n TRACE("iface %p, name %p, content_type %s, compression_options %#x, part %p.\n", iface, name, debugstr_w(content_type), compression_options, part); + if (!part) + return E_POINTER; + + *part = NULL; + + if (!name) + return E_POINTER; + + if (opc_part_set_get_part(part_set, name)) + return OPC_E_DUPLICATE_PART; + return opc_part_create(part_set, name, content_type, compression_options, part); } diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index ab8c2e4..2bcf46f 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -42,16 +42,17 @@ static void test_package(void) static const WCHAR uriW[] = {'/','u','r','i',0}; static const WCHAR rootW[] = {'/',0}; IOpcRelationshipSet *relset, *relset2; + IOpcPartUri *part_uri, *part_uri2; IOpcPartSet *partset, *partset2; + OPC_COMPRESSION_OPTIONS options; IStream *stream, *stream2; + IOpcPart *part, *part2; IOpcRelationship *rel; - IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; LARGE_INTEGER move; ULARGE_INTEGER pos; IUri *target_uri; - IOpcPart *part; char buff[16]; IOpcUri *uri; HRESULT hr; @@ -80,11 +81,55 @@ static void test_package(void) hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri); ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri2); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + part = (void *)0xdeadbeef; hr = IOpcPartSet_CreatePart(partset, NULL, typeW, OPC_COMPRESSION_NONE, &part); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(part == NULL, "Unexpected pointer %p.\n", part); + + hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, OPC_COMPRESSION_NONE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, OPC_COMPRESSION_NONE, &part); + hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, 0xdeadbeef, &part); ok(SUCCEEDED(hr), "Failed to create a part, hr %#x.\n", hr); + hr = IOpcPart_GetCompressionOptions(part, &options); + ok(SUCCEEDED(hr), "Failed to get compression options, hr %#x.\n", hr); + ok(options == 0xdeadbeef, "Unexpected compression options %#x.\n", options); + + part2 = (void *)0xdeadbeef; + hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, OPC_COMPRESSION_NONE, &part2); + ok(hr == OPC_E_DUPLICATE_PART, "Unexpected hr %#x.\n", hr); + ok(part2 == NULL, "Unexpected instance %p.\n", part2); + + part2 = (void *)0xdeadbeef; + hr = IOpcPartSet_CreatePart(partset, part_uri2, typeW, OPC_COMPRESSION_NONE, &part2); + ok(hr == OPC_E_DUPLICATE_PART, "Unexpected hr %#x.\n", hr); + ok(part2 == NULL, "Unexpected instance %p.\n", part2); + IOpcPartUri_Release(part_uri2); + + hr = IOpcPartSet_GetPart(partset, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + part2 = (void *)0xdeadbeef; + hr = IOpcPartSet_GetPart(partset, NULL, &part2); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(part2 == NULL, "Unexpected pointer %p.\n", part2); + + hr = IOpcPartSet_GetPart(partset, part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPartSet_GetPart(partset, part_uri, &part2); + ok(SUCCEEDED(hr), "Failed to get part, hr %#x.\n", hr); + IOpcPart_Release(part2); + + hr = IOpcFactory_CreatePartUri(factory, targetW, &part_uri2); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + hr = IOpcPartSet_GetPart(partset, part_uri2, &part2); + ok(hr == OPC_E_NO_SUCH_PART, "Unexpected hr %#x.\n", hr); + IOpcPartUri_Release(part_uri2); hr = IOpcPart_GetContentStream(part, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); diff --git a/include/opcbase.idl b/include/opcbase.idl index 8523271..d850753 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -43,7 +43,9 @@ typedef [v1_enum] enum 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_DUPLICATE_PART MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0xb)") cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") +cpp_quote("#define OPC_E_NO_SUCH_PART MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x18)") cpp_quote("#define OPC_E_NO_SUCH_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x48)") cpp_quote("#define OPC_E_ENUM_COLLECTION_CHANGED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x50)") cpp_quote("#define OPC_E_ENUM_INVALID_POSITION MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x53)")

1 0

Nikolay Sivov : opcservices: Write relationship parts.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: c1982f5ddaccc18e9a0df76f7714828ae25df1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1982f5ddaccc18e9a0df76f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:34 2018 +0300 opcservices: Write relationship parts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 133 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 5c338f7..fab337d 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1493,7 +1493,120 @@ static HRESULT opc_package_write_contenttypes(struct zip_archive *archive, IXmlW return hr; } -static HRESULT opc_package_write_part(struct zip_archive *archive, IOpcPart *part) +static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) +{ + static const WCHAR relationshipW[] = {'R','e','l','a','t','i','o','n','s','h','i','p',0}; + static const WCHAR targetW[] = {'T','a','r','g','e','t',0}; + static const WCHAR typeW[] = {'T','y','p','e',0}; + static const WCHAR idW[] = {'I','d',0}; + BSTR target_uri; + HRESULT hr; + WCHAR *str; + IUri *uri; + + if (FAILED(hr = IXmlWriter_WriteStartElement(writer, NULL, relationshipW, NULL))) + return hr; + + if (FAILED(hr = IOpcRelationship_GetTargetUri(rel, &uri))) + return hr; + + IUri_GetRawUri(uri, &target_uri); + IUri_Release(uri); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, targetW, NULL, target_uri); + SysFreeString(target_uri); + if (FAILED(hr)) + return hr; + + if (FAILED(hr = IOpcRelationship_GetId(rel, &str))) + return hr; + + hr = IXmlWriter_WriteAttributeString(writer, NULL, idW, NULL, str); + CoTaskMemFree(str); + if (FAILED(hr)) + return hr; + + if (FAILED(hr = IOpcRelationship_GetRelationshipType(rel, &str))) + return hr; + + hr = IXmlWriter_WriteAttributeString(writer, NULL, typeW, NULL, str); + CoTaskMemFree(str); + if (FAILED(hr)) + return hr; + + return IXmlWriter_WriteEndElement(writer); +} + +static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelationshipSet *rels, + IOpcUri *uri, IXmlWriter *writer) +{ + static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', + 'p','a','c','k','a','g','e','/','2','0','0','6','/','r','e','l','a','t','i','o','n','s','h','i','p','s',0}; + static const WCHAR relationshipsW[] = {'R','e','l','a','t','i','o','n','s','h','i','p','s',0}; + IOpcRelationshipEnumerator *enumerator; + IOpcPartUri *rels_uri; + BSTR rels_part_uri; + IStream *content; + BOOL has_next; + HRESULT hr; + + if (FAILED(hr = IOpcRelationshipSet_GetEnumerator(rels, &enumerator))) + return hr; + + hr = IOpcRelationshipEnumerator_MoveNext(enumerator, &has_next); + if (!has_next) + { + IOpcRelationshipEnumerator_Release(enumerator); + return hr; + } + + if (FAILED(hr = CreateStreamOnHGlobal(NULL, TRUE, &content))) + { + IOpcRelationshipEnumerator_Release(enumerator); + return hr; + } + + IXmlWriter_SetOutput(writer, (IUnknown *)content); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteStartElement(writer, NULL, relationshipsW, uriW); + + while (has_next) + { + IOpcRelationship *rel; + + if (FAILED(hr = IOpcRelationshipEnumerator_GetCurrent(enumerator, &rel))) + break; + + hr = opc_package_write_rel(rel, writer); + IOpcRelationship_Release(rel); + if (FAILED(hr)) + break; + + IOpcRelationshipEnumerator_MoveNext(enumerator, &has_next); + } + + IOpcRelationshipEnumerator_Release(enumerator); + + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteEndDocument(writer); + if (SUCCEEDED(hr)) + hr = IXmlWriter_Flush(writer); + + hr = IOpcUri_GetRelationshipsPartUri(uri, &rels_uri); + if (SUCCEEDED(hr)) + hr = IOpcPartUri_GetRawUri(rels_uri, &rels_part_uri); + if (SUCCEEDED(hr)) + hr = compress_add_file(archive, rels_part_uri, content, OPC_COMPRESSION_NORMAL); + + SysFreeString(rels_part_uri); + IStream_Release(content); + + return hr; +} + +static HRESULT opc_package_write_part(struct zip_archive *archive, IOpcPart *part, IXmlWriter *writer) { OPC_COMPRESSION_OPTIONS options = OPC_COMPRESSION_NORMAL; IStream *content = NULL; @@ -1522,7 +1635,7 @@ static HRESULT opc_package_write_part(struct zip_archive *archive, IOpcPart *par return hr; } -static HRESULT opc_package_write_parts(struct zip_archive *archive, IOpcPackage *package) +static HRESULT opc_package_write_parts(struct zip_archive *archive, IOpcPackage *package, IXmlWriter *writer) { IOpcPartEnumerator *parts; IOpcPartSet *part_set; @@ -1544,7 +1657,7 @@ static HRESULT opc_package_write_parts(struct zip_archive *archive, IOpcPackage if (FAILED(hr = IOpcPartEnumerator_GetCurrent(parts, &part))) break; - hr = opc_package_write_part(archive, part); + hr = opc_package_write_part(archive, part, writer); IOpcPart_Release(part); if (FAILED(hr)) break; @@ -1557,7 +1670,9 @@ static HRESULT opc_package_write_parts(struct zip_archive *archive, IOpcPackage HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream) { + IOpcRelationshipSet *rels = NULL; struct zip_archive *archive; + IOpcUri *uri = NULL; IXmlWriter *writer; HRESULT hr; @@ -1575,11 +1690,21 @@ HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream * /* [Content_Types].xml */ hr = opc_package_write_contenttypes(archive, writer); + /* Package relationships. */ + if (SUCCEEDED(hr)) + hr = IOpcPackage_GetRelationshipSet(package, &rels); + if (SUCCEEDED(hr)) + hr = opc_root_uri_create(&uri); + if (SUCCEEDED(hr)) + hr = opc_package_write_rels(archive, rels, uri, writer); + /* Parts. */ if (SUCCEEDED(hr)) - hr = opc_package_write_parts(archive, package); + hr = opc_package_write_parts(archive, package, writer); + IOpcRelationshipSet_Release(rels); compress_finalize_archive(archive); IXmlWriter_Release(writer); + IOpcUri_Release(uri); return hr; }

1 0

Nikolay Sivov : opcservices: Implement CombinePartUri().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 2546e47bb2aa722568ced9f9a3cd3437935eff79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2546e47bb2aa722568ced9f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:32 2018 +0300 opcservices: Implement CombinePartUri(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 14 ++++++++++---- dlls/opcservices/uri.c | 21 +++++++++++++++++++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 986aae4..ab8c2e4 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -1053,19 +1053,25 @@ static void test_combine_uri(void) hr = CreateUri(relativeW, Uri_CREATE_ALLOW_RELATIVE, 0, &relative_uri); ok(SUCCEEDED(hr), "%u: failed to create relative uri, hr %#x.\n", i, hr); + combined_uri = (void *)0xdeadbeef; + hr = IOpcUri_CombinePartUri(uri, NULL, &combined_uri); + ok(hr == E_POINTER, "%u: failed to combine uris, hr %#x.\n", i, hr); + ok(!combined_uri, "Unexpected instance.\n"); + + hr = IOpcUri_CombinePartUri(uri, relative_uri, NULL); + ok(hr == E_POINTER, "%u: failed to combine uris, hr %#x.\n", i, hr); + hr = IOpcUri_CombinePartUri(uri, relative_uri, &combined_uri); - todo_wine ok(SUCCEEDED(hr), "%u: failed to combine uris, hr %#x.\n", i, hr); - if (SUCCEEDED(hr)) - { hr = IOpcPartUri_GetRawUri(combined_uri, &str); ok(SUCCEEDED(hr), "%u: failed to get raw uri, hr %#x.\n", i, hr); + todo_wine_if(i == 2 || i == 3) ok(!lstrcmpW(str, combinedW), "%u: unexpected uri %s.\n", i, wine_dbgstr_w(str)); SysFreeString(str); IOpcPartUri_Release(combined_uri); - } + heap_free(uriW); heap_free(relativeW); heap_free(combinedW); diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index fa5ddbc..800ae34 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -357,9 +357,26 @@ static HRESULT WINAPI opc_uri_GetRelativeUri(IOpcPartUri *iface, IOpcPartUri *pa static HRESULT WINAPI opc_uri_CombinePartUri(IOpcPartUri *iface, IUri *relative_uri, IOpcPartUri **combined) { - FIXME("iface %p, relative_uri %p, combined %p stub!\n", iface, relative_uri, combined); + struct opc_uri *uri = impl_from_IOpcPartUri(iface); + IUri *combined_uri; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, relative_uri %p, combined %p.\n", iface, relative_uri, combined); + + if (!combined) + return E_POINTER; + + *combined = NULL; + + if (!relative_uri) + return E_POINTER; + + if (FAILED(hr = CoInternetCombineIUri(uri->uri, relative_uri, 0, &combined_uri, 0))) + return hr; + + hr = opc_part_uri_create(combined_uri, NULL, combined); + IUri_Release(combined_uri); + return hr; } static HRESULT WINAPI opc_uri_ComparePartUri(IOpcPartUri *iface, IOpcPartUri *part_uri,

1 0

Nikolay Sivov : opcservices: Write package parts.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 2bd72b117cd7b19d91edb7eb664df246c632f739 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd72b117cd7b19d91edb7eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:33 2018 +0300 opcservices: Write package parts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 66 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index f350394..5c338f7 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1493,7 +1493,69 @@ static HRESULT opc_package_write_contenttypes(struct zip_archive *archive, IXmlW return hr; } -HRESULT opc_package_write(IOpcPackage *input, OPC_WRITE_FLAGS flags, IStream *stream) +static HRESULT opc_package_write_part(struct zip_archive *archive, IOpcPart *part) +{ + OPC_COMPRESSION_OPTIONS options = OPC_COMPRESSION_NORMAL; + IStream *content = NULL; + IOpcPartUri *name; + BSTR uri = NULL; + HRESULT hr; + + if (FAILED(hr = IOpcPart_GetName(part, &name))) + return hr; + + hr = IOpcPartUri_GetRawUri(name, &uri); + if (SUCCEEDED(hr)) + hr = IOpcPart_GetCompressionOptions(part, &options); + if (SUCCEEDED(hr)) + hr = IOpcPart_GetContentStream(part, &content); + if (SUCCEEDED(hr)) + { + /* Part names always start with root '/', skip it. */ + hr = compress_add_file(archive, uri + 1, content, options); + } + + SysFreeString(uri); + if (content) + IStream_Release(content); + + return hr; +} + +static HRESULT opc_package_write_parts(struct zip_archive *archive, IOpcPackage *package) +{ + IOpcPartEnumerator *parts; + IOpcPartSet *part_set; + BOOL got_next; + HRESULT hr; + + if (FAILED(hr = IOpcPackage_GetPartSet(package, &part_set))) + return hr; + + hr = IOpcPartSet_GetEnumerator(part_set, &parts); + IOpcPartSet_Release(part_set); + if (FAILED(hr)) + return hr; + + while (IOpcPartEnumerator_MoveNext(parts, &got_next) == S_OK && got_next) + { + IOpcPart *part; + + if (FAILED(hr = IOpcPartEnumerator_GetCurrent(parts, &part))) + break; + + hr = opc_package_write_part(archive, part); + IOpcPart_Release(part); + if (FAILED(hr)) + break; + } + + IOpcPartEnumerator_Release(parts); + + return hr; +} + +HRESULT opc_package_write(IOpcPackage *package, OPC_WRITE_FLAGS flags, IStream *stream) { struct zip_archive *archive; IXmlWriter *writer; @@ -1513,6 +1575,8 @@ HRESULT opc_package_write(IOpcPackage *input, OPC_WRITE_FLAGS flags, IStream *st /* [Content_Types].xml */ hr = opc_package_write_contenttypes(archive, writer); + if (SUCCEEDED(hr)) + hr = opc_package_write_parts(archive, package); compress_finalize_archive(archive); IXmlWriter_Release(writer);

1 0