November 2018 - Wine-commits

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

29 Nov '18

Module: wine Branch: stable Commit: fc761b07af7d62d6b6340bf280715d7503aa7599 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc761b07af7d62d6b6340bf2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:55 2018 -0600 shell32: Add unknown drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef5ad6a6e75eb7cea6eb99ded8b2c0efadf24fc5) 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 7daa201..e3d3ad7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -518,6 +518,10 @@ IDI_SHELL_BLANK3 ICON resources/blank.ico /* @makedep: resources/blank.ico */ IDI_SHELL_BLANK4 ICON resources/blank.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.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 ce5a10c..7149828 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -218,6 +218,7 @@ #define IDI_SHELL_BLANK2 51 #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 +#define IDI_SHELL_UNKNOWN_DRIVE 54 #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 files icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 94f1f9c63a42e387c487b5725defe8044239b192 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f1f9c63a42e387c487b572… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:56 2018 -0600 shell32: Add files icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c47178a50dae235717c6fbcde2f5898d2aa5c2f1) 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 e3d3ad7..244ea19 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -522,6 +522,10 @@ IDI_SHELL_BLANK4 ICON resources/blank.ico /* @makedep: resources/drive.ico */ IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_FILES ICON resources/document.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 7149828..c35ede5 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -219,6 +219,8 @@ #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 #define IDI_SHELL_UNKNOWN_DRIVE 54 +/* 55 - 132 not used on Windows */ +#define IDI_SHELL_FILES 133 #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 file search icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 195ccb2f2822bdcbfdcea1ef974e97434b9b02e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=195ccb2f2822bdcbfdcea1ef… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:57 2018 -0600 shell32: Add file search icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2633414c7165b01ad1876daf84ecacfe372564e0) 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 244ea19..4de75cf 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -526,6 +526,10 @@ IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico /* @makedep: resources/document.ico */ IDI_SHELL_FILES ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_FILE_SEARCH 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 c35ede5..3ceae19 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -221,6 +221,7 @@ #define IDI_SHELL_UNKNOWN_DRIVE 54 /* 55 - 132 not used on Windows */ #define IDI_SHELL_FILES 133 +#define IDI_SHELL_FILE_SEARCH 134 #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 system search icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: e7a31d5dbc364977ecbc8f9b9ee38643530922c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a31d5dbc364977ecbc8f9b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:58 2018 -0600 shell32: Add system search icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4daea1d7effef2c358630b30b6e00a359a17d9e0) 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 4de75cf..17d4e26 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -530,6 +530,10 @@ IDI_SHELL_FILES ICON resources/document.ico /* @makedep: resources/search.ico */ IDI_SHELL_FILE_SEARCH ICON resources/search.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SYSTEM_SEARCH 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 3ceae19..8fa3a46 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -222,6 +222,7 @@ /* 55 - 132 not used on Windows */ #define IDI_SHELL_FILES 133 #define IDI_SHELL_FILE_SEARCH 134 +#define IDI_SHELL_SYSTEM_SEARCH 135 #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 options icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 46b8e1067351781b198bae22f905d3a44f649e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46b8e1067351781b198bae22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:59 2018 -0600 shell32: Add options icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9fb7f21b61b2f384f37040ad308d6b1bd00563a7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 17d4e26..e76005c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -534,6 +534,9 @@ IDI_SHELL_FILE_SEARCH ICON resources/search.ico /* @makedep: resources/search.ico */ IDI_SHELL_SYSTEM_SEARCH ICON resources/search.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_OPTIONS ICON resources/control.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 8fa3a46..232a3de 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -223,6 +223,8 @@ #define IDI_SHELL_FILES 133 #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_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: f91fdd57c5d53b1104162afeac49255772b03342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f91fdd57c5d53b1104162afe… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:56 2018 -0600 shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4b5d0f2f43ad1d34b1e3fb4424615c918487e68c) Conflicts: dlls/shell32/iconcache.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/iconcache.c | 12 ++++++------ dlls/shell32/shell32.rc | 3 ++- dlls/shell32/shresdef.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index fc4e703..2c7f84e 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -467,19 +467,19 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context ImageList_SetBkColor(ShellBigIconList, CLR_NONE); /* Load the document icon, which is used as the default if an icon isn't found. */ - hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE), IMAGE_ICON, cx_small, cy_small, LR_SHARED); - hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE), IMAGE_ICON, cx_large, cy_large, LR_SHARED); if (!hSm || !hLg) { - FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + FIXME("Failed to load IDI_SHELL_FILE icon!\n"); return FALSE; } - SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); - SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); + SIC_IconAppend (swShell32Name, IDI_SHELL_FILE-1, hSm, hLg, 0); + SIC_IconAppend (swShell32Name, -IDI_SHELL_FILE, hSm, hLg, 0); TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList); @@ -1005,7 +1005,7 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO GetSystemDirectoryW(sii->szPath, MAX_PATH); /* no icons defined: use default */ - sii->iIcon = -IDI_SHELL_DOCUMENT; + sii->iIcon = -IDI_SHELL_FILE; lstrcatW(sii->szPath, shell32dll); if (flags) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6585416..463a187 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -352,8 +352,9 @@ BEGIN VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY END +/* FIXME: Following resource is not yet added */ /* @makedep: document.ico */ -IDI_SHELL_DOCUMENT ICON document.ico +IDI_SHELL_FILE ICON document.ico /* @makedep: folder.ico */ IDI_SHELL_FOLDER ICON folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 183a75e..85c1684 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -165,7 +165,7 @@ #define IDD_TITLE 0x3742 #define IDD_TREEVIEW 0x3741 -#define IDI_SHELL_DOCUMENT 1 +#define IDI_SHELL_FILE 1 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 284176bdb249703addf12bf3c8446d5c58c104b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=284176bdb249703addf12bf3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:57 2018 -0600 shell32: Add document icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b14d8f9f11856c1b1f192bf773eb864cba5ad78b) 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 463a187..88ab4ca 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -356,6 +356,9 @@ END /* @makedep: document.ico */ IDI_SHELL_FILE ICON document.ico +/* @makedep: document.ico */ +IDI_SHELL_DOCUMENT ICON document.ico + /* @makedep: folder.ico */ IDI_SHELL_FOLDER ICON folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 85c1684..11b940c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -166,6 +166,7 @@ #define IDD_TREEVIEW 0x3741 #define IDI_SHELL_FILE 1 +#define IDI_SHELL_DOCUMENT 2 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 79d90550ec4ae58e60de22812d54be24f0ae1d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79d90550ec4ae58e60de2281… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:58 2018 -0600 shell32: Add window icon. Adapted from new-window.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 5ee4e0027c941aa74da00166aa5f07bfd292b1b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + dlls/shell32/window.ico | Bin 0 -> 30799 bytes dlls/shell32/window.svg | 598 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 604 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79d90550ec4ae58e60de…

1 0

Alex Henrie : shell32: Add 512k and 314k floppy drive icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: ef3b728fbc1c5b19f59929c560e54291961dcaca URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef3b728fbc1c5b19f59929c5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:59 2018 -0600 shell32: Add 512k and 314k floppy drive icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d72d37008aff257fc157ebc0c321dcfc2ac87f82) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 71db7f0..bcdbea0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -376,6 +376,14 @@ IDI_SHELL_FOLDER_OPEN_LARGE ICON folder_open.ico /* @makedep: folder_open.ico */ IDI_SHELL_FOLDER_SMALL_XP ICON folder_open.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: floppy.ico */ +IDI_SHELL_5_12_FLOPPY ICON floppy.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: floppy.ico */ +IDI_SHELL_3_14_FLOPPY ICON floppy.ico + /* @makedep: floppy.ico */ IDI_SHELL_FLOPPY ICON floppy.ico

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: b0cd24f3870608dec0ed87fc78acfeaac381688d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0cd24f3870608dec0ed87fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:53 2018 -0600 shell32: Add Internet icon. Adapted from internet-web-browser.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 44bb2c88307a9f538f73dbd454c08922dc4b1c3f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/internet.ico | Bin 0 -> 78510 bytes dlls/shell32/internet.svg | 2614 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 2618 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0cd24f3870608dec0ed…

1 0