wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Dmitry Timoshkov : include: Add IAuthenticateEx interface definition.
by Alexandre Julliard 16 Jun '21

16 Jun '21

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

Paul Gofman : jscript: Parse 'let' and 'const' variable declarations.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: b3569629979e7fae612adc407ba37c292c7dffd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3569629979e7fae612adc40… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 15 18:07:34 2021 +0300 jscript: Parse 'let' and 'const' variable declarations. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 5 +++++ dlls/jscript/lex.c | 2 ++ dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 37 ++++++++++++++++++++++++++++++++----- dlls/jscript/tests/lang.js | 34 ++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 6 files changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9bb9ff13d14..2a17639641f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1138,6 +1138,11 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; + if (iter->block_scope) + FIXME("Block scope variables are not supported.\n"); + if (iter->constant) + FIXME("Constant variables are not supported.\n"); + hres = emit_identifier_ref(ctx, iter->identifier, 0); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index efed1038a95..695615721a7 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -41,6 +41,7 @@ static const struct { {L"break", kBREAK, TRUE}, {L"case", kCASE}, {L"catch", kCATCH}, + {L"const", kCONST}, {L"continue", kCONTINUE, TRUE}, {L"default", kDEFAULT}, {L"delete", kDELETE}, @@ -54,6 +55,7 @@ static const struct { {L"if", kIF}, {L"in", kIN}, {L"instanceof", kINSTANCEOF}, + {L"let", kLET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {L"new", kNEW}, {L"null", kNULL}, {L"return", kRETURN, TRUE}, diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index b88a52af242..c4dd0752ee9 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -95,6 +95,7 @@ literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; typedef struct _variable_declaration_t { const WCHAR *identifier; + BOOL block_scope, constant; expression_t *expr; struct _variable_declaration_t *next; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f11119143b8..6de39e43fac 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -87,7 +87,7 @@ static variable_list_t *variable_list_add(parser_ctx_t*,variable_list_t*,variabl static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); static statement_t *new_block_statement(parser_ctx_t*,unsigned,statement_list_t*); -static statement_t *new_var_statement(parser_ctx_t*,unsigned,variable_list_t*); +static statement_t *new_var_statement(parser_ctx_t*,BOOL,BOOL,unsigned,variable_list_t*); static statement_t *new_expression_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_if_statement(parser_ctx_t*,unsigned,expression_t*,statement_t*,statement_t*); static statement_t *new_while_statement(parser_ctx_t*,unsigned,BOOL,expression_t*,statement_t*); @@ -168,8 +168,9 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kGET kIN kSET -%token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH +%token <identifier> kBREAK kCASE kCATCH kCONST kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR +%token <identifier> kGET kIN kLET kSET kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE +%token <identifier> kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL /* tokens */ @@ -182,6 +183,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <source_elements> FunctionBody %type <statement> Statement %type <statement> Block +%type <statement> LexicalDeclaration %type <statement> VariableStatement %type <statement> EmptyStatement %type <statement> ExpressionStatement @@ -291,6 +293,7 @@ FormalParameterList_opt /* ECMA-262 3rd Edition 12 */ Statement : Block { $$ = $1; } + | LexicalDeclaration { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } | FunctionExpression { $$ = new_expression_statement(ctx, @$, $1); } @@ -322,10 +325,25 @@ Block : '{' StatementList '}' { $$ = new_block_statement(ctx, @2, $2); } | '{' '}' { $$ = new_block_statement(ctx, @$, NULL); } +/* ECMA-262 10th Edition 13.3.1, TODO: BindingList*/ +LexicalDeclaration + : kLET VariableDeclarationList semicolon_opt + { $$ = new_var_statement(ctx, TRUE, FALSE, @$, $2); } + | kCONST VariableDeclarationList semicolon_opt + { + if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("const var declaration %s in legacy mode.\n", + debugstr_w($1)); + set_error(ctx, @$, JS_E_SYNTAX); + YYABORT; + } + $$ = new_var_statement(ctx, TRUE, TRUE, @$, $2); + } + /* ECMA-262 3rd Edition 12.2 */ VariableStatement : kVAR VariableDeclarationList semicolon_opt - { $$ = new_var_statement(ctx, @$, $2); } + { $$ = new_var_statement(ctx, FALSE, FALSE, @$, $2); } /* ECMA-262 3rd Edition 12.2 */ VariableDeclarationList @@ -834,6 +852,7 @@ ReservedAsIdentifier : kBREAK { $$ = $1; } | kCASE { $$ = $1; } | kCATCH { $$ = $1; } + | kCONST { $$ = $1; } | kCONTINUE { $$ = $1; } | kDEFAULT { $$ = $1; } | kDELETE { $$ = $1; } @@ -847,6 +866,7 @@ ReservedAsIdentifier | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } + | kLET { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } @@ -1144,8 +1164,10 @@ static variable_list_t *variable_list_add(parser_ctx_t *ctx, variable_list_t *li return list; } -static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_list_t *variable_list) +static statement_t *new_var_statement(parser_ctx_t *ctx, BOOL block_scope, BOOL constant, unsigned loc, + variable_list_t *variable_list) { + variable_declaration_t *var; var_statement_t *ret; ret = new_statement(ctx, STAT_VAR, sizeof(*ret), loc); @@ -1153,6 +1175,11 @@ static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_ return NULL; ret->variable_list = variable_list->head; + for (var = ret->variable_list; var; var = var->next) + { + var->block_scope = block_scope; + var->constant = constant; + } return &ret->stat; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9e6e6ad239f..0db86c89985 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -2030,3 +2030,37 @@ Math = 6; ok(Math === 6, "NaN !== 6"); reportSuccess(); + +function test_es5_keywords() { + var let = 1 + var tmp + ok(let == 1, "let != 1"); + + tmp = false + try { + eval('var var = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var var = 1;'"); + + tmp = false + try { + eval('var const = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var const = 1;'"); + + tmp = false + try { + eval('const c1 = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'const c1 = 1;'"); +} +test_es5_keywords(); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7e46848d40e..24906de5231 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1207,3 +1207,20 @@ sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); }); + + +sync_test("declaration_let", function() { + ok(a === undefined, "a is not undefined"); + var a = 3; + + { + let a = 2; + + ok(a == 2, "a != 2"); + + a = 4; + ok(a == 4, "a != 4"); + } + + todo_wine.ok(a == 3, "a != 3"); +});

1 0

Ziqing Hui : windowscodecs/tests: Use winetest_push_context for DDS tests.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 6f57297c4acf52f3cf053b7155f592f402d33e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f57297c4acf52f3cf053b71… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 15 09:59:50 2021 +0800 windowscodecs/tests: Use winetest_push_context for DDS tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 291 ++++++++++++++++++----------------- 1 file changed, 151 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f57297c4acf52f3cf05…

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

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 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: 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: 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 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

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

← Newer
1
...
33
34
35
36
37
38
39
...
82
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 June 2021