November 2018 - Wine-Commits

Alex Henrie : shell32: Add removable disk icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

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 move icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

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 image file icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

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

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

Nov. 29, 2018

Module: wine Branch: stable Commit: b02bd22fe8d39785b59db497b0ef90eddb3cf21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02bd22fe8d39785b59db497… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:40 2018 -0600 shell32: Add video file icon. Adapted from video-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 627c34fff765abfb055b0c8fd8a3c3f21d8835c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/video.ico | Bin 0 -> 64272 bytes dlls/shell32/resources/video.svg | 783 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 788 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b02bd22fe8d39785b59d…

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: e231dcc0350ab2e06cebe633ba29be6c290f5ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e231dcc0350ab2e06cebe633… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:41 2018 -0600 shell32: Add audio file icon. Adapted from audio-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 47c35b2ef1d450361e388ec855a2927d7648ef2c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/audio.ico | Bin 0 -> 48131 bytes dlls/shell32/resources/audio.svg | 679 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 684 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e231dcc0350ab2e06ceb…

1 0

Alex Henrie : shell32: Rename floppy.svg to disk_drive.svg.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 958d40b4a2ad9783c8f65fe7eff1d8f1bc2c3fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=958d40b4a2ad9783c8f65fe7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:44 2018 -0600 shell32: Rename floppy.svg to disk_drive.svg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 336ced48faa3122a80a5225ac02582d5a7285e05) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/resources/{floppy.ico => disk_drive.ico} | Bin dlls/shell32/resources/{floppy.svg => disk_drive.svg} | 0 dlls/shell32/shell32.rc | 12 ++++++------ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7f549ca..a61775e 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -68,11 +68,11 @@ SVG_SRCS = \ resources/copy.svg \ resources/delete.svg \ resources/desktop.svg \ + resources/disk_drive.svg \ resources/document.svg \ resources/drive.svg \ resources/eject.svg \ resources/favorites.svg \ - resources/floppy.svg \ resources/folder.svg \ resources/folder_open.svg \ resources/help.svg \ diff --git a/dlls/shell32/resources/floppy.ico b/dlls/shell32/resources/disk_drive.ico similarity index 100% rename from dlls/shell32/resources/floppy.ico rename to dlls/shell32/resources/disk_drive.ico diff --git a/dlls/shell32/resources/floppy.svg b/dlls/shell32/resources/disk_drive.svg similarity index 100% rename from dlls/shell32/resources/floppy.svg rename to dlls/shell32/resources/disk_drive.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 77974b3..fb08947 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -377,15 +377,15 @@ IDI_SHELL_FOLDER_OPEN_LARGE ICON resources/folder_open.ico IDI_SHELL_FOLDER_SMALL_XP ICON resources/folder_open.ico /* FIXME: Following resource is not yet added */ -/* @makedep: resources/floppy.ico */ -IDI_SHELL_5_12_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_5_12_FLOPPY ICON resources/disk_drive.ico /* FIXME: Following resource is not yet added */ -/* @makedep: resources/floppy.ico */ -IDI_SHELL_3_14_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_3_14_FLOPPY ICON resources/disk_drive.ico -/* @makedep: resources/floppy.ico */ -IDI_SHELL_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_FLOPPY ICON resources/disk_drive.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DRIVE ICON resources/drive.ico

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: bc6052a476212d8f57a8962fb7dbe0eed818cff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc6052a476212d8f57a8962f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:45 2018 -0600 shell32: Add card reader icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c34a39e37a6fece2600659f9b11ce306a1b98a77) 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 fb08947..d9c6615 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -748,6 +748,10 @@ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_CARD_READER 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 a837a38..8960de6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -292,6 +292,7 @@ #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_MUSIC_CD_95 228 +#define IDI_SHELL_CARD_READER 229 #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 Nov. 29, 2018

Nov. 29, 2018

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 play icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

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 print icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

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