November 2018 - Wine-commits

Jason Edmeades : cmd: Correct handling of %~0 for batch call.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 7c425976069ebfac09ed3a7c6d6dd9cad1bb69fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c425976069ebfac09ed3a7c… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:53 2018 +0100 cmd: Correct handling of %~0 for batch call. When a batch label is called, %0 and %~0 should be the label being called, and if you start adding modifiers to it (eg %~d0) then you get details of the batch program containing the label. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44369 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 987fee3791d24a63aacc0b49f59275b62c943815) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/batch.c | 23 +++++++++++++---------- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1a78b55..d1b4dda 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -459,10 +459,19 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) } if (lastModifier == firstModifier) return; /* Invalid syntax */ - /* Extract the parameter to play with */ - if (*lastModifier == '0') { + /* So now, firstModifier points to beginning of modifiers, lastModifier + points to the variable just after the modifiers. Process modifiers + in a specific order, remembering there could be duplicates */ + modifierLen = lastModifier - firstModifier; + finaloutput[0] = 0x00; + + /* Extract the parameter to play with + Special case param 0 - With %~0 you get the batch label which was called + whereas if you start applying other modifiers to it, you get the filename + the batch label is in */ + if (*lastModifier == '0' && modifierLen > 1) { strcpyW(outputparam, context->batchfileW); - } else if ((*lastModifier >= '1' && *lastModifier <= '9')) { + } else if ((*lastModifier >= '0' && *lastModifier <= '9')) { strcpyW(outputparam, WCMD_parameter (context -> command, *lastModifier-'0' + context -> shift_count[*lastModifier-'0'], @@ -472,12 +481,6 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) strcpyW(outputparam, forloopcontext.variable[foridx]); } - /* So now, firstModifier points to beginning of modifiers, lastModifier - points to the variable just after the modifiers. Process modifiers - in a specific order, remembering there could be duplicates */ - modifierLen = lastModifier - firstModifier; - finaloutput[0] = 0x00; - /* 1. Handle '~' : Strip surrounding quotes */ if (outputparam[0]=='"' && memchrW(firstModifier, '~', modifierLen) != NULL) { @@ -719,7 +722,7 @@ void WCMD_call (WCHAR *command) { li.QuadPart = 0; li.u.LowPart = SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); - WCMD_batch (param1, command, TRUE, gotoLabel, context->h); + WCMD_batch (context->batchfileW, command, TRUE, gotoLabel, context->h); SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index dcc4eb7..1e4997a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -685,6 +685,15 @@ echo '%~xs1' goto :eof :endEchoFuns +echo ------------ Testing parameter zero ------------ +call :func parm1 parm2 +goto :endParm0 +:func +echo %~0 %~1 +echo [%0] [%~d0] [%~p0] [%~n0] [%~x0] [%~s0] +goto :EOF +:endParm0 + echo ------------ Testing variable delayed expansion ------------ rem NT4 doesn't support this echo --- default mode (load-time expansion) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 78cbcf1..a3eca74 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -577,6 +577,9 @@ N @drive@ '' '.eh'@or_broken@'' +------------ Testing parameter zero ------------ +:func parm1 +[:func] [@drive@] [@path@] [test] [.cmd] [@drive@@shortpath(a)test.cmd] ------------ Testing variable delayed expansion ------------ --- default mode (load-time expansion) foo

1 0

Jacek Caban : ntdll: Allow FileAccessInformation to be queried on files without fds.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 587c6000e8927056466a8a8dffd39f2fba95475c URL: https://source.winehq.org/git/wine.git/?a=commit;h=587c6000e8927056466a8a8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 19:29:16 2018 +0200 ntdll: Allow FileAccessInformation to be queried on files without fds. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8db78eccab18c90474e9f625e5aecf6daa10be44) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 922eed9..1824b05 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -140,6 +140,20 @@ static void _test_pipe_info(unsigned line, HANDLE pipe, DWORD ex_flags, DWORD ex ok_(__FILE__,line)(max_instances == ex_max_instances, "max_instances = %x, expected %u\n", max_instances, ex_max_instances); } +#define test_file_access(a,b) _test_file_access(__LINE__,a,b) +static void _test_file_access(unsigned line, HANDLE handle, DWORD expected_access) +{ + FILE_ACCESS_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + memset(&info, 0x11, sizeof(info)); + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileAccessInformation); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok_(__FILE__,line)(info.AccessFlags == expected_access, "got access %08x expected %08x\n", + info.AccessFlags, expected_access); +} + static void test_CreateNamedPipe(int pipemode) { HANDLE hnp; @@ -209,6 +223,10 @@ static void test_CreateNamedPipe(int pipemode) ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); test_signaled(hnp); + test_file_access(hnp, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES + | FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES + | FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA); + ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); todo_wine ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n", @@ -627,6 +645,26 @@ static void test_CreateNamedPipe(int pipemode) ok(CloseHandle(hnp), "CloseHandle\n"); + hnp = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_INBOUND, pipemode | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + test_signaled(hnp); + + test_file_access(hnp, SYNCHRONIZE | READ_CONTROL | FILE_READ_ATTRIBUTES | FILE_READ_PROPERTIES + | FILE_READ_DATA); + + CloseHandle(hnp); + + hnp = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_OUTBOUND, pipemode | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + test_signaled(hnp); + + test_file_access(hnp, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES + | FILE_WRITE_PROPERTIES | FILE_APPEND_DATA | FILE_WRITE_DATA); + + CloseHandle(hnp); + if (winetest_debug > 1) trace("test_CreateNamedPipe returning\n"); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b9d2425..1517b28 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2320,7 +2320,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; - if (class != FilePipeInformation && class != FilePipeLocalInformation) + if (class != FilePipeInformation && class != FilePipeLocalInformation && class != FileAccessInformation) { if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) {

1 0

Jacek Caban : kernel32: Use proper access flags in CreatePipe.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 863dc430fcd6fd535fddd036f57117cc5f4fb783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=863dc430fcd6fd535fddd036… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 19:29:30 2018 +0200 kernel32: Use proper access flags in CreatePipe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8712db6f554349728663bff0ff2b03334aa905b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/sync.c | 6 +++--- dlls/kernel32/tests/pipe.c | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d3d46b7..62fc8bc 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1945,8 +1945,8 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, snprintfW(name, sizeof(name) / sizeof(name[0]), nameFmt, GetCurrentProcessId(), ++index); RtlInitUnicodeString(&nt_name, name); - status = NtCreateNamedPipeFile(&hr, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, - FILE_SHARE_WRITE, FILE_OVERWRITE_IF, + status = NtCreateNamedPipeFile(&hr, GENERIC_READ | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &attr, &iosb, FILE_SHARE_WRITE, FILE_OVERWRITE_IF, FILE_SYNCHRONOUS_IO_NONALERT, FALSE, FALSE, FALSE, 1, size, size, &timeout); @@ -1959,7 +1959,7 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, /* from completion sakeness, I think system resources might be exhausted before this happens !! */ if (hr == INVALID_HANDLE_VALUE) return FALSE; - status = NtOpenFile(&hw, GENERIC_WRITE | SYNCHRONIZE, &attr, &iosb, 0, + status = NtOpenFile(&hw, GENERIC_WRITE | FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, 0, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (status) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1824b05..b44cce8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1473,6 +1473,11 @@ static void test_CreatePipe(void) ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n"); test_pipe_info(piperead, FILE_PIPE_SERVER_END, 4096, 4096, 1); test_pipe_info(pipewrite, 0, 4096, 4096, 1); + test_file_access(piperead, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES + | FILE_READ_ATTRIBUTES | FILE_READ_PROPERTIES | FILE_READ_DATA); + test_file_access(pipewrite, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES + | FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_APPEND_DATA + | FILE_WRITE_DATA); ok(WriteFile(pipewrite,PIPENAME,sizeof(PIPENAME), &written, NULL), "Write to anonymous pipe failed\n"); ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written);

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 24f4871ac5cd22d536d077a088e26206f534cb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f4871ac5cd22d536d077a0… 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> (cherry picked from commit 63767f4b90dd704354accaea71e8e557f360b407) Signed-off-by: Michael Stefaniuc <mstefani(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=24f4871ac5cd22d536d0…

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 22793d96d7702f96fa21541cb80c2de4a4721f7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22793d96d7702f96fa21541c… 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> (cherry picked from commit dc0ad3acbfc81881baeb234901f75981bbe81aea) Signed-off-by: Michael Stefaniuc <mstefani(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 eab4343..d2c7067 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -818,6 +818,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 @@ -852,6 +860,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 @@ -920,6 +935,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 53a9f33..4fdb27e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -312,6 +312,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 @@ -321,6 +323,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 @@ -339,6 +343,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 remaining printer icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: e92e5a7ba004f1d07eb0ed590fbfe58b56a7836d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92e5a7ba004f1d07eb0ed59… 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> (cherry picked from commit d0379a3060f14d347d97b792a2a288a51cb6f948) Signed-off-by: Michael Stefaniuc <mstefani(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 d2c7067..8cb7ec8 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -826,6 +826,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 @@ -860,6 +864,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 @@ -910,6 +918,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 4fdb27e..59f9f09 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -314,6 +314,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 @@ -323,6 +324,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 @@ -336,6 +338,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 help icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 477fc591cd5a52ca21ca67537aefb5397f0394ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=477fc591cd5a52ca21ca6753… 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> (cherry picked from commit ce40aa4edfee97fc770c1226ce50f2eacd251236) 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 8cb7ec8..98502cb 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -849,6 +849,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 @@ -878,6 +881,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 @@ -940,6 +946,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 59f9f09..0b29a7f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -320,6 +320,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 @@ -328,6 +329,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 @@ -344,6 +347,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 XP install icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 6646c7d25de12dfa59828538ab9116d8fcd6ad6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6646c7d25de12dfa59828538… 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> (cherry picked from commit 46dcc1a3dfaf3170030874cd09188851605d5407) 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 98502cb..ccd8242 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -867,6 +867,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 0b29a7f..1c965ca 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -325,6 +325,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 search icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 68a92513156579d4059e07cecd025396156fbfbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a92513156579d4059e07ce… 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> (cherry picked from commit d0d1c6c2fdb92c7eb80be4cc5870949e34813459) Signed-off-by: Michael Stefaniuc <mstefani(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 ccd8242..0c7c0b5 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -884,6 +884,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 @@ -949,6 +953,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 @@ -956,6 +963,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 1c965ca..4d6cf7c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -330,6 +330,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 @@ -348,8 +350,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 Jaz drive icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 39162e8df97af2bb2936c65711dd0117cceaaebf URL: https://source.winehq.org/git/wine.git/?a=commit;h=39162e8df97af2bb2936c657… 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> (cherry picked from commit 17a0c2afa661395871f814eb3f0885b42feb866b) 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 0c7c0b5..7b253d1 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -936,6 +936,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 4d6cf7c..7282fbb 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -345,6 +345,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