wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

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

21 Aug '18

Module: wine Branch: master Commit: 8db78eccab18c90474e9f625e5aecf6daa10be44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db78eccab18c90474e9f625… 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> --- 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 3c7fcd1..209a0c0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -144,6 +144,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; @@ -213,6 +227,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); ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n", ret, GetLastError()); @@ -630,6 +648,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 932dc7e..b2749a6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2310,7 +2310,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

Alex Henrie : shell32: Add sleep icon.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 09cca8fed75fae2dc8dd30e8b1ee5fdd429296d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09cca8fed75fae2dc8dd30e8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:36 2018 -0600 shell32: Add sleep icon. Adapted from preferences-desktop-screensaver in the Tango Icon Library. 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/sleep.ico | Bin 0 -> 65140 bytes dlls/shell32/resources/sleep.svg | 1594 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1599 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09cca8fed75fae2dc8dd…

1 0

Alex Henrie : shell32: Add run icon.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: df48fd9a27d43eeb1ceb036fae042bcff1afd1df URL: https://source.winehq.org/git/wine.git/?a=commit;h=df48fd9a27d43eeb1ceb036f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:35 2018 -0600 shell32: Add run 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 47e1c17..c7e69d7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -498,6 +498,9 @@ IDI_SHELL_SEARCH ICON resources/search.ico /* @makedep: resources/help.ico */ IDI_SHELL_HELP ICON resources/help.ico +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN ICON resources/window.ico + /* @makedep: resources/shortcut.ico */ IDI_SHELL_SHORTCUT ICON resources/shortcut.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index d352d7c..0759551 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -193,6 +193,7 @@ #define IDI_SHELL_SETTINGS 22 #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 +#define IDI_SHELL_RUN 25 #define IDI_SHELL_FOLDER_OPEN_LARGE 29 #define IDI_SHELL_SHORTCUT 30 #define IDI_SHELL_FOLDER_OPEN_SMALL 31

1 0

Alex Henrie : shell32: Add help icon.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 84e2cf037546fcd57dcacd58b28d56d287dad8d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e2cf037546fcd57dcacd58… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:34 2018 -0600 shell32: Add help icon. Adapted from help-browser in the Tango Icon Library. 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/help.ico | Bin 0 -> 71467 bytes dlls/shell32/resources/help.svg | 647 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 651 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84e2cf037546fcd57dca…

1 0

Alex Henrie : shell32: Add search icon.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: c1b264ac1833d9e99c1d33eaf6efd764951887e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b264ac1833d9e99c1d33ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:33 2018 -0600 shell32: Add search icon. Adapted from system-search.svg in the Tango Icon Library. 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/search.ico | Bin 0 -> 78155 bytes dlls/shell32/resources/search.svg | 892 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 896 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1b264ac1833d9e99c1d…

1 0

Alex Henrie : shell32: Remove alpha channel from 4-bit and 8-bit network icons.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 791b057ecc879b5a21c5a1f7e9b8a02e84ec3d4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=791b057ecc879b5a21c5a1f7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:32 2018 -0600 shell32: Remove alpha channel from 4-bit and 8-bit network icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/network.ico | Bin 47208 -> 43624 bytes dlls/shell32/resources/network.svg | 106 +++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dlls/shell32/resources/network.ico b/dlls/shell32/resources/network.ico index 0d05f27..bb38612 100644 Binary files a/dlls/shell32/resources/network.ico and b/dlls/shell32/resources/network.ico differ diff --git a/dlls/shell32/resources/network.svg b/dlls/shell32/resources/network.svg index 7c5bdb2..98ab5fc 100644 --- a/dlls/shell32/resources/network.svg +++ b/dlls/shell32/resources/network.svg @@ -2623,28 +2623,24 @@ AElFTkSuQmCC height="32" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABqlBMVEUAAABeXl5eXl4AAABe -Xl4AAAAAAAAAAABeXl5bW1sAAAB/f34AAAAAAAAAAABZWVkAAAAAAAB1dXR/f35/f35/f34AAAAA -AAAAAAAAAAAAAABVV1MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeXl6qqqnt7e3c -3Nx7e3uzs7Pl5eXz8/P19fbAwMXz8/Tw8PBgYGC3tMO3tcT19fV0jbHk5OT9/f36+vr39/fGxsbu -7u62tMO3tcOzscG1s8Hq6uvW2uFTgrnv7+/5+fn8/Pz29vbEy9i9vb3a2trZ2dnW1tbV1dXS0tL0 -9PTY2Nh1dXVlZWWxsbG2tra1tbW0tLTy8vK4uLiFhYX4+PhmZmZzc3KDg4Px8fHj4+Pe3t7b29vo -6Oji4uLf39/+/v6lpaWKioqrq6u6urq5ubl9fXy0tLNvb26IiIiysrJ+fn7Dw8N/f37IyMeqqqp8 -fHy8vLzJycnT09PU1NTLy8uBgYBpaWhdXVzX19ekpKPs7OzBwcHNzczq6uqAgH/r6+vNzc2trayd -nZxjY2Kvr6/7+/v////KwuqiAAAAJ3RSTlMAM7oBuS01QazDHyUCBQu0EA0ov/jMBBkaDCKRFAoV -HR4lISAmGAekRLUEAAAAAWJLR0SNGwzi1QAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9YG -DBcnGvPr4WAAAAG6SURBVDjLvZNpV9NAFEADUpaUTUCQguwQ0kkL9lFgqmWtBmKIbCmbYK22gCxK -h0WUVUFR+NHOTJoWSj9zXz7e817OPYkgPDQ5uZJNbs6jLEJep2zTmZdtgyS7kYXikbIKXtTV3U2f -58iXEhxgkc8EH+rx+/1dvX1pwQH9GAcCL15CARWCaGBwaHhkNIRe2QK8xlilwlgQuBCijI+HUDAl -BDQLzASZCxQkpwXljT5hvFUmmeCdQmh65lYMJsyaZjg8NzvPhAVaYPFuDFhKnmAbCqV3yysZMWAp -eeI9P+GLyBkxUie8TPig69GMGBD46PF8iugxJhTxV7sbA+Kra+va540FlQqbW9uimBED4l++7iTc -0TATyC65FwPw3v66ph1oaYHF4HyzhMPvfLhwSJIxLBJc+GHwoYKTHBGnFYOyfHwiFQrFgBMGHxUI -OTXOCOExzs+3fv5yX0hCCWDtlI8KyqXx2zxSeIxYLKpHIn8koRSwOcWHbbgy/xLyT0pTJpQDvtb5 -qPC4orLqiVOorhFtnpYIIsTVGz5xEGuzfOmuOrCpc9QX3xeeNTQ2uZpbWttcbc3tHQ/+pzL+A3of -lvS0nMz0AAAAPnRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBUaGUgR0lNUAoKKGMpIDIwMDMgSmFr -dWIgJ2ppbW1hYycgU3RlaW5lcicz71gAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAtMTlUMDA6 -MTQ6MDktMDY6MDCO1Rn8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2LTA2 -OjAwewtT2wAAAABJRU5ErkJggg== +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABSlBMVEUAAABeXl5/f351dXRe +Xl6qqqnt7e3c3Nx7e3uzs7Pl5eXz8/P19fbAwMXz8/Tw8PBgYGC3tMO3tcT19fV0jbHk5OT9/f36 ++vr39/fGxsbu7u62tMO3tcOzscG1s8Hq6uvW2uFTgrnv7+/5+fn8/Pz29vbEy9i9vb3a2trZ2dnW +1tbV1dXS0tL09PTY2Nh1dXVlZWWxsbG2tra1tbW0tLTy8vK4uLiFhYX4+PhmZmZzc3KDg4Px8fHj +4+Pe3t7b29vo6Oji4uLf399bW1v+/v6lpaWKioqrq6u6urq5ubl9fXy0tLNvb26IiIiysrJ+fn7D +w8N/f37IyMeqqqp8fHy8vLzJycnT09PU1NTLy8uBgYBpaWhdXVzX19ekpKPs7OzBwcHNzczq6uqA +gH/r6+vNzc2traydnZxjY2JZWVmvr6/7+/tVV1P///+7AdJuAAAABHRSTlMAAAAAs5NmmgAAAAFi +S0dEbbsGAK0AAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfWBgwXJxrz6+FgAAABeElEQVQ4 +y73TSVfCMBQFYMBSUgaJqK3iiFZqraIURUQriigqDsQJRRHnkf+/NnkFCoWFK+7r8jt5Ofc0Dkev +4+SsOLsBzs034ua6At6DzAje7sCH/IEA/fpR0ALYDIAgGgiFQv7BoRaAh0VRkkZGmeDCaGx8YnJq +OoJmGgDPiqJMwVwYA4jQRKMRFG4CSTEjMsADoEG8BYR5dUFbFJYY8MUQWl5pKwNLcV1PJFbjawwk +aQPr7WXgVH0FnMBtpDdtZeBUfcUWrAgavK2M5gofA9uqmrGVgaUdr3fXULMM7MHN2svAuf2DvHJ4 +lJQpOC6cdJSBc6dn50VPJsEAuSAdZWDx8iqvKNeKBVgZkBsTlG5hAJRIvQwzRQB3GgwFLlImLrMM +mvT9AwegqMHImJCK9kgIlFGtFp6ePS8AlAqMjIVX7U0vC1BGNptRDeMdgB6DYSd86J+EfLX8ud8M +/Kgw9A59hNA72IJz8i9MDnd/CjXcSK3nz/Cf+QMmqkj4IzdXmgAAAD50RVh0Q29tbWVudABDcmVh +dGVkIHdpdGggVGhlIEdJTVAKCihjKSAyMDAzIEpha3ViICdqaW1tYWMnIFN0ZWluZXInM+9YAAAA +JXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0 +ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjowMHsLU9sAAAAASUVORK5CYII= " id="icon:32-8" x="480" @@ -2654,19 +2650,24 @@ OjAwewtT2wAAAABJRU5ErkJggg== height="32" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAXVBMVEUAAABmZmZmZmYAAAAA -AABmZmZVVVUAAAB3d3cAAAB3d3d3d3dVVVVmZmaqqqru7u7d3d13d3e7u7u7u8x3iKr////MzMy7 -qrtViLvMzN2IiIh3d2ZVVVWIiHeZmZnD2vm6AAAADXRSTlMAM7szRKq7IiIRu8yZ1UekpQAAAAFi -S0dEFeXY+aMAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfWBgwXJxrz6+FgAAABEElEQVQ4 -y72S2WKDIBBFiTZB2wyzWGhil///zA5MxWB5zsEX5XiBq849m9MAG8OpJwwBN8LQEwCJDSHoC4zL -ki/GKox/i44myKLT+L4LI1DMJHgxQT4E6bYLEA3MT1S4Kfd7I4gRd0FpBFKSWEI+BTRlQAwlIBRB -tIG1LaMukYUzAK+HMg5LIOGhjHaJ7B7KgIhUyDeXsrW2DE1Yw3ZMlk/vD2VAXIPuhkxI/K8MTeA9 -wYTtFMmEZOyC1B7EBCpDhYlXnqwMheELztZDGRGYiYI2ncvQtyURQiPIN6GsAlRJ4OYmIcjP47cC -uGQhUBkR5umV3ybnZl9xzm8/TIzg585v6q817jr2hPkhrzf/BH4Baq8mn7gF60sAAAA+dEVYdENv -bW1lbnQAQ3JlYXRlZCB3aXRoIFRoZSBHSU1QCgooYykgMjAwMyBKYWt1YiAnamltbWFjJyBTdGVp -bmVyJzPvWAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0xMC0xOVQwMDoxNDowOS0wNjowMI7VGfwA -AAAldEVYdGRhdGU6bW9kaWZ5ADIwMDYtMDYtMTNUMDU6Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSu -QmCC +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABSlBMVEUAAABeXl5/f351dXRe +Xl6qqqnt7e3c3Nx7e3uzs7Pl5eXz8/P19fbAwMXz8/Tw8PBgYGC3tMO3tcT19fV0jbHk5OT9/f36 ++vr39/fGxsbu7u62tMO3tcOzscG1s8Hq6uvW2uFTgrnv7+/5+fn8/Pz29vbEy9i9vb3a2trZ2dnW +1tbV1dXS0tL09PTY2Nh1dXVlZWWxsbG2tra1tbW0tLTy8vK4uLiFhYX4+PhmZmZzc3KDg4Px8fHj +4+Pe3t7b29vo6Oji4uLf399bW1v+/v6lpaWKioqrq6u6urq5ubl9fXy0tLNvb26IiIiysrJ+fn7D +w8N/f37IyMeqqqp8fHy8vLzJycnT09PU1NTLy8uBgYBpaWhdXVzX19ekpKPs7OzBwcHNzczq6uqA +gH/r6+vNzc2traydnZxjY2JZWVmvr6/7+/tVV1P///+7AdJuAAAABHRSTlMAAAAAs5NmmgAAAAFi +S0dEbbsGAK0AAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfWBgwXJxrz6+FgAAABeElEQVQ4 +y73TSVfCMBQFYMBSUgaJqK3iiFZqraIURUQriigqDsQJRRHnkf+/NnkFCoWFK+7r8jt5Ofc0Dkev +4+SsOLsBzs034ua6At6DzAje7sCH/IEA/fpR0ALYDIAgGgiFQv7BoRaAh0VRkkZGmeDCaGx8YnJq +OoJmGgDPiqJMwVwYA4jQRKMRFG4CSTEjMsADoEG8BYR5dUFbFJYY8MUQWl5pKwNLcV1PJFbjawwk +aQPr7WXgVH0FnMBtpDdtZeBUfcUWrAgavK2M5gofA9uqmrGVgaUdr3fXULMM7MHN2svAuf2DvHJ4 +lJQpOC6cdJSBc6dn50VPJsEAuSAdZWDx8iqvKNeKBVgZkBsTlG5hAJRIvQwzRQB3GgwFLlImLrMM +mvT9AwegqMHImJCK9kgIlFGtFp6ePS8AlAqMjIVX7U0vC1BGNptRDeMdgB6DYSd86J+EfLX8ud8M +/Kgw9A59hNA72IJz8i9MDnd/CjXcSK3nz/Cf+QMmqkj4IzdXmgAAAD50RVh0Q29tbWVudABDcmVh +dGVkIHdpdGggVGhlIEdJTVAKCihjKSAyMDAzIEpha3ViICdqaW1tYWMnIFN0ZWluZXInM+9YAAAA +JXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0 +ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjowMHsLU9sAAAAASUVORK5CYII= " id="icon:32-4" x="520" @@ -2694,15 +2695,15 @@ rkJggg== height="16" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAflBMVEUAAABeXl5eXl5eXl4V -FRReXl5eXl6Xl5ft7e2mpqbY2Nh7e3ukpKTm5ubz8/P19faamprw8PByn894d3+6urru7u7AwMXz -8/TT09P19fXq6uvR0dHr6+vAwMDZ2dnBwcG3t7e8vLxYWFjIyMjFxcXo6Oi2trbV1dXExMT///9v -zjC6AAAABnRSTlMAfVzdn5fz3KWkAAAAAWJLR0QpyreFJAAAAAlwSFlzAAALEgAACxIB0t1+/AAA -AAd0SU1FB9UMBwgdF6SsSucAAACLSURBVBjTTY7bEoIwDAVblYhGqamICHhB8fL/X2jSpI77uDOb -HOc8KN4pflkqKzNQrlHYbMFEhSGEnXUzFoQx7mtSau/gwALIOgK+kQR3TXNEEVWLmLpwiiLm8jKJ -rktCd4lgNKF+AGrT0bOIy/U23n9vwS2kKCBT5LncDY9peub90o2v/v0x8Zd8AXJ2C59ovlvvAAAA -JXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0 -ZTptb2RpZnkAMjAwNS0xMi0wN1QxNToyOToyMy0wNzowMCvuOY8AAAAASUVORK5CYII= +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAdVBMVEUAAABeXl5eXl6Xl5ft +7e2mpqbY2Nh7e3ukpKTm5ubz8/P19faamprw8PByn894d3+6urru7u7AwMXz8/TT09P19fXq6uvR +0dHr6+vAwMDZ2dnBwcG3t7e8vLxYWFgVFRTIyMjFxcXo6Oi2trbV1dXExMT///+h5ed6AAAAAnRS +TlMAAHaTzTgAAAABYktHRCZaCJi1AAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH1QwHCB0X +pKxK5wAAAIRJREFUGNNVjtsSgjAMBduIRqmpiAh4QUXw/3/RXFoZ93Fn9iTOeTC8M/yqMNbJQLFB +YbuDJEoMIeyXDghjPFRkVN7BkQVQ6gh4QwV3dX1CEWWDqF04RxVyUkXbqrC/RDCWUNcDNTp6EXG9 +3YfH7yy4J/yT3+Wuf43jOwvphqmbP1ksfAG/6QhrvelQyQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAx +Ny0xMC0xOVQwMDoxNDowOS0wNjowMI7VGfwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDUtMTItMDdU +MTU6Mjk6MjMtMDc6MDAr7jmPAAAAAElFTkSuQmCC " id="icon:16-8" x="584" @@ -2712,14 +2713,15 @@ ZTptb2RpZnkAMjAwNS0xMi0wN1QxNToyOToyMy0wNzowMCvuOY8AAAAASUVORK5CYII= height="16" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAANlBMVEUAAABmZmZmZmZmZmYR -ERFmZmZmZmaZmZnu7u6qqqrd3d13d3d3mcy7u7u7u8zMzMxVVVX///+aULsNAAAABnRSTlMAd1Xd -mZl1hngOAAAAAWJLR0QR4rU9ugAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9UMBwgdF6Ss -SucAAABsSURBVBjTTY5BEsAgCMS0rYgipf9/bUHQMQcPYTJuShmcnJxc0WlhADsZDWEJ0nON7ppi -DOLoOLs4uxDava++JoRoWsRh4rb0FL7LhOIJCs5OYROdmb/9LaTHigKLsuZqhyKy91vHLF1CHMkP -zTMHbekx1EEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAtMTlUMDA6MTQ6MDktMDY6MDCO1Rn8 -AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDA1LTEyLTA3VDE1OjI5OjIzLTA3OjAwK+45jwAAAABJRU5E -rkJggg== +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAdVBMVEUAAABeXl5eXl6Xl5ft +7e2mpqbY2Nh7e3ukpKTm5ubz8/P19faamprw8PByn894d3+6urru7u7AwMXz8/TT09P19fXq6uvR +0dHr6+vAwMDZ2dnBwcG3t7e8vLxYWFgVFRTIyMjFxcXo6Oi2trbV1dXExMT///+h5ed6AAAAAnRS +TlMAAHaTzTgAAAABYktHRCZaCJi1AAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH1QwHCB0X +pKxK5wAAAIRJREFUGNNVjtsSgjAMBduIRqmpiAh4QUXw/3/RXFoZ93Fn9iTOeTC8M/yqMNbJQLFB +YbuDJEoMIeyXDghjPFRkVN7BkQVQ6gh4QwV3dX1CEWWDqF04RxVyUkXbqrC/RDCWUNcDNTp6EXG9 +3YfH7yy4J/yT3+Wuf43jOwvphqmbP1ksfAG/6QhrvelQyQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAx +Ny0xMC0xOVQwMDoxNDowOS0wNjowMI7VGfwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDUtMTItMDdU +MTU6Mjk6MjMtMDc6MDAr7jmPAAAAAElFTkSuQmCC " id="icon:16-4" x="608"

1 0

Alex Henrie : shell32: Remove alpha channel from 4-bit and 8-bit Internet icons.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: ba0007260e7861df1d6610876c71c15005beda89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba0007260e7861df1d661087… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:31 2018 -0600 shell32: Remove alpha channel from 4-bit and 8-bit Internet icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/internet.ico | Bin 78510 -> 76974 bytes dlls/shell32/resources/internet.svg | 373 ++++++++++++++++++++++++++---------- 2 files changed, 274 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba0007260e7861df1d66…

1 0

Michael Stefaniuc : dmusic: Fake success in two stub midi port methods.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: dcb438ebf8d5a9a50082dd9be836fd800d66a33a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcb438ebf8d5a9a50082dd9b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Aug 20 23:30:17 2018 +0200 dmusic: Fake success in two stub midi port methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 9a18c88..1fa9469 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -977,7 +977,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_SetReadNotificationHandle(IDirectMus { FIXME("(%p, %p) stub!\n", iface, event); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI midi_IDirectMusicPort_Read(IDirectMusicPort *iface, @@ -1164,7 +1164,7 @@ static HRESULT WINAPI midi_IDirectMusicThru_ThruChannel(IDirectMusicThru *iface, FIXME("(%p, %u, %u, %u, %u, %p) stub!\n", iface, src_group, src_channel, dest_group, dest_channel, dest_port); - return E_NOTIMPL; + return S_OK; } static const IDirectMusicThruVtbl midi_thru_vtbl = {

1 0

Zebediah Figura : user32: Return RIDI_DEVICENAME for HID devices from GetRawInputDeviceInfo().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 44551cfe19f93fffb515b082871a35ae58c09fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44551cfe19f93fffb515b082… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:43 2018 -0500 user32: Return RIDI_DEVICENAME for HID devices from GetRawInputDeviceInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 12a0e15..cf3028a 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -365,11 +365,17 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT s = sizeof(mouse_name); name = mouse_name; } - else + else if (device == WINE_KEYBOARD_HANDLE) { s = sizeof(keyboard_name); name = keyboard_name; } + else + { + hid_device = device; + s = (strlenW(hid_device->path) + 1) * sizeof(WCHAR); + name = hid_device->path; + } break; case RIDI_DEVICEINFO: s = sizeof(*info);

1 0

Zebediah Figura : user32: Return RIDI_DEVICEINFO for HID devices from GetRawInputDeviceInfo().
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: e745a482d187920b4f87ee2ab7ed7f4eb37c268f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e745a482d187920b4f87ee2a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 20 15:24:42 2018 -0500 user32: Return RIDI_DEVICEINFO for HID devices from GetRawInputDeviceInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 91dcff4..12a0e15 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -42,6 +42,8 @@ struct hid_device { WCHAR *path; HANDLE file; + RID_DEVICE_INFO_HID info; + PHIDP_PREPARSED_DATA data; }; static struct hid_device *hid_devices; @@ -63,7 +65,9 @@ static void find_hid_devices(void) SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; DWORD detail_size, needed; + HIDD_ATTRIBUTES attr; DWORD idx, didx; + HIDP_CAPS caps; GUID hid_guid; HDEVINFO set; HANDLE file; @@ -146,6 +150,22 @@ static void find_hid_devices(void) hid_devices[didx].path = path; hid_devices[didx].file = file; + attr.Size = sizeof(HIDD_ATTRIBUTES); + if (!HidD_GetAttributes(file, &attr)) + WARN_(rawinput)("Failed to get attributes.\n"); + hid_devices[didx].info.dwVendorId = attr.VendorID; + hid_devices[didx].info.dwProductId = attr.ProductID; + hid_devices[didx].info.dwVersionNumber = attr.VersionNumber; + + if (!HidD_GetPreparsedData(file, &hid_devices[didx].data)) + WARN_(rawinput)("Failed to get preparsed data.\n"); + + if (!HidP_GetCaps(hid_devices[didx].data, &caps)) + WARN_(rawinput)("Failed to get caps.\n"); + + hid_devices[didx].info.usUsagePage = caps.UsagePage; + hid_devices[didx].info.usUsage = caps.Usage; + didx++; } hid_devices_count = didx; @@ -327,6 +347,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const WCHAR mouse_name[] = {'\\','\\','?','\\','W','I','N','E','_','M','O','U','S','E',0}; static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; + struct hid_device *hid_device; const WCHAR *name = NULL; RID_DEVICE_INFO *info; UINT s; @@ -334,7 +355,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); - if (!data_size || (device != WINE_MOUSE_HANDLE && device != WINE_KEYBOARD_HANDLE)) return ~0U; + if (!data_size) return ~0U; switch (command) { @@ -382,11 +403,17 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT info->dwType = RIM_TYPEMOUSE; info->u.mouse = mouse_info; } - else + else if (device == WINE_KEYBOARD_HANDLE) { info->dwType = RIM_TYPEKEYBOARD; info->u.keyboard = keyboard_info; } + else + { + hid_device = device; + info->dwType = RIM_TYPEHID; + info->u.hid = hid_device->info; + } return s; }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
62
Older →

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