November 2018 - Wine-Commits

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 8a2ff4d83417ba18f708ed7699b1b7da599cbea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2ff4d83417ba18f708ed76… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:50 2018 -0600 shell32: Add folder search icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 15c0612914f50d38f8d6f9fb3cd8c2e66d811541) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/resources/search.ico | Bin 78155 -> 78154 bytes dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/shell32/resources/search.ico b/dlls/shell32/resources/search.ico index 8697c8a..ca73425 100644 Binary files a/dlls/shell32/resources/search.ico and b/dlls/shell32/resources/search.ico differ diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 3448cf9..6672099 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -493,6 +493,10 @@ IDI_SHELL_FAVORITES ICON resources/favorites.ico /* @makedep: resources/log_off.ico */ IDI_SHELL_LOG_OFF ICON resources/log_off.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_FOLDER ICON resources/search.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index cd78597..c14a79d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -210,6 +210,7 @@ #define IDI_SHELL_REMOTE_FOLDER 43 #define IDI_SHELL_FAVORITES 44 #define IDI_SHELL_LOG_OFF 45 +#define IDI_SHELL_SEARCH_FOLDER 46 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 74f2d34ef3f8740d38462428ec738456a89b8267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74f2d34ef3f8740d38462428… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:48 2018 -0600 shell32: Add optical disc icon. Adapted from media-optical 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 4fc740c0188226c54399bf723e03eb4cfe649381) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/optical_disc.ico | Bin 0 -> 50691 bytes dlls/shell32/resources/optical_disc.svg | 1102 +++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1107 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74f2d34ef3f8740d3846…

1 0

Alex Henrie : shell32: Scale SVG properly to create 48x48 shutdown icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 1d116c48ae9f0cc6b266661017dfae77d43c2a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d116c48ae9f0cc6b2666610… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:46 2018 -0600 shell32: Scale SVG properly to create 48x48 shutdown icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c49c12b2cdcfffc9b825c0b2190e9a7425cec949) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/resources/shut_down.ico | Bin 38405 -> 38405 bytes dlls/shell32/resources/shut_down.svg | 94 ++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/resources/shut_down.ico b/dlls/shell32/resources/shut_down.ico index cb6aa9c..c8b9f43 100644 Binary files a/dlls/shell32/resources/shut_down.ico and b/dlls/shell32/resources/shut_down.ico differ diff --git a/dlls/shell32/resources/shut_down.svg b/dlls/shell32/resources/shut_down.svg index e637059..c1c2fd3 100644 --- a/dlls/shell32/resources/shut_down.svg +++ b/dlls/shell32/resources/shut_down.svg @@ -634,29 +634,30 @@ height="48" preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +TkuKUCky5HzEOXXwCj9R4EKEEjQ4YxWNawBL71YCQBxiCwAqfg0wor8G4EABNPWw1ipyGwDkCqBK +kWkr04rBepObMlDrDMgjO0cS3HdoIEGBOoO3Gan1K2yNAVGhdmhQxq8Bhkx5S1k+Y0ymHkbTzaCM +vLmKduixpw7O2GkRuaNMKwZSM5yQkSjLBROKWpkaVUstGpQMXI3BYg1AM3Cqn26ggajdMScNAPWX +/hYMdKtIGDGsxTJljGMZWoWL2uQp74NSYomMRkxqDC6wy4BDpooBp7WKimCsQY89ztcAdpgw4AUX +AkDc6DteOE29KCVnTs4wyviCJX3mITUu8tDBoOqnGuAvHnDMbtjJ+Jl9+hTM/RMukfsODSoIp4yE +fXJl9xShT8HCAziaemkDQCVZ3Ab6PONA3Rcy9pixjD4bm5LUALBepsJdfuGQBIvFAoY+VyhIMeQk +tH+DtDDQVZRRcJ1DZlgSLAZLgiOnR+JfmxuK3JwiyMnpMyb37lcQfQxg16w3YlA07I1abLsAbJl3 +p7aTLb/rHFZ1sKqmPMDn5GT0QjyWHgWCw1HUZt4wF0xUWo7rDP7hFb8zjGp4wtjXTFk7q7lSIK51 +wXIxAAgJAx7y1NQ0+M4M5TJ7nPjsW3aJ27f+FBB1lb8GQ8qA33jMnbrI33PZiHzMu4rHtkOY84Bf ++dq8pFQ3Gh/wiVw6s/OVO8cffGkOXsvLm/H/jv8AeTNp0HBGM0YAAAAUdEVYdEF1dGhvcgBKYWt1 +YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRp +b24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkA +AAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MjI6NTctMDY6MDCUsdROAAAAJXRFWHRk +YXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIyOjIyOjU3LTA2OjAw5exs8gAAABl0RVh0U29mdHdhcmUA +d3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFs +bC5jemlm414AAAAVdEVYdFRpdGxlAFN5c3RlbSBTaHV0ZG93bt6238UAAAAASUVORK5CYII= " id="icon:48-8" x="328" @@ -666,29 +667,30 @@ aWZ5ADIwMDYtMDYtMTNUMDU6Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC height="48" preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +TkuKUCky5HzEOXXwCj9R4EKEEjQ4YxWNawBL71YCQBxiCwAqfg0wor8G4EABNPWw1ipyGwDkCqBK +kWkr04rBepObMlDrDMgjO0cS3HdoIEGBOoO3Gan1K2yNAVGhdmhQxq8Bhkx5S1k+Y0ymHkbTzaCM +vLmKduixpw7O2GkRuaNMKwZSM5yQkSjLBROKWpkaVUstGpQMXI3BYg1AM3Cqn26ggajdMScNAPWX +/hYMdKtIGDGsxTJljGMZWoWL2uQp74NSYomMRkxqDC6wy4BDpooBp7WKimCsQY89ztcAdpgw4AUX +AkDc6DteOE29KCVnTs4wyviCJX3mITUu8tDBoOqnGuAvHnDMbtjJ+Jl9+hTM/RMukfsODSoIp4yE +fXJl9xShT8HCAziaemkDQCVZ3Ab6PONA3Rcy9pixjD4bm5LUALBepsJdfuGQBIvFAoY+VyhIMeQk +tH+DtDDQVZRRcJ1DZlgSLAZLgiOnR+JfmxuK3JwiyMnpMyb37lcQfQxg16w3YlA07I1abLsAbJl3 +p7aTLb/rHFZ1sKqmPMDn5GT0QjyWHgWCw1HUZt4wF0xUWo7rDP7hFb8zjGp4wtjXTFk7q7lSIK51 +wXIxAAgJAx7y1NQ0+M4M5TJ7nPjsW3aJ27f+FBB1lb8GQ8qA33jMnbrI33PZiHzMu4rHtkOY84Bf ++dq8pFQ3Gh/wiVw6s/OVO8cffGkOXsvLm/H/jv8AeTNp0HBGM0YAAAAUdEVYdEF1dGhvcgBKYWt1 +YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRp +b24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkA +AAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MjI6NTctMDY6MDCUsdROAAAAJXRFWHRk +YXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIyOjIyOjU3LTA2OjAw5exs8gAAABl0RVh0U29mdHdhcmUA +d3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFs +bC5jemlm414AAAAVdEVYdFRpdGxlAFN5c3RlbSBTaHV0ZG93bt6238UAAAAASUVORK5CYII= " id="icon:48-4" x="384"

1 0

Alex Henrie : shell32: Scale SVG properly to create 48x48 sleep icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 7637fb703303d95c8a61a9603f49ebdc0292a911 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7637fb703303d95c8a61a960… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:45 2018 -0600 shell32: Scale SVG properly to create 48x48 sleep icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13d2264e731a7e63e7b9e8fa2b03b1a02027f923) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/resources/sleep.ico | Bin 65140 -> 65140 bytes dlls/shell32/resources/sleep.svg | 244 ++++++++++++++++++--------------------- 2 files changed, 112 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7637fb703303d95c8a61…

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 9716a5390505f0325f0eb4a20c2b3000ec499224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9716a5390505f0325f0eb4a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:48 2018 -0600 shell32: Add printer folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dcf8525af3da4e9cd25428ea86e244e03de91477) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5fa3d8b..7799511 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -464,6 +464,10 @@ IDI_SHELL_CONTROL_PANEL ICON resources/control.ico /* @makedep: resources/folder.ico */ IDI_APP_FOLDER ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_PRINTERS_FOLDER ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 8621e99ad727d1551b6a6f5119b8c63de0bb6084 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8621e99ad727d1551b6a6f51… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:47 2018 -0600 shell32: Add application folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 694af9c6b78907c225e58c5a5de8bd8a4f3eb359) 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 1818030..5fa3d8b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -460,6 +460,10 @@ IDI_SHELL_DESKTOP ICON resources/desktop.ico /* @makedep: resources/control.ico */ IDI_SHELL_CONTROL_PANEL ICON resources/control.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_APP_FOLDER ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 85f3d30..6ef24b4 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -201,6 +201,7 @@ #define IDI_SHELL_MODEM_FOLDER 34 #define IDI_SHELL_DESKTOP 35 #define IDI_SHELL_CONTROL_PANEL 36 +#define IDI_SHELL_APP_FOLDER 37 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_REMOTE_PRINTER 140

1 0

Alexandre Julliard : shell32: Fix some resources ids.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 045eaa5c0a680bd44860e06771165275cec36f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=045eaa5c0a680bd44860e067… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:41:55 2018 +0200 shell32: Fix some resources ids. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 86825b92c2c8f9535d2aedfe9afb6bd766ddfa6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 24d2993..4e3b28d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -452,7 +452,7 @@ IDI_SHELL_FULL_RECYCLE_BIN ICON resources/trash_full.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_MODEM_FOLDER ICON resources/folder.ico +IDI_SHELL_MODEM_FOLDER ICON resources/folder.ico /* @makedep: resources/desktop.ico */ IDI_SHELL_DESKTOP ICON resources/desktop.ico @@ -462,15 +462,15 @@ IDI_SHELL_CONTROL_PANEL ICON resources/control.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_APP_FOLDER ICON resources/folder.ico +IDI_SHELL_APP_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_PRINTERS_FOLDER ICON resources/folder.ico +IDI_SHELL_PRINTERS_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_FONTS_FOLDER ICON resources/folder.ico +IDI_SHELL_FONTS_FOLDER ICON resources/folder.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: ef5d8246a6d1e75ec6c971fb89b574f104372669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef5d8246a6d1e75ec6c971fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:47 2018 -0600 shell32: Add start menu icon. Adapted from list-remove.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 f2252757baf9720b6d762d6827362d1921a3140a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/menu.ico | Bin 0 -> 34002 bytes dlls/shell32/resources/menu.svg | 631 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 636 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef5d8246a6d1e75ec6c9…

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 7629fa523ba35e4945aaea07d591f923998ee5aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7629fa523ba35e4945aaea07… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:50 2018 -0600 shell32: Add tree icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1594905e8bb189255188ec1a03b150b010f3392c) 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 0f57fec..3640588 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -479,6 +479,10 @@ IDI_SHELL_START_MENU ICON resources/menu.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/menu.ico */ +IDI_SHELL_TREE ICON resources/menu.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 905c684..b304b16 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -206,6 +206,7 @@ #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_START_MENU 40 #define IDI_SHELL_MUSIC_CD 41 +#define IDI_SHELL_TREE 42 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 419658c881bb65be9d8ecc56d6162dd80bafc9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=419658c881bb65be9d8ecc56… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:49 2018 -0600 shell32: Add logoff icon. Adapted from system-log-out 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 856e68e131275b7ff61f365483c2dbf9f3dd789b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/log_off.ico | Bin 0 -> 48648 bytes dlls/shell32/resources/log_off.svg | 875 +++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 880 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=419658c881bb65be9d8e…

1 0