November 2018 - Wine-commits

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

29 Nov '18

Module: wine Branch: stable Commit: a111c8b851a44d982e6fabcec79044aeb8fcdf83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a111c8b851a44d982e6fabce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:25 2018 -0600 shell32: Add remote connection icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c3d0b76720c4f4b882dc1375256d5b219333ee5) 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 165ef31..7589361 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -652,6 +652,10 @@ IDI_SHELL_VISUAL_SETTINGS ICON resources/control.ico /* @makedep: resources/document.ico */ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_REMOTE_CONNECTION ICON resources/internet.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 2258460..ad14a72 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -262,6 +262,7 @@ #define IDI_SHELL_NEW_WEB_FOLDER 176 #define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 +#define IDI_SHELL_REMOTE_CONNECTION 179 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

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

29 Nov '18

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 demo window icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: b9180d696b3bb6eff29bb7f985b7686c58b32b40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9180d696b3bb6eff29bb7f9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:27 2018 -0600 shell32: Add demo window icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 408bbe56737e21e1c9f85fab7e9d3884c648e76f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 16 ++++++++++++++++ dlls/shell32/shresdef.h | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 18f6f65..a8ebb0f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -664,6 +664,22 @@ IDI_SHELL_WINDOW_ON_MONITOR ICON resources/mycomputer.ico /* @makedep: resources/mycomputer.ico */ IDI_SHELL_DESKTOP_ON_MONITOR ICON resources/mycomputer.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_WINDOW_WITH_SIDEBAR ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_WINDOW_WITHOUT_SIDEBAR ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_MAXIMIZED_WINDOW ICON resources/window.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_FLOATING_WINDOWS ICON resources/window.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 61221a4..95cf01d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -265,6 +265,10 @@ #define IDI_SHELL_REMOTE_CONNECTION 179 #define IDI_SHELL_WINDOW_ON_MONITOR 180 #define IDI_SHELL_DESKTOP_ON_MONITOR 181 +#define IDI_SHELL_WINDOW_WITH_SIDEBAR 182 +#define IDI_SHELL_WINDOW_WITHOUT_SIDEBAR 183 +#define IDI_SHELL_MAXIMIZED_WINDOW 184 +#define IDI_SHELL_FLOATING_WINDOWS 185 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add one-click-open and two-click-open icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 6199b7d6d399eefb9e07e7dd26701da531dec899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6199b7d6d399eefb9e07e7dd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:28 2018 -0600 shell32: Add one-click-open and two-click-open icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe157e542aa7af5a57f890108c4849580ad0d61e) 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 a8ebb0f..399ef54 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -680,6 +680,14 @@ IDI_SHELL_MAXIMIZED_WINDOW ICON resources/window.ico /* @makedep: resources/window.ico */ IDI_SHELL_FLOATING_WINDOWS ICON resources/window.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder_open.ico */ +IDI_SHELL_ONE_CLICK_OPEN ICON resources/folder_open.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder_open.ico */ +IDI_SHELL_TWO_CLICK_OPEN ICON resources/folder_open.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 95cf01d..d44ad75 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -269,6 +269,8 @@ #define IDI_SHELL_WINDOW_WITHOUT_SIDEBAR 183 #define IDI_SHELL_MAXIMIZED_WINDOW 184 #define IDI_SHELL_FLOATING_WINDOWS 185 +#define IDI_SHELL_ONE_CLICK_OPEN 186 +#define IDI_SHELL_TWO_CLICK_OPEN 187 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242

1 0

Alex Henrie : shell32: Add remaining recycle bin icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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: Rename icon 48 from "rights" to "security".
by Alexandre Julliard 29 Nov '18

29 Nov '18

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 users icon and passwords icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 357b4124a1ccfab200c2a3db98b01d396f07b1cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=357b4124a1ccfab200c2a3db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:31 2018 -0600 shell32: Add users icon and passwords icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a3ee1876836ca3c3d7287474b3dfdad950fd3245) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 15 +++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 47aeb6a..6d2dd35 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -697,6 +697,13 @@ IDI_SHELL_FULL_RECYCLE_BIN_95 ICON resources/trash_full.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico +/* @makedep: resources/security.ico */ +IDI_SHELL_PASSWORDS ICON resources/security.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS ICON resources/security.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -709,6 +716,14 @@ IDI_SHELL_COPY ICON resources/copy.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS_XP ICON resources/security.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS_XP2 ICON resources/security.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 b654b48..a2bcae7 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -275,10 +275,15 @@ #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_PASSWORDS 194 +/* 211 - 219 not used on Windows */ +#define IDI_SHELL_USERS 220 #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_USERS_XP 269 +#define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_FAVORITES_SMALL 322

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: ccf7a9ae616ff4577155a867f2ebc2c14db59609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf7a9ae616ff4577155a867… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:32 2018 -0600 shell32: Add fax machine icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5feff6404505831060a9ee6627efc2345907c043) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 16 ++++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6d2dd35..f647978 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -701,6 +701,22 @@ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico IDI_SHELL_PASSWORDS ICON resources/security.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_DEFAULT_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_DEFAULT_NETWORK_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_NETWORK_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index a2bcae7..5355cbf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -276,6 +276,11 @@ #define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_PASSWORDS 194 +/* 195 not used on Windows */ +#define IDI_SHELL_FAX 196 +#define IDI_SHELL_DEFAULT_FAX 197 +#define IDI_SHELL_DEFAULT_NETWORK_FAX 198 +#define IDI_SHELL_NETWORK_FAX 199 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 34a22bfa1b302f9acc584b912f4c6043117f35a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a22bfa1b302f9acc584b91… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:33 2018 -0600 shell32: Add "restricted" icon. Adapted from dialog-error 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 1cd138af46cd64e5bba96a66edf4905687ff35bf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/restricted.ico | Bin 0 -> 54521 bytes dlls/shell32/resources/restricted.svg | 581 ++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 6 + dlls/shell32/shresdef.h | 2 + 5 files changed, 590 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34a22bfa1b302f9acc58…

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 1667b0f7097f172d706ab432ace6896672d0ddc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1667b0f7097f172d706ab432… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:34 2018 -0600 shell32: Add remaining folder icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5e53fb4bdf2d90b3ce276ca817f5383a76c75449) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 36 ++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 10 ++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index fa55566..1a273a6 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -720,12 +720,28 @@ IDI_SHELL_NETWORK_FAX ICON resources/printer.ico IDI_SHELL_RESTRICTED ICON resources/restricted.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_DEFAULT_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_PICTURES ICON resources/mydocs.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_MUSIC ICON resources/mydocs.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico + /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME ICON resources/rename.ico @@ -736,6 +752,18 @@ IDI_SHELL_COPY ICON resources/copy.ico IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_TO_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS_XP ICON resources/security.ico @@ -746,9 +774,17 @@ IDI_SHELL_USERS_XP2 ICON resources/security.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_FOLDER ICON resources/folder.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.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 df5f719..1502337 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -282,16 +282,26 @@ #define IDI_SHELL_DEFAULT_NETWORK_FAX 198 #define IDI_SHELL_NETWORK_FAX 199 #define IDI_SHELL_RESTRICTED 200 +/* 201 - 209 not used on Windows */ +#define IDI_SHELL_DEFAULT_FOLDER 210 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_SHELL_MY_PICTURES 236 +#define IDI_SHELL_MY_MUSIC 237 +#define IDI_SHELL_MY_VIDEOS 238 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 +#define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_TO_FOLDER 264 +#define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 #define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_OPTICAL_DISC 302 +#define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_FAVORITES_SMALL 322 +#define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 /*

1 0