wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Alex Henrie : shell32: Add remaining control panel icons.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 1a924932da5655ab1270beaa0003f8b5bcc4dba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a924932da5655ab1270beaa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:25 2018 -0600 shell32: Add remaining control panel icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5a48421..0180e76 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1020,6 +1020,9 @@ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_XP2 ICON resources/control.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico @@ -1033,6 +1036,9 @@ IDI_SHELL_HELP_SMALL ICON resources/help.ico /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_SMALL ICON resources/control.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/search.ico */ IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 6e910dc..4858c8e2 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -354,10 +354,12 @@ #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 +#define IDI_SHELL_CONTROL_PANEL_XP2 321 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 +#define IDI_SHELL_CONTROL_PANEL_SMALL 330 /* 332 - 336 not used on Windows */ #define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338

1 0

Alex Henrie : shell32: Rename icon 137 from "options" to "control panel XP ".
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: e26bf9c3ea2e3ed2728a008722d54f7a8f89350b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e26bf9c3ea2e3ed2728a0087… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:24 2018 -0600 shell32: Rename icon 137 from "options" to "control panel XP". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shresdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 421261a..6e910dc 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -228,7 +228,7 @@ #define IDI_SHELL_FILE_SEARCH 134 #define IDI_SHELL_SYSTEM_SEARCH 135 /* 136 not used on Windows */ -#define IDI_SHELL_OPTIONS 137 +#define IDI_SHELL_CONTROL_PANEL_XP 137 #define IDI_SHELL_PRINTERS_FOLDER_XP 138 #define IDI_SHELL_ADD_PRINTER 139 #define IDI_SHELL_REMOTE_PRINTER 140

1 0

Alex Henrie : shell32: Add Jaz drive icon.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 17a0c2afa661395871f814eb3f0885b42feb866b URL: https://source.winehq.org/git/wine.git/?a=commit;h=17a0c2afa661395871f814eb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:23 2018 -0600 shell32: Add Jaz drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 7dcdc2d..5a48421 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1002,6 +1002,10 @@ IDI_SHELL_INTERNET_PRINTER ICON resources/printer.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/disk_drive.ico */ +IDI_SHELL_JAZ_DRIVE ICON resources/disk_drive.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 */ diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 5990750..421261a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -349,6 +349,7 @@ #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 #define IDI_SHELL_INTERNET_PRINTER 311 +#define IDI_SHELL_JAZ_DRIVE 312 #define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319

1 0

Alex Henrie : shell32: Add remaining search icons.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: d0d1c6c2fdb92c7eb80be4cc5870949e34813459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0d1c6c2fdb92c7eb80be4cc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:22 2018 -0600 shell32: Add remaining search icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 11 +++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 89e9cca..7dcdc2d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -950,6 +950,10 @@ IDI_SHELL_WEB_CALENDAR ICON resources/internet.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP2 ICON resources/users.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_WINDOW ICON resources/search.ico + /* @makedep: resources/help.ico */ IDI_SHELL_HELP_FILE ICON resources/help.ico @@ -1015,6 +1019,9 @@ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_SMALL ICON resources/search.ico + /* @makedep: resources/help.ico */ IDI_SHELL_HELP_SMALL ICON resources/help.ico @@ -1022,6 +1029,10 @@ IDI_SHELL_HELP_SMALL ICON resources/help.ico /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.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 7816644..5990750 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -334,6 +334,8 @@ #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 +/* 280 not used on Windows */ +#define IDI_SHELL_SEARCH_WINDOW 281 /* 285 - 288 not used on Windows */ #define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_DVD_DRIVE 291 @@ -352,8 +354,11 @@ #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 #define IDI_SHELL_FAVORITES_SMALL 322 +#define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 +/* 332 - 336 not used on Windows */ +#define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338 /* 339 - 511 not used on Windows */ #define IDI_SHELL_WEB_BROWSER 512

1 0

Alex Henrie : shell32: Add XP install icon.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 46dcc1a3dfaf3170030874cd09188851605d5407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46dcc1a3dfaf3170030874cd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:21 2018 -0600 shell32: Add XP install icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 87330c3..89e9cca 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -933,6 +933,9 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* @makedep: resources/update.ico */ +IDI_SHELL_INSTALL_XP ICON resources/update.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/printer.ico */ IDI_SHELL_MULTIFUNCTION_PRINTER ICON resources/printer.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e688725..7816644 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -329,6 +329,7 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_INSTALL_XP 271 #define IDI_SHELL_MULTIFUNCTION_PRINTER 272 #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276

1 0

Alex Henrie : shell32: Add remaining help icons.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: ce40aa4edfee97fc770c1226ce50f2eacd251236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce40aa4edfee97fc770c1226… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:20 2018 -0600 shell32: Add remaining help icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 5447aac..87330c3 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -915,6 +915,9 @@ IDI_SHELL_DELETE_FILE ICON resources/delete.ico /* @makedep: resources/delete.ico */ IDI_SHELL_ERASE_DISC ICON resources/delete.ico +/* @makedep: resources/help.ico */ +IDI_SHELL_HELP2 ICON resources/help.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_TO_FOLDER ICON resources/folder.ico @@ -944,6 +947,9 @@ IDI_SHELL_WEB_CALENDAR ICON resources/internet.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP2 ICON resources/users.ico +/* @makedep: resources/help.ico */ +IDI_SHELL_HELP_FILE ICON resources/help.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_drive.ico */ IDI_SHELL_DVD_DRIVE ICON resources/optical_drive.ico @@ -1006,6 +1012,9 @@ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* @makedep: resources/help.ico */ +IDI_SHELL_HELP_SMALL ICON resources/help.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 78c1ce1..e688725 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -324,6 +324,7 @@ #define IDI_SHELL_WRITE_DISC 260 #define IDI_SHELL_DELETE_FILE 261 #define IDI_SHELL_ERASE_DISC 262 +#define IDI_SHELL_HELP2 263 #define IDI_SHELL_TO_FOLDER 264 #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 @@ -332,6 +333,8 @@ #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 +/* 285 - 288 not used on Windows */ +#define IDI_SHELL_HELP_FILE 289 #define IDI_SHELL_DVD_DRIVE 291 #define IDI_SHELL_HYBRID_CD 292 #define IDI_SHELL_UNKNOWN_DISC 293 @@ -348,6 +351,7 @@ #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 #define IDI_SHELL_FAVORITES_SMALL 322 +#define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 /* 339 - 511 not used on Windows */

1 0

Alex Henrie : shell32: Add remaining printer icons.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: d0379a3060f14d347d97b792a2a288a51cb6f948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0379a3060f14d347d97b792… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:19 2018 -0600 shell32: Add remaining printer icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 12 ++++++++++++ dlls/shell32/shresdef.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0f008bc..5447aac 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -892,6 +892,10 @@ IDI_SHELL_INTERNET_RADIO ICON resources/internet.ico /* @makedep: resources/internet.ico */ IDI_SHELL_UPLOAD_PHOTO ICON resources/internet.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_PRINT_PHOTO ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico @@ -926,6 +930,10 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_MULTIFUNCTION_PRINTER ICON resources/printer.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_INTERNET ICON resources/internet.ico @@ -976,6 +984,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/printer.ico */ +IDI_SHELL_INTERNET_PRINTER ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 75da1ca..78c1ce1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -318,6 +318,7 @@ #define IDI_SHELL_PLAY 246 #define IDI_SHELL_INTERNET_RADIO 247 #define IDI_SHELL_UPLOAD_PHOTO 251 +#define IDI_SHELL_PRINT_PHOTO 252 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260 @@ -327,6 +328,7 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_MULTIFUNCTION_PRINTER 272 #define IDI_SHELL_INTERNET 273 #define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 @@ -340,6 +342,7 @@ #define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_INTERNET_PRINTER 311 #define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319

1 0

Alex Henrie : shell32: Add remaining Internet icons.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: dc0ad3acbfc81881baeb234901f75981bbe81aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0ad3acbfc81881baeb2349… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:18 2018 -0600 shell32: Add remaining Internet icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 18 ++++++++++++++++++ dlls/shell32/shresdef.h | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 53a9b84..0f008bc 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -884,6 +884,14 @@ IDI_SHELL_PRINT ICON resources/printer.ico /* @makedep: resources/play.ico */ IDI_SHELL_PLAY ICON resources/play.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_INTERNET_RADIO ICON resources/internet.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_UPLOAD_PHOTO ICON resources/internet.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico @@ -918,6 +926,13 @@ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP ICON resources/users.ico +/* @makedep: resources/internet.ico */ +IDI_SHELL_INTERNET ICON resources/internet.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_CALENDAR ICON resources/internet.ico + /* @makedep: resources/users.ico */ IDI_SHELL_USERS_XP2 ICON resources/users.ico @@ -986,6 +1001,9 @@ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico /* @makedep: resources/restricted.ico */ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_BROWSER ICON resources/internet.ico + /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 915029f..75da1ca 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -316,6 +316,8 @@ #define IDI_SHELL_UPLOAD 244 #define IDI_SHELL_PRINT 245 #define IDI_SHELL_PLAY 246 +#define IDI_SHELL_INTERNET_RADIO 247 +#define IDI_SHELL_UPLOAD_PHOTO 251 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260 @@ -325,6 +327,8 @@ #define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_INTERNET 273 +#define IDI_SHELL_WEB_CALENDAR 276 #define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_DVD_DRIVE 291 #define IDI_SHELL_HYBRID_CD 292 @@ -343,6 +347,8 @@ #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 +/* 339 - 511 not used on Windows */ +#define IDI_SHELL_WEB_BROWSER 512 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170

1 0

Alex Henrie : shell32: Add users icon.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 63767f4b90dd704354accaea71e8e557f360b407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63767f4b90dd704354accaea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:17 2018 -0600 shell32: Add users icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/users.ico | Bin 0 -> 57595 bytes dlls/shell32/resources/users.svg | 1172 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 15 +- 4 files changed, 1179 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63767f4b90dd704354ac…

1 0

Alex Henrie : shell32: Add multimedia file icon.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: wine Branch: master Commit: 618441bb92f666363b07817621b35ab9f5f03339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=618441bb92f666363b078176… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:16 2018 -0600 shell32: Add multimedia file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 a044bb7..788707e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -814,6 +814,10 @@ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico IDI_SHELL_IMAGE_FILE ICON resources/image.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/video.ico */ +IDI_SHELL_MULTIMEDIA_FILE ICON resources/video.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 0339bc3..915029f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -296,6 +296,7 @@ #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_IMAGE_FILE 226 +#define IDI_SHELL_MULTIMEDIA_FILE 227 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018