June 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_GetData tests.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 612c1b664c57bae724e2ad996410772d79d19150 URL: https://source.winehq.org/git/wine.git/?a=commit;h=612c1b664c57bae724e2ad99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:54 2021 +0200 ntoskrnl.exe/tests: Add some HidP_GetData tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 161c5842d6a..735d1a0d996 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1775,6 +1775,18 @@ static void test_hidp(HANDLE file, int report_id) .CollectionType = 2, }, }; + static const HIDP_DATA expect_data[] = + { + { .DataIndex = 0, }, + { .DataIndex = 1, }, + { .DataIndex = 5, .RawValue = 1, }, + { .DataIndex = 7, .RawValue = 1, }, + { .DataIndex = 30, }, + { .DataIndex = 31, }, + { .DataIndex = 32, .RawValue = 0xfeedcafe, }, + { .DataIndex = 37, .RawValue = 1, }, + { .DataIndex = 39, .RawValue = 1, }, + }; HIDP_LINK_COLLECTION_NODE collections[16]; PHIDP_PREPARSED_DATA preparsed_data; @@ -1784,6 +1796,7 @@ static void test_hidp(HANDLE file, int report_id) char buffer[200], report[200]; DWORD collection_count; DWORD waveform_list; + HIDP_DATA data[32]; USAGE usages[16]; NTSTATUS status; HIDP_CAPS caps; @@ -2397,6 +2410,36 @@ static void test_hidp(HANDLE file, int report_id) ok(usage_and_pages[3].Usage == 4, "got usage_and_pages[3] Usage %x, expected %x\n", usage_and_pages[3].Usage, 4); + value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); + ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); + value = HidP_MaxDataListLength(HidP_Input, preparsed_data); + todo_wine + ok(value == 50, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 50); + value = HidP_MaxDataListLength(HidP_Output, preparsed_data); + ok(value == 0, "HidP_MaxDataListLength(HidP_Output) returned %d, expected %d\n", value, 0); + value = HidP_MaxDataListLength(HidP_Feature, preparsed_data); + ok(value == 13, "HidP_MaxDataListLength(HidP_Feature) returned %d, expected %d\n", value, 13); + + value = 1; + status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); + todo_wine_if(report_id) + ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status); + todo_wine + ok(value == 9, "got data count %d, expected %d\n", value, 9); + memset(data, 0, sizeof(data)); + status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); + todo_wine_if(report_id) + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetData returned %#x\n", status); + if (status == HIDP_STATUS_SUCCESS) for (i = 0; i < ARRAY_SIZE(expect_data); ++i) + { + winetest_push_context("data[%d]", i); + todo_wine_if(i >= 4) + check_member(data[i], expect_data[i], "%d", DataIndex); + todo_wine_if(i == 6 || i == 7 || i == 8) + check_member(data[i], expect_data[i], "%d", RawValue); + winetest_pop_context(); + } + memset(report, 0xcd, sizeof(report)); status = HidP_InitializeReportForID(HidP_Feature, 3, preparsed_data, report, caps.FeatureReportByteLength); todo_wine_if(!report_id)

1 0

Hugh McMaster : reg/tests: Modify verify_key_nonexist() to support registry views.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 9780dfc01a460264b6088fe23eada214c21441bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9780dfc01a460264b6088fe2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 16 22:43:08 2021 +1000 reg/tests: Modify verify_key_nonexist() to support registry views. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 13 +++++----- programs/reg/tests/copy.c | 36 +++++++++++++------------- programs/reg/tests/delete.c | 6 ++--- programs/reg/tests/export.c | 2 +- programs/reg/tests/import.c | 60 +++++++++++++++++++++---------------------- programs/reg/tests/query.c | 2 +- programs/reg/tests/reg_test.h | 4 +-- 7 files changed, 61 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9780dfc01a460264b608…

1 0

Hugh McMaster : reg/tests: Modify add_key() to support key creation in registry views.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 0d60749c218ae76645006e6273fc2f6a5ea87a58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d60749c218ae76645006e62… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 16 22:43:10 2021 +1000 reg/tests: Modify add_key() to support key creation in registry views. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 30 +++++++++++++++--------------- programs/reg/tests/copy.c | 38 +++++++++++++++++++------------------- programs/reg/tests/delete.c | 6 +++--- programs/reg/tests/export.c | 28 ++++++++++++++-------------- programs/reg/tests/query.c | 14 +++++++------- programs/reg/tests/reg_test.h | 4 ++-- 6 files changed, 60 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d60749c218ae7664500…

1 0

Dmitry Timoshkov : include: Add IAuthenticateEx interface definition.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 53286c3528380ae6a587a016ac9eda90cff064ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=53286c3528380ae6a587a016… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 16 18:58:46 2021 +0300 include: Add IAuthenticateEx interface definition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/urlmon.idl | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 867d3ebc959..0aab6588658 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -404,6 +404,37 @@ interface IAuthenticate : IUnknown [out] LPWSTR *pszPassword); } +/***************************************************************************** + * IAuthenticateEx interface + */ +[ + object, + uuid(2ad1edaf-d83d-48b5-9adf-03dbe19f53bd), + pointer_default(unique) +] + +interface IAuthenticateEx : IAuthenticate +{ + typedef [unique] IAuthenticateEx *LPAUTHENTICATIONEX; + + typedef enum { + AUTHENTICATEF_PROXY = 0x00000001, + AUTHENTICATEF_BASIC = 0x00000002, + AUTHENTICATEF_HTTP = 0x00000004 + } AUTHENTICATEF; + + typedef struct _tagAUTHENTICATEINFO { + DWORD dwFlags; + DWORD dwReserved; + } AUTHENTICATEINFO; + + HRESULT AuthenticateEx( + [out] HWND *phwnd, + [out] LPWSTR *pszUsername, + [out] LPWSTR *pszPassword, + [in] AUTHENTICATEINFO *pauthinfo); +} + /***************************************************************************** * IHttpNegotiate interface */

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add tests with and without report IDs.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 731dd7de44fa450c7fde6886ec1c54e52e1aa38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=731dd7de44fa450c7fde6886… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:50 2021 +0200 ntoskrnl.exe/tests: Add tests with and without report IDs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- dlls/ntoskrnl.exe/tests/driver_hid.c | 108 ++++++++++++++++++++++------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 56 ++++++++++++++---- 3 files changed, 114 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=731dd7de44fa450c7fde…

1 0

Zebediah Figura : server: Return STATUS_ADDRESS_ALREADY_ASSOCIATED from IOCTL_AFD_BIND if the socket is already bound.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: a997c3980f053159cac5a57e26a1df1a97a1f8c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a997c3980f053159cac5a57e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:31 2021 -0500 server: Return STATUS_ADDRESS_ALREADY_ASSOCIATED from IOCTL_AFD_BIND if the socket is already bound. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- server/sock.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d4633f7a8bb..eb4f0a42f8d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1407,7 +1407,7 @@ static void test_bind(void) ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, &params, sizeof(params), &addr, sizeof(addr)); - todo_wine ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); + ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); diff --git a/server/sock.c b/server/sock.c index 8cd3475d7b2..6b0c4af6b11 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2405,6 +2405,12 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + if (sock->bound) + { + set_error( STATUS_ADDRESS_ALREADY_ASSOCIATED ); + return 0; + } + unix_len = sockaddr_to_unix( &params->addr, in_size - sizeof(int), &unix_addr ); if (!unix_len) {

1 0

Zebediah Figura : ws2_32/tests: Add some tests for IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 10bfe80ad5378756aa236219c20dbb1180019116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bfe80ad5378756aa236219… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:30 2021 -0500 ws2_32/tests: Add some tests for IOCTL_AFD_BIND and IOCTL_AFD_GETSOCKNAME. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10bfe80ad5378756aa23…

1 0

Zebediah Figura : server: Partially implement IOCTL_AFD_BIND.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: f98ea26c67e49587330ba1d65b3dc331a3b04e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98ea26c67e49587330ba1d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:27 2021 -0500 server: Partially implement IOCTL_AFD_BIND. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 10 ++ include/wine/afd.h | 7 ++ server/sock.c | 302 ++++++++++++++++++++++++++++++++++++++++++++++- server/trace.c | 1 + 4 files changed, 319 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f98ea26c67e49587330b…

1 0

Zhiyi Zhang : uninstaller: Enable visual styles.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 1a47d1b96fd0abd276a892acc7101a883094aa53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a47d1b96fd0abd276a892ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 16 10:33:21 2021 +0800 uninstaller: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/Makefile.in | 2 +- programs/uninstaller/main.c | 3 +++ programs/uninstaller/resource.h | 1 + programs/uninstaller/uninstaller.manifest | 16 ++++++++++++++++ programs/uninstaller/uninstaller.rc | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 146e6204baa..d37316c14c7 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,6 +1,6 @@ MODULE = uninstaller.exe IMPORTS = advapi32 -DELAYIMPORTS = shlwapi shell32 user32 gdi32 +DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 42aa53631f1..8941d3a47ad 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -23,6 +23,7 @@ #include <string.h> #include <windows.h> +#include <commctrl.h> #include <shlwapi.h> #include "resource.h" #include "regstr.h" @@ -176,6 +177,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) Wow64RevertWow64FsRedirection( redir ); } + InitCommonControls(); + while( i<argc ) { token = argv[i++]; diff --git a/programs/uninstaller/resource.h b/programs/uninstaller/resource.h index 72ba160d5bd..35ac91f01a2 100644 --- a/programs/uninstaller/resource.h +++ b/programs/uninstaller/resource.h @@ -19,6 +19,7 @@ */ #include <windef.h> +#include <winuser.h> #define IDS_APPNAME 1000 #define IDS_UNINSTALLFAILED 1001 diff --git a/programs/uninstaller/uninstaller.manifest b/programs/uninstaller/uninstaller.manifest new file mode 100644 index 00000000000..ee41796562e --- /dev/null +++ b/programs/uninstaller/uninstaller.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Uninstaller" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/uninstaller/uninstaller.rc b/programs/uninstaller/uninstaller.rc index 4afc6845bc0..631f81e0f77 100644 --- a/programs/uninstaller/uninstaller.rc +++ b/programs/uninstaller/uninstaller.rc @@ -41,3 +41,6 @@ STRINGTABLE { \t\t Use '--list' to determine the application GUID.\n\ \ [no option] Launch the graphical version of this program.\n\n" } + +/* @makedep: uninstaller.manifest */ +1 RT_MANIFEST uninstaller.manifest

1 0

Zhiyi Zhang : winedbg: Enable visual styles.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 7aa1d1cbe1bd7c39895a87ad8bf889a15f8598e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa1d1cbe1bd7c39895a87ad… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 16 10:33:41 2021 +0800 winedbg: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.manifest | 16 ++++++++++++++++ programs/winedbg/winedbg.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/winedbg/winedbg.manifest b/programs/winedbg/winedbg.manifest new file mode 100644 index 00000000000..5061d141f16 --- /dev/null +++ b/programs/winedbg/winedbg.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winedbg" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 7ad7686d28a..af0018c3cf2 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -75,3 +75,6 @@ BEGIN DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP PUSHBUTTON "&Save As...", ID_SAVEAS, 252, 320, 70, 16, WS_TABSTOP END + +/* @makedep: winedbg.manifest */ +1 RT_MANIFEST winedbg.manifest

1 0