November 2018 - Wine-commits

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

29 Nov '18

Module: wine Branch: stable Commit: 8addc609f25c1065dc6a8cf4b852ee7fcda564c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8addc609f25c1065dc6a8cf4… 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> (cherry picked from commit 618441bb92f666363b07817621b35ab9f5f03339) 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 b3ab03e..bd70fbe 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -748,6 +748,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 1ac98a9..53a9f33 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_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

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

29 Nov '18

Module: wine Branch: stable Commit: b2cb2af8e40c0c15760d3102e2e7e73e1a2d79e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2cb2af8e40c0c15760d3102… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:53 2018 -0600 shell32: Add backup icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bcbfaf0b00a45f2c93ffdc82fac057b23b4faf8b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 8eb385c..4d0953f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -611,6 +611,10 @@ IDI_SHELL_RUN2 ICON resources/window.ico /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/copy.ico */ +IDI_SHELL_BACKUP ICON resources/copy.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 fde428e..8b2989d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -247,6 +247,8 @@ /* 158 - 159 not used on Windows */ #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 +/* 162 - 164 not used on Windows */ +#define IDI_SHELL_BACKUP 165 #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 29 Nov '18

29 Nov '18

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

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

29 Nov '18

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

29 Nov '18

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: Add network folder icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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 checklist folder icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: a86498a23d134ab7de64df802132caa3841e81dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a86498a23d134ab7de64df80… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:58 2018 -0600 shell32: Add checklist folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fa1bf3b30faeed315d2a4e4d8fbc3a6699275e52) 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 6ba6637..90323b1 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -634,6 +634,10 @@ IDI_SHELL_NETWORK_FOLDER ICON resources/folder.ico /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.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 c2375ee..bdb8ded 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -257,6 +257,7 @@ #define IDI_SHELL_TREEVIEW 171 #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES_FOLDER 173 +#define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243

1 0

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

29 Nov '18

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

29 Nov '18

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 visual settings icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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