November 2018 - Wine-Commits

Alex Henrie : shell32: Add rights icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 08d06862807b81f0cfeb6e4a23d34cc92de0576d URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d06862807b81f0cfeb6e4a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:52 2018 -0600 shell32: Add rights icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5f82532b218c9b25064d65f389e674668dbd361c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/lock.ico | Bin 0 -> 32810 bytes dlls/shell32/resources/lock.svg | 532 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 537 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08d06862807b81f0cfeb…

1 0

Alex Henrie : shell32: Add shutdown confirmation icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 2a2f908db23fcef73e543d5b5cd62b275816eaa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2f908db23fcef73e543d5b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:53 2018 -0600 shell32: Add shutdown confirmation icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8bc0a3d0d0a65c50e718411f02e92f051c67517) Signed-off-by: Michael Stefaniuc <mstefani(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 86aaf07..bd9595b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -503,6 +503,9 @@ IDI_SHELL_UPDATE ICON resources/update.ico /* @makedep: resources/lock.ico */ IDI_SHELL_RIGHTS ICON resources/lock.ico +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_CONFIRM_SHUTDOWN ICON resources/shut_down.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 47e66a8..83e97ab 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -213,6 +213,7 @@ #define IDI_SHELL_SEARCH_FOLDER 46 #define IDI_SHELL_UPDATE 47 #define IDI_SHELL_RIGHTS 48 +#define IDI_SHELL_CONFIRM_SHUTDOWN 49 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add unknown drive icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: fc761b07af7d62d6b6340bf280715d7503aa7599 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc761b07af7d62d6b6340bf2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:55 2018 -0600 shell32: Add unknown drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef5ad6a6e75eb7cea6eb99ded8b2c0efadf24fc5) Signed-off-by: Michael Stefaniuc <mstefani(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 7daa201..e3d3ad7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -518,6 +518,10 @@ IDI_SHELL_BLANK3 ICON resources/blank.ico /* @makedep: resources/blank.ico */ IDI_SHELL_BLANK4 ICON resources/blank.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index ce5a10c..7149828 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -218,6 +218,7 @@ #define IDI_SHELL_BLANK2 51 #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 +#define IDI_SHELL_UNKNOWN_DRIVE 54 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add file search icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 195ccb2f2822bdcbfdcea1ef974e97434b9b02e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=195ccb2f2822bdcbfdcea1ef… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:57 2018 -0600 shell32: Add file search icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2633414c7165b01ad1876daf84ecacfe372564e0) Signed-off-by: Michael Stefaniuc <mstefani(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 244ea19..4de75cf 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -526,6 +526,10 @@ IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico /* @makedep: resources/document.ico */ IDI_SHELL_FILES ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_FILE_SEARCH ICON resources/search.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index c35ede5..3ceae19 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -221,6 +221,7 @@ #define IDI_SHELL_UNKNOWN_DRIVE 54 /* 55 - 132 not used on Windows */ #define IDI_SHELL_FILES 133 +#define IDI_SHELL_FILE_SEARCH 134 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add files icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 94f1f9c63a42e387c487b5725defe8044239b192 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f1f9c63a42e387c487b572… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:56 2018 -0600 shell32: Add files icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c47178a50dae235717c6fbcde2f5898d2aa5c2f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index e3d3ad7..244ea19 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -522,6 +522,10 @@ IDI_SHELL_BLANK4 ICON resources/blank.ico /* @makedep: resources/drive.ico */ IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_FILES ICON resources/document.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7149828..c35ede5 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -219,6 +219,8 @@ #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 #define IDI_SHELL_UNKNOWN_DRIVE 54 +/* 55 - 132 not used on Windows */ +#define IDI_SHELL_FILES 133 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add sleep icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 6a28e6e0ec3c25ef9e51886243e7c309bc67ce6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a28e6e0ec3c25ef9e518862… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:36 2018 -0600 shell32: Add sleep icon. Adapted from preferences-desktop-screensaver in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 09cca8fed75fae2dc8dd30e8b1ee5fdd429296d3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/sleep.ico | Bin 0 -> 65140 bytes dlls/shell32/resources/sleep.svg | 1594 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1599 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a28e6e0ec3c25ef9e51…

1 0

Alex Henrie : shell32: Add "trash full" icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 6e46fa137ddaccdee9eb74532e91e5eb17d135fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e46fa137ddaccdee9eb7453… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:45 2018 -0600 shell32: Add "trash full" icon. Adapted from user-trash-full in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8969e6f37f18407b0f2980b66695227212ee797f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/trash_full.ico | Bin 0 -> 73668 bytes dlls/shell32/resources/trash_full.svg | 1701 +++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 6 +- 4 files changed, 1705 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e46fa137ddaccdee9eb…

1 0

Alex Henrie : shell32: Add modem folder icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 1a0ddf7cc75e29478f158685425d45a29f6c1b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a0ddf7cc75e29478f158685… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:46 2018 -0600 shell32: Add modem folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 76e77535c2598fb1075c229489ce25ae1842a429) Signed-off-by: Michael Stefaniuc <mstefani(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 e2a75d0..1818030 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -450,6 +450,10 @@ IDI_SHELL_SHORTCUT ICON resources/shortcut.ico /* @makedep: resources/trash_full.ico */ IDI_SHELL_FULL_RECYCLE_BIN ICON resources/trash_full.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_MODEM_FOLDER ICON resources/folder.ico + /* @makedep: resources/desktop.ico */ IDI_SHELL_DESKTOP ICON resources/desktop.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 3318799..85f3d30 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -198,6 +198,7 @@ #define IDI_SHELL_FOLDER_OPEN_SMALL 31 #define IDI_SHELL_EMPTY_RECYCLE_BIN 32 #define IDI_SHELL_FULL_RECYCLE_BIN 33 +#define IDI_SHELL_MODEM_FOLDER 34 #define IDI_SHELL_DESKTOP 35 #define IDI_SHELL_CONTROL_PANEL 36 #define IDI_SHELL_PRINTERS_FOLDER 38

1 0

Alex Henrie : shell32: Add settings icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 11ffc176dc12a7242ffd862037a5ac8c8be2e1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ffc176dc12a7242ffd8620… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:58 2018 -0600 shell32: Add settings icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b9a6f75349dc94dda72c0fdf51b666af209587e0) Signed-off-by: Michael Stefaniuc <mstefani(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 4fe51ae..1ce2613 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -423,6 +423,9 @@ IDI_SHELL_COMPUTERS_NEAR_ME ICON network.ico /* @makedep: recent.ico */ IDI_SHELL_RECENT_DOCUMENTS ICON recent.ico +/* @makedep: control.ico */ +IDI_SHELL_SETTINGS ICON control.ico + /* @makedep: shortcut.ico */ IDI_SHELL_SHORTCUT ICON shortcut.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2a3ef35..b3a0284 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -186,6 +186,7 @@ #define IDI_SHELL_COMPUTERS_NEAR_ME 19 #define IDI_SHELL_FOLDER_SMALL_XP 20 #define IDI_SHELL_RECENT_DOCUMENTS 21 +#define IDI_SHELL_SETTINGS 22 #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 #define IDI_SHELL_FOLDER_OPEN_LARGE 29

1 0

Alex Henrie : shell32: Add help icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 3539734bf9c33816b8fa1b81ccf704d4741f0933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3539734bf9c33816b8fa1b81… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:34 2018 -0600 shell32: Add help icon. Adapted from help-browser in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84e2cf037546fcd57dcacd58b28d56d287dad8d1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/help.ico | Bin 0 -> 71467 bytes dlls/shell32/resources/help.svg | 647 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 651 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3539734bf9c33816b8fa…

1 0