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

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

Aug. 31, 2018

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 Aug. 31, 2018

Aug. 31, 2018

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 Aug. 31, 2018

Aug. 31, 2018

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

Alex Henrie : shell32: Add image file icon.
by Alexandre Julliard Aug. 31, 2018

Aug. 31, 2018

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 users icon.
by Alexandre Julliard Aug. 31, 2018

Aug. 31, 2018

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 printer icons.
by Alexandre Julliard Aug. 31, 2018

Aug. 31, 2018

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

Alex Henrie : shell32: Add XP install icon.
by Alexandre Julliard Aug. 31, 2018

Aug. 31, 2018

Module: wine Branch: master Commit: 46dcc1a3dfaf3170030874cd09188851605d5407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46dcc1a3dfaf3170030874cd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:21 2018 -0600 shell32: Add XP install icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 87330c3..89e9cca 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -933,6 +933,9 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* @makedep: resources/update.ico */ +IDI_SHELL_INSTALL_XP ICON resources/update.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/printer.ico */ IDI_SHELL_MULTIFUNCTION_PRINTER ICON resources/printer.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e688725..7816644 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -329,6 +329,7 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_INSTALL_XP 271 #define IDI_SHELL_MULTIFUNCTION_PRINTER 272 #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276

1 0

Alex Henrie : shell32: Add remaining search icons.
by Alexandre Julliard Aug. 31, 2018

Aug. 31, 2018

Module: wine Branch: master Commit: d0d1c6c2fdb92c7eb80be4cc5870949e34813459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0d1c6c2fdb92c7eb80be4cc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:22 2018 -0600 shell32: Add remaining search icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 11 +++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 89e9cca..7dcdc2d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -950,6 +950,10 @@ IDI_SHELL_WEB_CALENDAR ICON resources/internet.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP2 ICON resources/users.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_WINDOW ICON resources/search.ico + /* @makedep: resources/help.ico */ IDI_SHELL_HELP_FILE ICON resources/help.ico @@ -1015,6 +1019,9 @@ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_SMALL ICON resources/search.ico + /* @makedep: resources/help.ico */ IDI_SHELL_HELP_SMALL ICON resources/help.ico @@ -1022,6 +1029,10 @@ IDI_SHELL_HELP_SMALL ICON resources/help.ico /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico + /* @makedep: resources/restricted.ico */ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7816644..5990750 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -334,6 +334,8 @@ #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 +/* 280 not used on Windows */ +#define IDI_SHELL_SEARCH_WINDOW 281 /* 285 - 288 not used on Windows */ #define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_DVD_DRIVE 291 @@ -352,8 +354,11 @@ #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 #define IDI_SHELL_FAVORITES_SMALL 322 +#define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 +/* 332 - 336 not used on Windows */ +#define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338 /* 339 - 511 not used on Windows */ #define IDI_SHELL_WEB_BROWSER 512

1 0

Alex Henrie : shell32: Add Jaz drive icon.
by Alexandre Julliard Aug. 31, 2018

Aug. 31, 2018

Module: wine Branch: master Commit: 17a0c2afa661395871f814eb3f0885b42feb866b URL: https://source.winehq.org/git/wine.git/?a=commit;h=17a0c2afa661395871f814eb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:23 2018 -0600 shell32: Add Jaz drive 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 7dcdc2d..5a48421 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1002,6 +1002,10 @@ IDI_SHELL_INTERNET_PRINTER ICON resources/printer.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/disk_drive.ico */ +IDI_SHELL_JAZ_DRIVE ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico /* FIXME: Following resource is not yet added */ diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 5990750..421261a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -349,6 +349,7 @@ #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 #define IDI_SHELL_INTERNET_PRINTER 311 +#define IDI_SHELL_JAZ_DRIVE 312 #define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319

1 0

Alex Henrie : shell32: Add remaining control panel icons.
by Alexandre Julliard Aug. 31, 2018

Aug. 31, 2018

Module: wine Branch: master Commit: 1a924932da5655ab1270beaa0003f8b5bcc4dba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a924932da5655ab1270beaa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:25 2018 -0600 shell32: Add remaining control panel icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5a48421..0180e76 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1020,6 +1020,9 @@ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_XP2 ICON resources/control.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico @@ -1033,6 +1036,9 @@ IDI_SHELL_HELP_SMALL ICON resources/help.ico /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_SMALL ICON resources/control.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/search.ico */ IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 6e910dc..4858c8e2 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -354,10 +354,12 @@ #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 +#define IDI_SHELL_CONTROL_PANEL_XP2 321 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 +#define IDI_SHELL_CONTROL_PANEL_SMALL 330 /* 332 - 336 not used on Windows */ #define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338

1 0