November 2018 - Wine-commits

Alex Henrie : shell32: Add zip drive icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: b8d362d45f1953503adbfc6800ee313fc7880b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8d362d45f1953503adbfc68… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:46 2018 -0600 shell32: Add zip drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a2e2b5ba1da2277053aef9cf9f9e996223012805) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index d9c6615..8dc0cb9 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -752,6 +752,10 @@ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico /* @makedep: resources/disk_drive.ico */ IDI_SHELL_CARD_READER ICON resources/disk_drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_ZIP_DRIVE ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -852,6 +856,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/disk_drive.ico */ +IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_DVD_RW ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 8960de6..679c277 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -293,6 +293,7 @@ #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 +#define IDI_SHELL_ZIP_DRIVE 230 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 @@ -319,6 +320,7 @@ #define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320

1 0

Alex Henrie : shell32: Add download icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 13f023a4a6b1a74628c317ba23f62e7e63d91d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f023a4a6b1a74628c317ba… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:47 2018 -0600 shell32: Add download icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 042b9cc23f64e023b8d0f415f73e179dc39015e2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 8dc0cb9..7925cc6 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -756,6 +756,14 @@ IDI_SHELL_CARD_READER ICON resources/disk_drive.ico /* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE ICON resources/disk_drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/blank.ico */ +IDI_SHELL_DOWNLOAD ICON resources/blank.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/blank.ico */ +IDI_SHELL_DOWNLOAD_EMBLEM ICON resources/blank.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 679c277..298185a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -294,6 +294,8 @@ #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230 +#define IDI_SHELL_DOWNLOAD 231 +#define IDI_SHELL_DOWNLOAD_EMBLEM 232 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Add removable disk icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 13e68e0238381033812bc541228a39b1333cb146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e68e0238381033812bc541… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:48 2018 -0600 shell32: Add removable disk icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8b59c7fc5afdaf3dcb57afb52b1a26da8680b8fb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 7 +++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 7925cc6..e8df65f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -764,6 +764,13 @@ IDI_SHELL_DOWNLOAD ICON resources/blank.ico /* @makedep: resources/blank.ico */ IDI_SHELL_DOWNLOAD_EMBLEM ICON resources/blank.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_REMOVABLE_DISK ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_BAD_REMOVABLE_DISK ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 298185a..d847eae 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -296,6 +296,8 @@ #define IDI_SHELL_ZIP_DRIVE 230 #define IDI_SHELL_DOWNLOAD 231 #define IDI_SHELL_DOWNLOAD_EMBLEM 232 +#define IDI_SHELL_REMOVABLE_DISK 233 +#define IDI_SHELL_BAD_REMOVABLE_DISK 234 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Add MSN icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: e81c61c0b3ba6e581e6c7359e9edadeff0ebf0a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e81c61c0b3ba6e581e6c7359… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:49 2018 -0600 shell32: Add MSN icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c0c9400e3ce8ba99ae666a066825a96d77e695f7) 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 e8df65f..f50ce9f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -786,6 +786,10 @@ IDI_SHELL_MY_MUSIC ICON resources/mydocs.ico /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_MSN ICON resources/internet.ico + /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME ICON resources/rename.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index d847eae..de21ad2 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -302,6 +302,7 @@ #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 #define IDI_SHELL_MY_VIDEOS 238 +#define IDI_SHELL_MSN 239 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254

1 0

Alex Henrie : shell32: Add delete icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 4a5e0632df6bb650aed5e6701fcbd36789d0de3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5e0632df6bb650aed5e670… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:50 2018 -0600 shell32: Add delete icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 39012eac756911feaa7e97caac148cd9a960030f) 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 f50ce9f..9fbb2a7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -790,6 +790,9 @@ IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico /* @makedep: resources/internet.ico */ IDI_SHELL_MSN ICON resources/internet.ico +/* @makedep: resources/delete.ico */ +IDI_SHELL_DELETE ICON resources/delete.ico + /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME ICON resources/rename.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index de21ad2..f3346df 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -303,6 +303,7 @@ #define IDI_SHELL_MY_MUSIC 237 #define IDI_SHELL_MY_VIDEOS 238 #define IDI_SHELL_MSN 239 +#define IDI_SHELL_DELETE 240 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254

1 0

Alex Henrie : shell32: Add move icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: ca28d6e7320109bfd1d84c17b3253d61bd7f21e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca28d6e7320109bfd1d84c17… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:51 2018 -0600 shell32: Add move icon. Adapted from mail-forward.svg 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 ddaf6bb13710c13fe1037126e73773c91894dea6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/move.ico | Bin 0 -> 39515 bytes dlls/shell32/resources/move.svg | 513 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 518 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca28d6e7320109bfd1d8…

1 0

Alex Henrie : shell32: Add upload icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 1ec686de28722c6ea5b2d285147361f8ab1774b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ec686de28722c6ea5b2d285… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:52 2018 -0600 shell32: Add upload icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d721c454e66d28429acbcfb231d70f035347b3c9) 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 50836e9..36d2762 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -802,6 +802,10 @@ IDI_SHELL_RENAME ICON resources/rename.ico /* @makedep: resources/copy.ico */ IDI_SHELL_COPY ICON resources/copy.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_UPLOAD ICON resources/internet.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index ec9a1b3..7430751 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -307,6 +307,7 @@ #define IDI_SHELL_MOVE 241 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 +#define IDI_SHELL_UPLOAD 244 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260

1 0

Alex Henrie : shell32: Add print icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 2e1af12407db78c5554314430a2d781f24d8f483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e1af12407db78c555431443… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:53 2018 -0600 shell32: Add print icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2e703dbc7a70f123cb4987648fc38d8d22c5b892) 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 36d2762..69f2748 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -806,6 +806,9 @@ IDI_SHELL_COPY ICON resources/copy.ico /* @makedep: resources/internet.ico */ IDI_SHELL_UPLOAD ICON resources/internet.ico +/* @makedep: resources/printer.ico */ +IDI_SHELL_PRINT ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7430751..86f24c1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -308,6 +308,7 @@ #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_UPLOAD 244 +#define IDI_SHELL_PRINT 245 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260

1 0

Alex Henrie : shell32: Add play icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 9e543ab57570daab339a3af904df74fbbb758721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e543ab57570daab339a3af9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:54 2018 -0600 shell32: Add play icon. Adapted from media-playback-start 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 4213781ae0f8b45c7ef01e8f4c28a47d8c348e3b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/play.ico | Bin 0 -> 37047 bytes dlls/shell32/resources/play.svg | 454 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 459 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e543ab57570daab339a…

1 0

Alex Henrie : shell32: Add image file icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: a658948b4f02555ece5d25b2ad5eb0a5826691c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a658948b4f02555ece5d25b2… 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> (cherry picked from commit 9da55d132c6bbc0944d6aa9fd968800511629008) Signed-off-by: Michael Stefaniuc <mstefani(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=a658948b4f02555ece5d…

1 0