August 2018 - Wine-commits - list.winehq.org

Nikolay Sivov : shlwapi: Use wrappers to call stream methods internally.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 3987dec9c67c7ff3a67dfae7bc26bb5239f49683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3987dec9c67c7ff3a67dfae7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 31 01:35:57 2018 +0300 shlwapi: Use wrappers to call stream methods internally. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/istream.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 7ebb478..8cae1cd 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -55,9 +55,6 @@ static inline ISHFileStream *impl_from_IStream(IStream *iface) return CONTAINING_RECORD(iface, ISHFileStream, IStream_iface); } -static HRESULT WINAPI IStream_fnCommit(IStream*,DWORD); - - /************************************************************************** * IStream_fnQueryInterface */ @@ -104,7 +101,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) if (!refCount) { - IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */ + IStream_Commit(iface, 0); /* If ever buffered, this will be needed */ LocalFree(This->lpszPath); CloseHandle(This->hFile); HeapFree(GetProcessHeap(), 0, This); @@ -171,7 +168,7 @@ static HRESULT WINAPI IStream_fnSeek(IStream *iface, LARGE_INTEGER dlibMove, TRACE("(%p,%d,%d,%p)\n", This, dlibMove.u.LowPart, dwOrigin, pNewPos); - IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */ + IStream_Commit(iface, 0); /* If ever buffered, this will be needed */ dwPos = SetFilePointer(This->hFile, dlibMove.u.LowPart, NULL, dwOrigin); if( dwPos == INVALID_SET_FILE_POINTER ) return HRESULT_FROM_WIN32(GetLastError()); @@ -193,7 +190,7 @@ static HRESULT WINAPI IStream_fnSetSize(IStream *iface, ULARGE_INTEGER libNewSiz TRACE("(%p,%d)\n", This, libNewSize.u.LowPart); - IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */ + IStream_Commit(iface, 0); /* If ever buffered, this will be needed */ if( ! SetFilePointer( This->hFile, libNewSize.QuadPart, NULL, FILE_BEGIN ) ) return E_FAIL; @@ -224,7 +221,7 @@ static HRESULT WINAPI IStream_fnCopyTo(IStream *iface, IStream* pstm, ULARGE_INT if (!pstm) return S_OK; - IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */ + IStream_Commit(iface, 0); /* If ever buffered, this will be needed */ /* Copy data */ ulSize = cb.QuadPart; @@ -235,7 +232,7 @@ static HRESULT WINAPI IStream_fnCopyTo(IStream *iface, IStream* pstm, ULARGE_INT ulLeft = ulSize > sizeof(copyBuff) ? sizeof(copyBuff) : ulSize; /* Read */ - hRet = IStream_fnRead(iface, copyBuff, ulLeft, &ulRead); + hRet = IStream_Read(iface, copyBuff, ulLeft, &ulRead); if (FAILED(hRet) || ulRead == 0) break; if (pcbRead)

1 0

Nikolay Sivov : shlwapi: Fix some trace messages.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 5acf69ac79e0f11a1f0c27b843fbd8cae1591441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5acf69ac79e0f11a1f0c27b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 31 01:35:58 2018 +0300 shlwapi: Fix some trace messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/istream.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 8cae1cd..43f53ff 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -118,7 +118,7 @@ static HRESULT WINAPI IStream_fnRead(IStream *iface, void* pv, ULONG cb, ULONG* ISHFileStream *This = impl_from_IStream(iface); DWORD dwRead = 0; - TRACE("(%p,%p,0x%08x,%p)\n", This, pv, cb, pcbRead); + TRACE("(%p,%p,%u,%p)\n", This, pv, cb, pcbRead); if (!ReadFile(This->hFile, pv, cb, &dwRead, NULL)) { @@ -138,7 +138,7 @@ static HRESULT WINAPI IStream_fnWrite(IStream *iface, const void* pv, ULONG cb, ISHFileStream *This = impl_from_IStream(iface); DWORD dwWritten = 0; - TRACE("(%p,%p,0x%08x,%p)\n", This, pv, cb, pcbWritten); + TRACE("(%p,%p,%u,%p)\n", This, pv, cb, pcbWritten); switch (STGM_ACCESS_MODE(This->dwMode)) { @@ -166,7 +166,7 @@ static HRESULT WINAPI IStream_fnSeek(IStream *iface, LARGE_INTEGER dlibMove, ISHFileStream *This = impl_from_IStream(iface); DWORD dwPos; - TRACE("(%p,%d,%d,%p)\n", This, dlibMove.u.LowPart, dwOrigin, pNewPos); + TRACE("(%p,%s,%d,%p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, pNewPos); IStream_Commit(iface, 0); /* If ever buffered, this will be needed */ dwPos = SetFilePointer(This->hFile, dlibMove.u.LowPart, NULL, dwOrigin); @@ -188,7 +188,7 @@ static HRESULT WINAPI IStream_fnSetSize(IStream *iface, ULARGE_INTEGER libNewSiz { ISHFileStream *This = impl_from_IStream(iface); - TRACE("(%p,%d)\n", This, libNewSize.u.LowPart); + TRACE("(%p,%s)\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); IStream_Commit(iface, 0); /* If ever buffered, this will be needed */ if( ! SetFilePointer( This->hFile, libNewSize.QuadPart, NULL, FILE_BEGIN ) ) @@ -211,7 +211,7 @@ static HRESULT WINAPI IStream_fnCopyTo(IStream *iface, IStream* pstm, ULARGE_INT ULONGLONG ulSize; HRESULT hRet = S_OK; - TRACE("(%p,%p,%d,%p,%p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); + TRACE("(%p,%p,%s,%p,%p)\n", This, pstm, wine_dbgstr_longlong(cb.QuadPart), pcbRead, pcbWritten); if (pcbRead) pcbRead->QuadPart = 0; @@ -280,7 +280,7 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion(IStream *iface, ULARGE_INTEGER ULARGE_INTEGER cb, DWORD dwLockType) { ISHFileStream *This = impl_from_IStream(iface); - TRACE("(%p,%d,%d,%d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + TRACE("(%p,%s,%s,%d)\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); return E_NOTIMPL; } @@ -327,7 +327,7 @@ static HRESULT WINAPI IStream_fnClone(IStream *iface, IStream** ppstm) { ISHFileStream *This = impl_from_IStream(iface); - TRACE("(%p)\n",This); + TRACE("(%p,%p)\n", This, ppstm); if (ppstm) *ppstm = NULL; return E_NOTIMPL; @@ -540,7 +540,7 @@ HRESULT WINAPI SHIStream_Read(IStream *lpStream, LPVOID lpvDest, ULONG ulSize) ULONG ulRead; HRESULT hRet; - TRACE("(%p,%p,%d)\n", lpStream, lpvDest, ulSize); + TRACE("(%p,%p,%u)\n", lpStream, lpvDest, ulSize); hRet = IStream_Read(lpStream, lpvDest, ulSize, &ulRead);

1 0

Nikolay Sivov : include: Add IOpcPackage definition.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 8712a065aed32a77d77bf765fc3470629f1f27bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8712a065aed32a77d77bf765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 31 01:45:14 2018 +0300 include: Add IOpcPackage definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/opcbase.idl | 15 ++++ include/opcobjectmodel.idl | 174 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/include/opcbase.idl b/include/opcbase.idl index fc92675..33f56ac 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -25,3 +25,18 @@ typedef [v1_enum] enum OPC_STREAM_IO_READ = 1, OPC_STREAM_IO_WRITE = 2, } OPC_STREAM_IO_MODE; + +typedef [v1_enum] enum +{ + OPC_COMPRESSION_NONE = -1, + OPC_COMPRESSION_NORMAL = 0, + OPC_COMPRESSION_MAXIMUM = 1, + OPC_COMPRESSION_FAST = 2, + OPC_COMPRESSION_SUPERFAST = 3, +} OPC_COMPRESSION_OPTIONS; + +typedef [v1_enum] enum +{ + OPC_URI_TARGET_MODE_INTERNAL = 0, + OPC_URI_TARGET_MODE_EXTERNAL = 1, +} OPC_URI_TARGET_MODE; diff --git a/include/opcobjectmodel.idl b/include/opcobjectmodel.idl index e5370d2..45bc8aa 100644 --- a/include/opcobjectmodel.idl +++ b/include/opcobjectmodel.idl @@ -20,6 +20,11 @@ #pragma makedep install #endif +interface IOpcPart; +interface IOpcPartUri; +interface IOpcUri; +interface IOpcRelationship; + typedef [v1_enum] enum { OPC_READ_DEFAULT = 0, @@ -32,3 +37,172 @@ typedef [v1_enum] enum OPC_WRITE_DEFAULT = 0, OPC_WRITE_FORCE_ZIP32 = 1, } OPC_WRITE_FLAGS; + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee75), + pointer_default(ref) +] +interface IOpcPartEnumerator : IUnknown +{ + HRESULT MoveNext( + [out, retval] BOOL *has_next + ); + + HRESULT MovePrevious( + [out, retval] BOOL *has_previous + ); + + HRESULT GetCurrent( + [out, retval] IOpcPart **part + ); + + HRESULT Clone( + [out, retval] IOpcPartEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee76), + pointer_default(ref) +] +interface IOpcRelationshipEnumerator : IUnknown +{ + HRESULT MoveNext( + [out, retval] BOOL *has_next + ); + + HRESULT MovePrevious( + [out, retval] BOOL *has_previous + ); + + HRESULT GetCurrent( + [out, retval] IOpcRelationship **relationship + ); + + HRESULT Clone( + [out, retval] IOpcRelationshipEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee73), + pointer_default(ref) +] +interface IOpcPartSet : IUnknown +{ + HRESULT GetPart( + [in] IOpcPartUri *name, + [out, retval] IOpcPart **part + ); + + HRESULT CreatePart( + [in] IOpcPartUri *name, + [in, string] LPCWSTR content_type, + [in] OPC_COMPRESSION_OPTIONS compression_options, + [out, retval] IOpcPart **part + ); + + HRESULT DeletePart( + [in] IOpcPartUri *name + ); + + HRESULT PartExists( + [in] IOpcPartUri *name, + [out, retval] BOOL *exists + ); + + HRESULT GetEnumerator( + [out, retval] IOpcPartEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee72), + pointer_default(ref) +] +interface IOpcRelationship : IUnknown +{ + HRESULT GetId( + [out, string, retval] LPWSTR *id + ); + + HRESULT GetRelationshipType( + [out, string, retval] LPWSTR *type + ); + + HRESULT GetSourceUri( + [out, retval] IOpcUri **uri + ); + + HRESULT GetTargetUri( + [out, retval] IUri **target + ); + + HRESULT GetTargetMode( + [out, retval] OPC_URI_TARGET_MODE *target_mode + ); +} + + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee74), + pointer_default(ref) +] +interface IOpcRelationshipSet : IUnknown +{ + HRESULT GetRelationship( + [in, string] LPCWSTR id, + [out, retval] IOpcRelationship **relationship + ); + + HRESULT CreateRelationship( + [in, string, unique] LPCWSTR id, + [in, string] LPCWSTR type, + [in] IUri *target_uri, + [in] OPC_URI_TARGET_MODE target_mode, + [out, retval] IOpcRelationship **relationship + ); + + HRESULT DeleteRelationship( + [in, string] LPCWSTR id + ); + + HRESULT RelationshipExists( + [in, string] LPCWSTR id, + [out, retval] BOOL *exists + ); + + HRESULT GetEnumerator( + [out, retval] IOpcRelationshipEnumerator **enumerator + ); + + HRESULT GetEnumeratorForType( + [in, string] LPCWSTR type, + [out, retval] IOpcRelationshipEnumerator **enumerator + ); + + HRESULT GetRelationshipsContentStream( + [out, retval] IStream **stream + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee70), + pointer_default(ref) +] +interface IOpcPackage : IUnknown +{ + HRESULT GetPartSet( + [out, retval] IOpcPartSet **part_set + ); + + HRESULT GetRelationshipSet( + [out, retval] IOpcRelationshipSet **relationship_set + ); +}

1 0

Nikolay Sivov : opcservices: Add IOpcPackage stub.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 690bced86791cfb2bfbf108fb645577bf7d08375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=690bced86791cfb2bfbf108f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 31 01:45:15 2018 +0300 opcservices: Add IOpcPackage stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 3 +- dlls/opcservices/factory.c | 6 ++- dlls/opcservices/opc_private.h | 22 ++++++++ dlls/opcservices/package.c | 117 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 3 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 20d8eb5..4a2d294 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -2,7 +2,8 @@ MODULE = opcservices.dll IMPORTS = uuid C_SRCS = \ - factory.c + factory.c \ + package.c IDL_SRCS = \ opcservices.idl diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index dd6556d..b2a57c4 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -29,6 +29,8 @@ #include "wine/debug.h" +#include "opc_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(msopc); static HRESULT WINAPI opc_factory_QueryInterface(IOpcFactory *iface, REFIID iid, void **out) @@ -82,9 +84,9 @@ static HRESULT WINAPI opc_factory_CreateStreamOnFile(IOpcFactory *iface, LPCWSTR static HRESULT WINAPI opc_factory_CreatePackage(IOpcFactory *iface, IOpcPackage **package) { - FIXME("iface %p, package %p.\n", iface, package); + TRACE("iface %p, package %p.\n", iface, package); - return E_NOTIMPL; + return opc_package_create(package); } static HRESULT WINAPI opc_factory_ReadPackageFromStream(IOpcFactory *iface, IStream *stream, diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h new file mode 100644 index 0000000..492ec91 --- /dev/null +++ b/dlls/opcservices/opc_private.h @@ -0,0 +1,22 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * 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 "msopc.h" +#include "wine/heap.h" + +extern HRESULT opc_package_create(IOpcPackage **package) DECLSPEC_HIDDEN; diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c new file mode 100644 index 0000000..527bf94 --- /dev/null +++ b/dlls/opcservices/package.c @@ -0,0 +1,117 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +#include "opc_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msopc); + +struct opc_package +{ + IOpcPackage IOpcPackage_iface; + LONG refcount; +}; + +static inline struct opc_package *impl_from_IOpcPackage(IOpcPackage *iface) +{ + return CONTAINING_RECORD(iface, struct opc_package, IOpcPackage_iface); +} + +static HRESULT WINAPI opc_package_QueryInterface(IOpcPackage *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IOpcPackage) || + IsEqualIID(iid, &IID_IUnknown)) + { + *out = iface; + IOpcPackage_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI opc_package_AddRef(IOpcPackage *iface) +{ + struct opc_package *package = impl_from_IOpcPackage(iface); + ULONG refcount = InterlockedIncrement(&package->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI opc_package_Release(IOpcPackage *iface) +{ + struct opc_package *package = impl_from_IOpcPackage(iface); + ULONG refcount = InterlockedDecrement(&package->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(package); + + return refcount; +} + +static HRESULT WINAPI opc_package_GetPartSet(IOpcPackage *iface, IOpcPartSet **part_set) +{ + FIXME("iface %p, part_set %p stub!\n", iface, part_set); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_package_GetRelationshipSet(IOpcPackage *iface, IOpcRelationshipSet **relationship_set) +{ + FIXME("iface %p, relationship_set %p stub!\n", iface, relationship_set); + + return E_NOTIMPL; +} + +static const IOpcPackageVtbl opc_package_vtbl = +{ + opc_package_QueryInterface, + opc_package_AddRef, + opc_package_Release, + opc_package_GetPartSet, + opc_package_GetRelationshipSet, +}; + +HRESULT opc_package_create(IOpcPackage **out) +{ + struct opc_package *package; + + if (!(package = heap_alloc(sizeof(*package)))) + return E_OUTOFMEMORY; + + package->IOpcPackage_iface.lpVtbl = &opc_package_vtbl; + package->refcount = 1; + + *out = &package->IOpcPackage_iface; + TRACE("Created package %p.\n", *out); + return S_OK; +}

1 0

Nikolay Sivov : opcservices: Add IOpcPartSet stub.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 67aef4afb8279921cf85ae04651f67870b69d5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67aef4afb8279921cf85ae04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 31 01:45:16 2018 +0300 opcservices: Add IOpcPartSet stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 128 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 3 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 527bf94..c49c980 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -32,6 +32,14 @@ struct opc_package { IOpcPackage IOpcPackage_iface; LONG refcount; + + IOpcPartSet *part_set; +}; + +struct opc_part_set +{ + IOpcPartSet IOpcPartSet_iface; + LONG refcount; }; static inline struct opc_package *impl_from_IOpcPackage(IOpcPackage *iface) @@ -39,6 +47,99 @@ static inline struct opc_package *impl_from_IOpcPackage(IOpcPackage *iface) return CONTAINING_RECORD(iface, struct opc_package, IOpcPackage_iface); } +static inline struct opc_part_set *impl_from_IOpcPartSet(IOpcPartSet *iface) +{ + return CONTAINING_RECORD(iface, struct opc_part_set, IOpcPartSet_iface); +} + +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); + + if (IsEqualIID(iid, &IID_IOpcPartSet) || + IsEqualIID(iid, &IID_IUnknown)) + { + *out = iface; + IOpcPartSet_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI opc_part_set_AddRef(IOpcPartSet *iface) +{ + struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); + ULONG refcount = InterlockedIncrement(&part_set->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface) +{ + struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); + ULONG refcount = InterlockedDecrement(&part_set->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(part_set); + + return refcount; +} + +static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name, IOpcPart **part) +{ + FIXME("iface %p, name %p, part %p stub!\n", iface, name, part); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *name, LPCWSTR content_type, + OPC_COMPRESSION_OPTIONS compression_options, IOpcPart **part) +{ + FIXME("iface %p, name %p, content_type %s, compression_options %#x, part %p stub!\n", iface, name, + debugstr_w(content_type), compression_options, part); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *name) +{ + FIXME("iface %p, name %p stub!\n", iface, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_part_set_PartExists(IOpcPartSet *iface, IOpcPartUri *name, BOOL *exists) +{ + FIXME("iface %p, name %p, exists %p stub!\n", iface, name, exists); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_part_set_GtEnumerator(IOpcPartSet *iface, IOpcPartEnumerator **enumerator) +{ + FIXME("iface %p, enumerator %p stub!\n", iface, enumerator); + + return E_NOTIMPL; +} + +static const IOpcPartSetVtbl opc_part_set_vtbl = +{ + opc_part_set_QueryInterface, + opc_part_set_AddRef, + opc_part_set_Release, + opc_part_set_GetPart, + opc_part_set_CreatePart, + opc_part_set_DeletePart, + opc_part_set_PartExists, + opc_part_set_GtEnumerator, +}; + static HRESULT WINAPI opc_package_QueryInterface(IOpcPackage *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -73,16 +174,37 @@ static ULONG WINAPI opc_package_Release(IOpcPackage *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + if (package->part_set) + IOpcPartSet_Release(package->part_set); heap_free(package); + } return refcount; } static HRESULT WINAPI opc_package_GetPartSet(IOpcPackage *iface, IOpcPartSet **part_set) { - FIXME("iface %p, part_set %p stub!\n", iface, part_set); + struct opc_package *package = impl_from_IOpcPackage(iface); - return E_NOTIMPL; + TRACE("iface %p, part_set %p.\n", iface, part_set); + + if (!package->part_set) + { + struct opc_part_set *part_set = heap_alloc_zero(sizeof(*part_set)); + if (!part_set) + return E_OUTOFMEMORY; + + part_set->IOpcPartSet_iface.lpVtbl = &opc_part_set_vtbl; + part_set->refcount = 1; + + package->part_set = &part_set->IOpcPartSet_iface; + } + + *part_set = package->part_set; + IOpcPartSet_AddRef(*part_set); + + return S_OK; } static HRESULT WINAPI opc_package_GetRelationshipSet(IOpcPackage *iface, IOpcRelationshipSet **relationship_set) @@ -105,7 +227,7 @@ HRESULT opc_package_create(IOpcPackage **out) { struct opc_package *package; - if (!(package = heap_alloc(sizeof(*package)))) + if (!(package = heap_alloc_zero(sizeof(*package)))) return E_OUTOFMEMORY; package->IOpcPackage_iface.lpVtbl = &opc_package_vtbl;

1 0

Alex Henrie : shell32: Add image file icon.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 9da55d132c6bbc0944d6aa9fd968800511629008 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da55d132c6bbc0944d6aa9f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:15 2018 -0600 shell32: Add image file icon. Adapted from image-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/image.ico | Bin 0 -> 48807 bytes dlls/shell32/resources/image.svg | 1008 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1013 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9da55d132c6bbc0944d6…

1 0

Alex Henrie : shell32: Add multimedia file icon.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 618441bb92f666363b07817621b35ab9f5f03339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=618441bb92f666363b078176… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:16 2018 -0600 shell32: Add multimedia file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index a044bb7..788707e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -814,6 +814,10 @@ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico IDI_SHELL_IMAGE_FILE ICON resources/image.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/video.ico */ +IDI_SHELL_MULTIMEDIA_FILE ICON resources/video.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 0339bc3..915029f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -296,6 +296,7 @@ #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_IMAGE_FILE 226 +#define IDI_SHELL_MULTIMEDIA_FILE 227 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230

1 0

Alex Henrie : shell32: Add users icon.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 63767f4b90dd704354accaea71e8e557f360b407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63767f4b90dd704354accaea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:17 2018 -0600 shell32: Add users icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/users.ico | Bin 0 -> 57595 bytes dlls/shell32/resources/users.svg | 1172 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 15 +- 4 files changed, 1179 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63767f4b90dd704354ac…

1 0

Alex Henrie : shell32: Add remaining Internet icons.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: dc0ad3acbfc81881baeb234901f75981bbe81aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0ad3acbfc81881baeb2349… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:18 2018 -0600 shell32: Add remaining Internet icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 18 ++++++++++++++++++ dlls/shell32/shresdef.h | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 53a9b84..0f008bc 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -884,6 +884,14 @@ IDI_SHELL_PRINT ICON resources/printer.ico /* @makedep: resources/play.ico */ IDI_SHELL_PLAY ICON resources/play.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_INTERNET_RADIO ICON resources/internet.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_UPLOAD_PHOTO ICON resources/internet.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico @@ -918,6 +926,13 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* @makedep: resources/internet.ico */ +IDI_SHELL_INTERNET ICON resources/internet.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_CALENDAR ICON resources/internet.ico + /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP2 ICON resources/users.ico @@ -986,6 +1001,9 @@ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico /* @makedep: resources/restricted.ico */ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_BROWSER ICON resources/internet.ico + /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 915029f..75da1ca 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -316,6 +316,8 @@ #define IDI_SHELL_UPLOAD 244 #define IDI_SHELL_PRINT 245 #define IDI_SHELL_PLAY 246 +#define IDI_SHELL_INTERNET_RADIO 247 +#define IDI_SHELL_UPLOAD_PHOTO 251 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260 @@ -325,6 +327,8 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_INTERNET 273 +#define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_DVD_DRIVE 291 #define IDI_SHELL_HYBRID_CD 292 @@ -343,6 +347,8 @@ #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 +/* 339 - 511 not used on Windows */ +#define IDI_SHELL_WEB_BROWSER 512 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170

1 0

Alex Henrie : shell32: Add remaining printer icons.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: d0379a3060f14d347d97b792a2a288a51cb6f948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0379a3060f14d347d97b792… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:19 2018 -0600 shell32: Add remaining printer icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 12 ++++++++++++ dlls/shell32/shresdef.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0f008bc..5447aac 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -892,6 +892,10 @@ IDI_SHELL_INTERNET_RADIO ICON resources/internet.ico /* @makedep: resources/internet.ico */ IDI_SHELL_UPLOAD_PHOTO ICON resources/internet.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_PRINT_PHOTO ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico @@ -926,6 +930,10 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_MULTIFUNCTION_PRINTER ICON resources/printer.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_INTERNET ICON resources/internet.ico @@ -976,6 +984,10 @@ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico IDI_SHELL_DVD_ROM ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_INTERNET_PRINTER ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 75da1ca..78c1ce1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -318,6 +318,7 @@ #define IDI_SHELL_PLAY 246 #define IDI_SHELL_INTERNET_RADIO 247 #define IDI_SHELL_UPLOAD_PHOTO 251 +#define IDI_SHELL_PRINT_PHOTO 252 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260 @@ -327,6 +328,7 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_MULTIFUNCTION_PRINTER 272 #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 @@ -340,6 +342,7 @@ #define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_INTERNET_PRINTER 311 #define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319

1 0