wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Nikolay Sivov : opcservices: Keep relationship type string.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: a2e8bd8fdf5fa7f41f16227d0421119899f4cefe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e8bd8fdf5fa7f41f16227d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 5 08:37:27 2018 +0300 opcservices: Keep relationship type string. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 235dc97..cac89c5 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -66,6 +66,7 @@ struct opc_relationship LONG refcount; WCHAR *id; + WCHAR *type; IUri *target; OPC_URI_TARGET_MODE target_mode; }; @@ -399,6 +400,7 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) if (!refcount) { CoTaskMemFree(relationship->id); + CoTaskMemFree(relationship->type); IUri_Release(relationship->target); heap_free(relationship); } @@ -418,9 +420,12 @@ static HRESULT WINAPI opc_relationship_GetId(IOpcRelationship *iface, WCHAR **id static HRESULT WINAPI opc_relationship_GetRelationshipType(IOpcRelationship *iface, WCHAR **type) { - FIXME("iface %p, type %p stub!\n", iface, type); + struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); - return E_NOTIMPL; + TRACE("iface %p, type %p.\n", iface, type); + + *type = opc_strdupW(relationship->type); + return *type ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI opc_relationship_GetSourceUri(IOpcRelationship *iface, IOpcUri **uri) @@ -465,8 +470,8 @@ static const IOpcRelationshipVtbl opc_relationship_vtbl = opc_relationship_GetTargetMode, }; -static HRESULT opc_relationship_create(struct opc_relationship_set *set, const WCHAR *id, IUri *target_uri, - OPC_URI_TARGET_MODE target_mode, IOpcRelationship **out) +static HRESULT opc_relationship_create(struct opc_relationship_set *set, const WCHAR *id, const WCHAR *type, + IUri *target_uri, OPC_URI_TARGET_MODE target_mode, IOpcRelationship **out) { struct opc_relationship *relationship; @@ -479,6 +484,9 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W relationship->IOpcRelationship_iface.lpVtbl = &opc_relationship_vtbl; relationship->refcount = 1; + relationship->target = target_uri; + IUri_AddRef(relationship->target); + /* FIXME: test that id is unique */ if (id) relationship->id = opc_strdupW(id); @@ -495,15 +503,13 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W } } - if (!relationship->id) + relationship->type = opc_strdupW(type); + if (!relationship->id || !relationship->type) { - heap_free(relationship); + IOpcRelationship_Release(&relationship->IOpcRelationship_iface); return E_OUTOFMEMORY; } - relationship->target = target_uri; - IUri_AddRef(relationship->target); - set->relationships[set->count++] = relationship; IOpcRelationship_AddRef(&relationship->IOpcRelationship_iface); @@ -577,7 +583,7 @@ static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSe if (!type || !target_uri) return E_POINTER; - return opc_relationship_create(relationship_set, id, target_uri, target_mode, relationship); + return opc_relationship_create(relationship_set, id, type, target_uri, target_mode, relationship); } static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSet *iface, const WCHAR *id)

1 0

Nikolay Sivov : opcservices: Keep target uri and mode for relationships.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: 40e276f75d6edb08564aa7680072474d8d2bc16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e276f75d6edb08564aa768… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 5 08:37:26 2018 +0300 opcservices: Keep target uri and mode for relationships. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 28 ++++++++++++++++++++++------ dlls/opcservices/tests/opcservices.c | 16 +++++++++++++--- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 1970fc4..235dc97 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -66,6 +66,8 @@ struct opc_relationship LONG refcount; WCHAR *id; + IUri *target; + OPC_URI_TARGET_MODE target_mode; }; struct opc_relationship_set @@ -397,6 +399,7 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) if (!refcount) { CoTaskMemFree(relationship->id); + IUri_Release(relationship->target); heap_free(relationship); } @@ -429,16 +432,25 @@ static HRESULT WINAPI opc_relationship_GetSourceUri(IOpcRelationship *iface, IOp static HRESULT WINAPI opc_relationship_GetTargetUri(IOpcRelationship *iface, IUri **target) { - FIXME("iface %p, target %p stub!\n", iface, target); + struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); - return E_NOTIMPL; + TRACE("iface %p, target %p.\n", iface, target); + + *target = relationship->target; + IUri_AddRef(*target); + + return S_OK; } static HRESULT WINAPI opc_relationship_GetTargetMode(IOpcRelationship *iface, OPC_URI_TARGET_MODE *target_mode) { - FIXME("iface %p, target_mode %p stub!\n", iface, target_mode); + struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); - return E_NOTIMPL; + TRACE("iface %p, target_mode %p.\n", iface, target_mode); + + *target_mode = relationship->target_mode; + + return S_OK; } static const IOpcRelationshipVtbl opc_relationship_vtbl = @@ -453,7 +465,8 @@ static const IOpcRelationshipVtbl opc_relationship_vtbl = opc_relationship_GetTargetMode, }; -static HRESULT opc_relationship_create(struct opc_relationship_set *set, const WCHAR *id, IOpcRelationship **out) +static HRESULT opc_relationship_create(struct opc_relationship_set *set, const WCHAR *id, IUri *target_uri, + OPC_URI_TARGET_MODE target_mode, IOpcRelationship **out) { struct opc_relationship *relationship; @@ -488,6 +501,9 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W return E_OUTOFMEMORY; } + relationship->target = target_uri; + IUri_AddRef(relationship->target); + set->relationships[set->count++] = relationship; IOpcRelationship_AddRef(&relationship->IOpcRelationship_iface); @@ -561,7 +577,7 @@ static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSe if (!type || !target_uri) return E_POINTER; - return opc_relationship_create(relationship_set, id, relationship); + return opc_relationship_create(relationship_set, id, target_uri, target_mode, relationship); } static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSet *iface, const WCHAR *id) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 8232a7e..2850716 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -205,16 +205,17 @@ static void test_file_stream(void) DeleteFileW(pathW); } -static void test_relationship_id(void) +static void test_relationship(void) { static const WCHAR absoluteW[] = {'f','i','l','e',':','/','/','h','o','s','t','/','f','i','l','e','.','t','x','t',0}; static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; static const WCHAR typeW[] = {'t','y','p','e',0}; - IUri *target_uri, *target_uri2; + IUri *target_uri, *target_uri2, *uri; IOpcRelationshipSet *rels; IOpcRelationship *rel; IOpcFactory *factory; IOpcPackage *package; + DWORD mode; HRESULT hr; WCHAR *id; @@ -257,6 +258,15 @@ todo_wine ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); + hr = IOpcRelationship_GetTargetUri(rel, &uri); + ok(SUCCEEDED(hr), "Failed to get target uri, hr %#x.\n", hr); + ok(uri == target_uri, "Unexpected uri.\n"); + IUri_Release(uri); + + hr = IOpcRelationship_GetTargetMode(rel, &mode); + ok(SUCCEEDED(hr), "Failed to get target mode, hr %#x.\n", hr); + ok(mode == OPC_URI_TARGET_MODE_INTERNAL, "Unexpected mode %d.\n", mode); + IOpcRelationship_Release(rel); IOpcRelationshipSet_Release(rels); @@ -283,7 +293,7 @@ START_TEST(opcservices) test_package(); test_file_stream(); - test_relationship_id(); + test_relationship(); IOpcFactory_Release(factory);

1 0

Nikolay Sivov : opcservices: Keep relationship id.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: 2ff3f6892bfcce0b08fe161a09d5e4ddaa210d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff3f6892bfcce0b08fe161a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 5 08:37:25 2018 +0300 opcservices: Keep relationship id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 2 +- dlls/opcservices/package.c | 44 ++++++++++++++++++++++--- dlls/opcservices/tests/Makefile.in | 2 +- dlls/opcservices/tests/opcservices.c | 64 ++++++++++++++++++++++++++++++++++++ include/opcbase.idl | 2 ++ include/winerror.h | 1 + 6 files changed, 108 insertions(+), 7 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 47fbbe4..3e9907f 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,5 +1,5 @@ MODULE = opcservices.dll -IMPORTS = uuid ole32 +IMPORTS = uuid ole32 advapi32 C_SRCS = \ factory.c \ diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index e671685..1970fc4 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "ntsecapi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -63,6 +64,8 @@ struct opc_relationship { IOpcRelationship IOpcRelationship_iface; LONG refcount; + + WCHAR *id; }; struct opc_relationship_set @@ -392,16 +395,22 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + CoTaskMemFree(relationship->id); heap_free(relationship); + } return refcount; } static HRESULT WINAPI opc_relationship_GetId(IOpcRelationship *iface, WCHAR **id) { - FIXME("iface %p, id %p stub!\n", iface, id); + struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); - return E_NOTIMPL; + TRACE("iface %p, id %p.\n", iface, id); + + *id = opc_strdupW(relationship->id); + return *id ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI opc_relationship_GetRelationshipType(IOpcRelationship *iface, WCHAR **type) @@ -444,7 +453,7 @@ static const IOpcRelationshipVtbl opc_relationship_vtbl = opc_relationship_GetTargetMode, }; -static HRESULT opc_relationship_create(struct opc_relationship_set *set, IOpcRelationship **out) +static HRESULT opc_relationship_create(struct opc_relationship_set *set, const WCHAR *id, IOpcRelationship **out) { struct opc_relationship *relationship; @@ -457,6 +466,28 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, IOpcRel relationship->IOpcRelationship_iface.lpVtbl = &opc_relationship_vtbl; relationship->refcount = 1; + /* FIXME: test that id is unique */ + if (id) + relationship->id = opc_strdupW(id); + else + { + relationship->id = CoTaskMemAlloc(10 * sizeof(WCHAR)); + if (relationship->id) + { + static const WCHAR fmtW[] = {'R','%','0','8','X',0}; + DWORD generated; + + RtlGenRandom(&generated, sizeof(generated)); + sprintfW(relationship->id, fmtW, generated); + } + } + + if (!relationship->id) + { + heap_free(relationship); + return E_OUTOFMEMORY; + } + set->relationships[set->count++] = relationship; IOpcRelationship_AddRef(&relationship->IOpcRelationship_iface); @@ -524,10 +555,13 @@ static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSe { struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); - FIXME("iface %p, id %s, type %s, target_uri %p, target_mode %d, relationship %p stub!\n", iface, debugstr_w(id), + TRACE("iface %p, id %s, type %s, target_uri %p, target_mode %d, relationship %p.\n", iface, debugstr_w(id), debugstr_w(type), target_uri, target_mode, relationship); - return opc_relationship_create(relationship_set, relationship); + if (!type || !target_uri) + return E_POINTER; + + return opc_relationship_create(relationship_set, id, relationship); } static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSet *iface, const WCHAR *id) diff --git a/dlls/opcservices/tests/Makefile.in b/dlls/opcservices/tests/Makefile.in index 7c0963c..202bf87 100644 --- a/dlls/opcservices/tests/Makefile.in +++ b/dlls/opcservices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = opcservices.dll -IMPORTS = ole32 +IMPORTS = ole32 urlmon C_SRCS = \ opcservices.c diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 5dc0d8c..8232a7e 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -24,6 +24,7 @@ #include "windows.h" #include "initguid.h" #include "msopc.h" +#include "urlmon.h" #include "wine/test.h" @@ -204,6 +205,68 @@ static void test_file_stream(void) DeleteFileW(pathW); } +static void test_relationship_id(void) +{ + static const WCHAR absoluteW[] = {'f','i','l','e',':','/','/','h','o','s','t','/','f','i','l','e','.','t','x','t',0}; + static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; + static const WCHAR typeW[] = {'t','y','p','e',0}; + IUri *target_uri, *target_uri2; + IOpcRelationshipSet *rels; + IOpcRelationship *rel; + IOpcFactory *factory; + IOpcPackage *package; + HRESULT hr; + WCHAR *id; + + factory = create_factory(); + + hr = IOpcFactory_CreatePackage(factory, &package); + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL) /* Vista */, "Failed to create a package, hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = CreateUri(targetW, Uri_CREATE_ALLOW_RELATIVE, 0, &target_uri); + ok(SUCCEEDED(hr), "Failed to create target uri, hr %#x.\n", hr); + + hr = CreateUri(absoluteW, 0, 0, &target_uri2); + ok(SUCCEEDED(hr), "Failed to create target uri, hr %#x.\n", hr); + + hr = IOpcPackage_GetRelationshipSet(package, &rels); + ok(SUCCEEDED(hr), "Failed to get part set, hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, NULL, NULL, OPC_URI_TARGET_MODE_INTERNAL, &rel); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, NULL, OPC_URI_TARGET_MODE_INTERNAL, &rel); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, NULL, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + /* Absolute target uri with internal mode */ + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri2, OPC_URI_TARGET_MODE_INTERNAL, &rel); +todo_wine + ok(hr == OPC_E_INVALID_RELATIONSHIP_TARGET, "Unexpected hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); + ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + + /* Autogenerated relationship id */ + hr = IOpcRelationship_GetId(rel, &id); + ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); + ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IOpcRelationship_Release(rel); + + IOpcRelationshipSet_Release(rels); + + IUri_Release(target_uri); + IUri_Release(target_uri2); + IOpcPackage_Release(package); + IOpcFactory_Release(factory); +} + START_TEST(opcservices) { IOpcFactory *factory; @@ -220,6 +283,7 @@ START_TEST(opcservices) test_package(); test_file_stream(); + test_relationship_id(); IOpcFactory_Release(factory); diff --git a/include/opcbase.idl b/include/opcbase.idl index 33f56ac..80f459f 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -40,3 +40,5 @@ typedef [v1_enum] enum OPC_URI_TARGET_MODE_INTERNAL = 0, OPC_URI_TARGET_MODE_EXTERNAL = 1, } OPC_URI_TARGET_MODE; + +cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") diff --git a/include/winerror.h b/include/winerror.h index 6193c24..d78c91e 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -59,6 +59,7 @@ #define FACILITY_PLA 48 #define FACILITY_FVE 49 #define FACILITY_WINDOWS_DEFENDER 80 +#define FACILITY_OPC 81 #define FACILITY_DIRECT3D11 0x87c #define FACILITY_AUDCLNT 0x889

1 0

Nikolay Sivov : opcservices: Keep relationships in a set.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: d28cf66224370191e61249a4ca8ac4301b90842f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d28cf66224370191e61249a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 5 08:37:24 2018 +0300 opcservices: Keep relationships in a set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 869fb03..e671685 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -69,6 +69,10 @@ struct opc_relationship_set { IOpcRelationshipSet IOpcRelationshipSet_iface; LONG refcount; + + struct opc_relationship **relationships; + size_t size; + size_t count; }; static inline struct opc_package *impl_from_IOpcPackage(IOpcPackage *iface) @@ -440,16 +444,22 @@ static const IOpcRelationshipVtbl opc_relationship_vtbl = opc_relationship_GetTargetMode, }; -static HRESULT opc_relationship_create(IOpcRelationship **out) +static HRESULT opc_relationship_create(struct opc_relationship_set *set, IOpcRelationship **out) { struct opc_relationship *relationship; + if (!opc_array_reserve((void **)&set->relationships, &set->size, set->count + 1, sizeof(*set->relationships))) + return E_OUTOFMEMORY; + if (!(relationship = heap_alloc_zero(sizeof(*relationship)))) return E_OUTOFMEMORY; relationship->IOpcRelationship_iface.lpVtbl = &opc_relationship_vtbl; relationship->refcount = 1; + set->relationships[set->count++] = relationship; + IOpcRelationship_AddRef(&relationship->IOpcRelationship_iface); + *out = &relationship->IOpcRelationship_iface; TRACE("Created relationship %p.\n", *out); return S_OK; @@ -489,7 +499,14 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + size_t i; + + for (i = 0; i < relationship_set->count; ++i) + IOpcRelationship_Release(&relationship_set->relationships[i]->IOpcRelationship_iface); + heap_free(relationship_set->relationships); heap_free(relationship_set); + } return refcount; } @@ -505,10 +522,12 @@ static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet * static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSet *iface, const WCHAR *id, const WCHAR *type, IUri *target_uri, OPC_URI_TARGET_MODE target_mode, IOpcRelationship **relationship) { + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); + FIXME("iface %p, id %s, type %s, target_uri %p, target_mode %d, relationship %p stub!\n", iface, debugstr_w(id), debugstr_w(type), target_uri, target_mode, relationship); - return opc_relationship_create(relationship); + return opc_relationship_create(relationship_set, relationship); } static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSet *iface, const WCHAR *id)

1 0

Nikolay Sivov : opcservices: Keep parts in a set.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: 8fd70ff2bf06f4bc23b75747c6ccde09ebda8db5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd70ff2bf06f4bc23b75747… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 5 08:37:23 2018 +0300 opcservices: Keep parts in a set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/opc_private.h | 26 ++++++++++++++++++++++++++ dlls/opcservices/package.c | 23 +++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index 4784b6c..30bcb00 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -19,5 +19,31 @@ #include "msopc.h" #include "wine/heap.h" +static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + extern HRESULT opc_package_create(IOpcPackage **package) DECLSPEC_HIDDEN; extern HRESULT opc_part_uri_create(const WCHAR *uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index cd4741d..869fb03 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -53,6 +53,10 @@ struct opc_part_set { IOpcPartSet IOpcPartSet_iface; LONG refcount; + + struct opc_part **parts; + size_t size; + size_t count; }; struct opc_relationship @@ -220,7 +224,7 @@ static const IOpcPartVtbl opc_part_vtbl = opc_part_GetCompressionOptions, }; -static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, +static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, const WCHAR *content_type, DWORD compression_options, IOpcPart **out) { struct opc_part *part; @@ -228,6 +232,9 @@ static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, if (!name) return E_POINTER; + if (!opc_array_reserve((void **)&set->parts, &set->size, set->count + 1, sizeof(*set->parts))) + return E_OUTOFMEMORY; + if (!(part = heap_alloc_zero(sizeof(*part)))) return E_OUTOFMEMORY; @@ -242,6 +249,9 @@ static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, return E_OUTOFMEMORY; } + set->parts[set->count++] = part; + IOpcPart_AddRef(&part->IOpcPart_iface); + *out = &part->IOpcPart_iface; TRACE("Created part %p.\n", *out); return S_OK; @@ -281,7 +291,14 @@ static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + size_t i; + + for (i = 0; i < part_set->count; ++i) + IOpcPart_Release(&part_set->parts[i]->IOpcPart_iface); + heap_free(part_set->parts); heap_free(part_set); + } return refcount; } @@ -296,10 +313,12 @@ static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *name, LPCWSTR content_type, OPC_COMPRESSION_OPTIONS compression_options, IOpcPart **part) { + struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); + TRACE("iface %p, name %p, content_type %s, compression_options %#x, part %p.\n", iface, name, debugstr_w(content_type), compression_options, part); - return opc_part_create(name, content_type, compression_options, part); + return opc_part_create(part_set, name, content_type, compression_options, part); } static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *name)

1 0

Jactry Zeng : ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: 68e35eb7456e68d4233ffc5e795511823a45ba6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=68e35eb7456e68d4233ffc5e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Sep 4 20:57:06 2018 +0800 ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42710 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2impl.c | 97 +++++++++++++++++++++++- dlls/ole32/tests/ole2.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68e35eb7456e68d4233f…

1 0

Jacek Caban : xmllite: Prefer builtin version.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: 5f11c441e0ef68e3c44707418c7c718c30191807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f11c441e0ef68e3c4470741… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 15:35:38 2018 +0200 xmllite: Prefer builtin version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/Makefile.in | 3 +-- dlls/xmllite/xmllite_main.c | 45 --------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in index a51c3dd..aeb4481 100644 --- a/dlls/xmllite/Makefile.in +++ b/dlls/xmllite/Makefile.in @@ -3,5 +3,4 @@ IMPORTLIB = xmllite C_SRCS = \ reader.c \ - writer.c \ - xmllite_main.c + writer.c diff --git a/dlls/xmllite/xmllite_main.c b/dlls/xmllite/xmllite_main.c deleted file mode 100644 index 63838a9..0000000 --- a/dlls/xmllite/xmllite_main.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * XML parsing library - * - * Copyright 2009 Christian Costa - * - * 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 "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(xmllite); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %u, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Józef Kucia : tests: Add test for combined clip and cull distances.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: vkd3d Branch: master Commit: 0a499012adfc5d247e5d69a5aafda6f823cb25bf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0a499012adfc5d247e5d69a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 5 13:45:31 2018 +0200 tests: Add test for combined clip and cull distances. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0a499012adfc5d247e5…

1 0

Józef Kucia : tests: Add test for clip distance.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: vkd3d Branch: master Commit: ee6fcba034642e831fb01dbd4cb713f68a7514f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee6fcba034642e831fb01db… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 5 13:45:30 2018 +0200 tests: Add test for clip distance. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 577 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 577 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ee6fcba034642e831fb…

1 0

Józef Kucia : vkd3d-shader: Correctly handle multiple clip/cull distance output registers.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: vkd3d Branch: master Commit: 5398d65d3e459601d00415d63af06841002b3583 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5398d65d3e459601d00415d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 5 13:45:29 2018 +0200 vkd3d-shader: Correctly handle multiple clip/cull distance output registers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ca463f8..1181c84 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1867,7 +1867,7 @@ struct vkd3d_dxbc_compiler { uint32_t id; enum vkd3d_component_type component_type; - bool is_spirv_array; + uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t output_setup_function_id; @@ -3306,6 +3306,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, clip_distance_id, builtin->spirv_builtin); } if (cull_distance_mask) @@ -3315,6 +3316,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, cull_distance_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, cull_distance_id, builtin->spirv_builtin); } for (i = 0; i < output_signature->element_count; ++i) @@ -3325,10 +3327,12 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ { case VKD3D_SV_CLIP_DISTANCE: compiler->output_info[i].id = clip_distance_id; + compiler->output_info[i].array_element_mask = clip_distance_mask; break; case VKD3D_SV_CULL_DISTANCE: compiler->output_info[i].id = cull_distance_id; + compiler->output_info[i].array_element_mask = cull_distance_mask; break; default: @@ -3388,24 +3392,23 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, storage_class, component_type, output_component_count); vkd3d_spirv_add_iface_variable(builder, id); - } - if (builtin) - { - vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); - } - else - { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); - if (component_idx) - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); + if (builtin) + { + vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + if (component_idx) + FIXME("Unhandled component index %u.\n", component_idx); + } + else + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + if (component_idx) + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); + } } compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - compiler->output_info[signature_idx].is_spirv_array = builtin && builtin->is_spirv_array; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE @@ -6361,10 +6364,10 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; - uint32_t write_mask, use_mask, uninit_mask, swizzle; + uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; + uint32_t output_id, indexes[1]; unsigned int component_count; unsigned int i, index; - uint32_t output_id; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; @@ -6392,7 +6395,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi output_id = output_info->id; - if (!output_info->is_spirv_array) + if (!output_info->array_element_mask) { vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); return; @@ -6400,10 +6403,14 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); - for (i = 0, index = output->semantic_index * VKD3D_VEC4_SIZE; i < component_count; ++i, ++index) + mask = output_info->array_element_mask; + mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1; + for (i = 0, index = vkd3d_popcount(mask); i < VKD3D_VEC4_SIZE; ++i) { - uint32_t indexes[] = {vkd3d_dxbc_compiler_get_constant_uint(compiler, index)}; + if (!(write_mask & (VKD3DSP_WRITEMASK_0 << i))) + continue; + indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, output_id, indexes, ARRAY_SIZE(indexes)); object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2018