November 2018 - Wine-Commits

Alex Henrie : shell32: Add web folder icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: aebc31665d82ef0eb3d66d8478a1f5f0a8a9b12d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebc31665d82ef0eb3d66d84… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:23 2018 -0600 shell32: Add web folder icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1794e51649dabf06f7814268c99d8fc8949f5b5a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 11 +++++++++++ dlls/shell32/shresdef.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 35d1be0..6b8a27b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -641,6 +641,17 @@ IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico /* @makedep: resources/network.ico */ IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_WEB_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico + +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_FOLDERS ICON resources/internet.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 90be012..7b29b9d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -259,6 +259,9 @@ #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_NET_CONNECTIONS 175 +#define IDI_SHELL_NEW_WEB_FOLDER 176 +#define IDI_SHELL_NEW_WEB_PAGE 178 +#define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: d5a82b980092499cd5d32b4aeca93e711acf32e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a82b980092499cd5d32b4a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:57 2018 -0600 shell32: Add network folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5e8803ace482757ee583c63722fddfafbcbcd38b) 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 678ca3b..6ba6637 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -627,6 +627,10 @@ IDI_SHELL_DEFRAGMENT ICON resources/drive.ico /* @makedep: resources/menu.ico */ IDI_SHELL_TREEVIEW ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NETWORK_FOLDER ICON resources/folder.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 6cc7585..c2375ee 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -255,6 +255,7 @@ #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_TREEVIEW 171 +#define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 5e4ef6cac566339db8a75a203e224dc213e7b06d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4ef6cac566339db8a75a20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:56 2018 -0600 shell32: Add treeview icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4504557787112306ff8361fa181ecd93050af58e) 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 8fb069e..678ca3b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -623,6 +623,10 @@ IDI_SHELL_DISK_CHECK ICON resources/drive.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DEFRAGMENT ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/menu.ico */ +IDI_SHELL_TREEVIEW ICON resources/menu.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 92e2266..6cc7585 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -254,6 +254,7 @@ #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 +#define IDI_SHELL_TREEVIEW 171 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Rename icon 48 from "rights" to "security".
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 87ef82364ee6ef155a7fcae1e2b6f14911221882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ef82364ee6ef155a7fcae1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:30 2018 -0600 shell32: Rename icon 48 from "rights" to "security". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e7a3ce70162606c9785641b8b524340cee677532) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/resources/{lock.ico => security.ico} | Bin dlls/shell32/resources/{lock.svg => security.svg} | 0 dlls/shell32/shell32.rc | 4 ++-- dlls/shell32/shresdef.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index e5217ea..5a56fc2 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -77,7 +77,6 @@ SVG_SRCS = \ resources/folder_open.svg \ resources/help.svg \ resources/internet.svg \ - resources/lock.svg \ resources/log_off.svg \ resources/menu.svg \ resources/mycomputer.svg \ @@ -91,6 +90,7 @@ SVG_SRCS = \ resources/recent.svg \ resources/rename.svg \ resources/search.svg \ + resources/security.svg \ resources/shortcut.svg \ resources/shut_down.svg \ resources/sleep.svg \ diff --git a/dlls/shell32/resources/lock.ico b/dlls/shell32/resources/security.ico similarity index 100% rename from dlls/shell32/resources/lock.ico rename to dlls/shell32/resources/security.ico diff --git a/dlls/shell32/resources/lock.svg b/dlls/shell32/resources/security.svg similarity index 100% rename from dlls/shell32/resources/lock.svg rename to dlls/shell32/resources/security.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 070754b..47aeb6a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -500,8 +500,8 @@ IDI_SHELL_SEARCH_FOLDER ICON resources/search.ico /* @makedep: resources/update.ico */ IDI_SHELL_UPDATE ICON resources/update.ico -/* @makedep: resources/lock.ico */ -IDI_SHELL_RIGHTS ICON resources/lock.ico +/* @makedep: resources/security.ico */ +IDI_SHELL_SECURITY ICON resources/security.ico /* @makedep: resources/shut_down.ico */ IDI_SHELL_CONFIRM_SHUTDOWN ICON resources/shut_down.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 735f70e..b654b48 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -212,7 +212,7 @@ #define IDI_SHELL_LOG_OFF 45 #define IDI_SHELL_SEARCH_FOLDER 46 #define IDI_SHELL_UPDATE 47 -#define IDI_SHELL_RIGHTS 48 +#define IDI_SHELL_SECURITY 48 #define IDI_SHELL_CONFIRM_SHUTDOWN 49 #define IDI_SHELL_BLANK1 50 #define IDI_SHELL_BLANK2 51

1 0

Alex Henrie : shell32: Add remaining recycle bin icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: eae1ebd189b942ebb7b8596e0f584e4980fa9edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae1ebd189b942ebb7b8596e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:29 2018 -0600 shell32: Add remaining recycle bin icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ade232ada1fbf07a29f94e7241bff86b508fa2b1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 9 +++++++++ dlls/shell32/shresdef.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 399ef54..070754b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -688,6 +688,12 @@ IDI_SHELL_ONE_CLICK_OPEN ICON resources/folder_open.ico /* @makedep: resources/folder_open.ico */ IDI_SHELL_TWO_CLICK_OPEN ICON resources/folder_open.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_EMPTY_RECYCLE_BIN_95 ICON resources/trash_file.ico + +/* @makedep: resources/trash_full.ico */ +IDI_SHELL_FULL_RECYCLE_BIN_95 ICON resources/trash_full.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico @@ -700,6 +706,9 @@ IDI_SHELL_RENAME ICON resources/rename.ico /* @makedep: resources/copy.ico */ IDI_SHELL_COPY ICON resources/copy.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index d44ad75..735f70e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -271,10 +271,14 @@ #define IDI_SHELL_FLOATING_WINDOWS 185 #define IDI_SHELL_ONE_CLICK_OPEN 186 #define IDI_SHELL_TWO_CLICK_OPEN 187 +/* 188 - 190 not used on Windows */ +#define IDI_SHELL_EMPTY_RECYCLE_BIN_95 191 +#define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 +#define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_FAVORITES_SMALL 322

1 0

Alex Henrie : shell32: Add window-on-monitor and desktop-on-monitor icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 24fbe49ec575c162621ba6424f6b08eeafe0c11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=24fbe49ec575c162621ba642… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:26 2018 -0600 shell32: Add window-on-monitor and desktop-on-monitor icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8017c259ca76ae7f1547e75ed256b8b457fe1340) 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 7589361..18f6f65 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -656,6 +656,14 @@ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico /* @makedep: resources/internet.ico */ IDI_SHELL_REMOTE_CONNECTION ICON resources/internet.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_WINDOW_ON_MONITOR ICON resources/mycomputer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_DESKTOP_ON_MONITOR ICON resources/mycomputer.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index ad14a72..61221a4 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -263,6 +263,8 @@ #define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 #define IDI_SHELL_REMOTE_CONNECTION 179 +#define IDI_SHELL_WINDOW_ON_MONITOR 180 +#define IDI_SHELL_DESKTOP_ON_MONITOR 181 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: d161908d3e16ad937daa0e31a6849eb55f4dd457 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d161908d3e16ad937daa0e31… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:24 2018 -0600 shell32: Add visual settings icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a90f24322eb28ceefe0854b2bd80bf9433da5dce) 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 6b8a27b..165ef31 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -645,6 +645,9 @@ IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico /* @makedep: resources/folder.ico */ IDI_SHELL_NEW_WEB_FOLDER ICON resources/folder.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_VISUAL_SETTINGS ICON resources/control.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/document.ico */ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7b29b9d..2258460 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -260,6 +260,7 @@ #define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_NET_CONNECTIONS 175 #define IDI_SHELL_NEW_WEB_FOLDER 176 +#define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: a338c8303aec36e228f010fecd2a0944a35b1e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a338c8303aec36e228f010fe… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:59 2018 -0600 shell32: Add network connections icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 19c364bd0d19a8b3f546e1936c66792f42847bd1) 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 90323b1..35d1be0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -638,6 +638,9 @@ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico /* @makedep: resources/folder.ico */ IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico +/* @makedep: resources/network.ico */ +IDI_SHELL_NET_CONNECTIONS ICON resources/network.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 bdb8ded..90be012 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -258,6 +258,7 @@ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_CHECKLIST_FOLDER 174 +#define IDI_SHELL_NET_CONNECTIONS 175 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 3da6f4530df3fe2ee380f5b05cc309d4563b150a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3da6f4530df3fe2ee380f5b0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:55 2018 -0600 shell32: Add defragment icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ffa4ce525805f956889c0ef6735995ac73c3a326) 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 b97e384..8fb069e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -619,6 +619,10 @@ IDI_SHELL_BACKUP ICON resources/copy.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DISK_CHECK ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_DEFRAGMENT ICON resources/drive.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 3567d24..92e2266 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -250,6 +250,7 @@ /* 162 - 164 not used on Windows */ #define IDI_SHELL_BACKUP 165 #define IDI_SHELL_DISK_CHECK 166 +#define IDI_SHELL_DEFRAGMENT 167 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 4ada269b1171d3f88f6bf1b5d4cbc369a068dcfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ada269b1171d3f88f6bf1b5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:54 2018 -0600 shell32: Add disk check icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a7a50c148741e040f61722fb5cdad5d8a5ab0452) 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 4d0953f..b97e384 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -615,6 +615,10 @@ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico /* @makedep: resources/copy.ico */ IDI_SHELL_BACKUP ICON resources/copy.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_DISK_CHECK ICON resources/drive.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 8b2989d..3567d24 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -249,6 +249,7 @@ #define IDI_SHELL_CONFIRM_DELETE 161 /* 162 - 164 not used on Windows */ #define IDI_SHELL_BACKUP 165 +#define IDI_SHELL_DISK_CHECK 166 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0