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

Rémi Bernon : ntoskrnl.exe/tests: Add more reports with complex HID syntax.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: cc4e06949440c0c077f72f1a878cfbd08b49046c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc4e06949440c0c077f72f1a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:51 2021 +0200 ntoskrnl.exe/tests: Add more reports with complex HID syntax. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 124 +++++++++++++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 280 +++++++++++++++++++++++++++-------- 2 files changed, 335 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc4e06949440c0c077f7…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP get/set values tests.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 6e8de89c7cc0b6afb752db6fe648db68101c79cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8de89c7cc0b6afb752db6f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:52 2021 +0200 ntoskrnl.exe/tests: Add some HidP get/set values tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 33 ++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 275 ++++++++++++++++++++++++++++++++++- 2 files changed, 298 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e8de89c7cc0b6afb752…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP get/set usages tests.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 934451f703759b233c25e7f66d6c68b941699283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=934451f703759b233c25e7f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:53 2021 +0200 ntoskrnl.exe/tests: Add some HidP get/set usages tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 24 +++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 154 +++++++++++++++++++++++++++++++---- 2 files changed, 162 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=934451f703759b233c25…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_GetData tests.
by Alexandre Julliard 16 Jun '21

16 Jun '21

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 delete_key() to support use of RegDeleteKeyEx().
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: f06869199571466c989b0e75a8edfb55ad6e541a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06869199571466c989b0e75… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 16 22:43:05 2021 +1000 reg/tests: Modify delete_key() to support use of RegDeleteKeyEx(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 35 +++++++++++++++++++++-------------- programs/reg/tests/copy.c | 32 ++++++++++++++++---------------- programs/reg/tests/export.c | 14 +++++++------- programs/reg/tests/import.c | 38 +++++++++++++++++++------------------- programs/reg/tests/reg_test.h | 4 ++-- 5 files changed, 65 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f06869199571466c989b…

1 0

Hugh McMaster : reg/tests: Update reg_open() and reg_open_() definitions.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 0eb85504b4b9bdeef8a402d39024e20ad99789a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb85504b4b9bdeef8a402d3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 16 22:43:06 2021 +1000 reg/tests: Update reg_open() and reg_open_() definitions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 5 ++--- programs/reg/tests/reg_test.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index d2548c7d170..c8091fb7305 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -81,12 +81,11 @@ void verify_reg_nonexist_(const char *file, unsigned line, HKEY hkey, const char (value && *value) ? value : "(Default)", err); } -void open_key_(const char *file, unsigned line, const HKEY base, const char *path, - const DWORD sam, HKEY *hkey) +void open_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam, HKEY *hkey) { LONG err; - err = RegOpenKeyExA(base, path, 0, KEY_READ|sam, hkey); + err = RegOpenKeyExA(root, path, 0, KEY_READ|sam, hkey); lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got error %d\n", err); } diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 140f01580e8..ef76e4c92b0 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -46,9 +46,8 @@ void verify_reg_(const char *file, unsigned line, HKEY hkey, const char *value, #define verify_reg_nonexist(k,v) verify_reg_nonexist_(__FILE__,__LINE__,k,v) void verify_reg_nonexist_(const char *file, unsigned line, HKEY hkey, const char *value); -#define open_key(b,p,s,k) open_key_(__FILE__,__LINE__,b,p,s,k) -void open_key_(const char *file, unsigned line, const HKEY base, const char *path, - const DWORD sam, HKEY *hkey); +#define open_key(r,p,s,k) open_key_(__FILE__,__LINE__,r,p,s,k) +void open_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam, HKEY *hkey); #define close_key(k) close_key_(__FILE__,__LINE__,k) void close_key_(const char *file, unsigned line, HKEY hkey);

1 0

Hugh McMaster : reg/tests: Modify verify_key() to support opening of registry views.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: fdceb5ed7e5ce058cf9a64564e116f1bbe42d5ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdceb5ed7e5ce058cf9a6456… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 16 22:43:07 2021 +1000 reg/tests: Modify verify_key() to support opening of 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 | 18 ++++----- programs/reg/tests/copy.c | 42 ++++++++++----------- programs/reg/tests/delete.c | 2 +- programs/reg/tests/import.c | 88 +++++++++++++++++++++---------------------- programs/reg/tests/reg_test.h | 4 +- 5 files changed, 77 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fdceb5ed7e5ce058cf9a…

1 0

Hugh McMaster : reg/tests: Modify verify_key_nonexist() to support registry views.
by Alexandre Julliard 16 Jun '21

16 Jun '21

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: Update delete_value() declaration to deconstify 'const HKEY'.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: ff0445a5de192b2984bb558ac54e7f4d54e96129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0445a5de192b2984bb558a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 16 22:43:09 2021 +1000 reg/tests: Update delete_value() declaration to deconstify 'const HKEY'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 2 +- programs/reg/tests/reg_test.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index c2548e45f37..48e33f6564a 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -205,7 +205,7 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, lok(err == ERROR_SUCCESS, "RegSetValueExA failed: got error %d\n", err); } -void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name) +void delete_value_(const char *file, unsigned line, HKEY hkey, const char *name) { LONG err; diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 81badf928ba..1f57a3e9596 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -71,7 +71,7 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size); #define delete_value(k,n) delete_value_(__FILE__,__LINE__,k,n) -void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name); +void delete_value_(const char *file, unsigned line, HKEY hkey, const char *name); /* export.c */ #define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo)

1 0

Hugh McMaster : reg/tests: Modify add_key() to support key creation in registry views.
by Alexandre Julliard 16 Jun '21

16 Jun '21

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