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

Vijay Kiran Kamuju : msdrm: Add stub DRMRegisterContent function.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: afd5550b07f6d55e56738f61d829085d6bc82888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd5550b07f6d55e56738f61… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 19 14:02:32 2021 +0100 msdrm: Add stub DRMRegisterContent function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdrm/Makefile.in | 5 ++++- dlls/msdrm/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msdrm/msdrm.spec | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/msdrm/Makefile.in b/dlls/msdrm/Makefile.in index 07d04d4f861..32167468eba 100644 --- a/dlls/msdrm/Makefile.in +++ b/dlls/msdrm/Makefile.in @@ -1,3 +1,6 @@ MODULE = msdrm.dll -EXTRADLLFLAGS = -Wb,--prefer-native +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/msdrm/main.c b/dlls/msdrm/main.c new file mode 100644 index 00000000000..db77f791311 --- /dev/null +++ b/dlls/msdrm/main.c @@ -0,0 +1,34 @@ +/* + * Windows Rights Management Client + * + * Copyright 2021 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdrm); + +HRESULT WINAPI DRMRegisterContent(BOOL value) +{ + FIXME("(%u): stub\n", value); + + return S_OK; +} diff --git a/dlls/msdrm/msdrm.spec b/dlls/msdrm/msdrm.spec index 8b85f3b53a4..5a83307ee05 100644 --- a/dlls/msdrm/msdrm.spec +++ b/dlls/msdrm/msdrm.spec @@ -70,7 +70,7 @@ @ stub DRMIsWindowProtected @ stub DRMLoadLibrary @ stub DRMParseUnboundLicense -@ stub DRMRegisterContent +@ stdcall DRMRegisterContent(long) @ stub DRMRegisterProtectedWindow @ stub DRMRegisterRevocationList @ stub DRMRepair

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add more reports with complex HID syntax.
by Alexandre Julliard June 16, 2021

June 16, 2021

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

Paul Gofman : shell32: Don't specify the startup directory for CreateProcessW() in SHELL_ExecuteW().
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 6b0b6a093f2c5d19fd04b017852ceddb475a2b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b0b6a093f2c5d19fd04b017… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 16 21:15:41 2021 +0300 shell32: Don't specify the startup directory for CreateProcessW() in SHELL_ExecuteW(). Doing so fails process creation for relative current directory as the directory already made current. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 17 ++++++----------- dlls/shell32/tests/shlexec.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ee1e832df33..49f7867ef7e 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -318,7 +318,6 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, UINT gcdret = 0; WCHAR curdir[MAX_PATH]; DWORD dwCreationFlags; - const WCHAR *lpDirectory = NULL; TRACE("Execute %s from directory %s\n", debugstr_w(lpCmd), debugstr_w(psei->lpDirectory)); @@ -326,17 +325,13 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, * a bad working directory */ if (psei->lpDirectory && psei->lpDirectory[0]) { - DWORD attr = GetFileAttributesW(psei->lpDirectory); - if (attr != INVALID_FILE_ATTRIBUTES && attr & FILE_ATTRIBUTE_DIRECTORY) - lpDirectory = psei->lpDirectory; + /* ShellExecute specifies the command from psei->lpDirectory + * if present. Not from the current dir as CreateProcess does */ + if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir ))) + if( !SetCurrentDirectoryW( psei->lpDirectory )) + ERR("cannot set directory %s\n", debugstr_w(psei->lpDirectory )); } - /* ShellExecute specifies the command from psei->lpDirectory - * if present. Not from the current dir as CreateProcess does */ - if( lpDirectory ) - if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir))) - if( !SetCurrentDirectoryW( lpDirectory)) - ERR("cannot set directory %s\n", debugstr_w(lpDirectory)); ZeroMemory(&startup,sizeof(STARTUPINFOW)); startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -345,7 +340,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, if (!(psei->fMask & SEE_MASK_NO_CONSOLE)) dwCreationFlags |= CREATE_NEW_CONSOLE; if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, - lpDirectory, &startup, &info)) + NULL, &startup, &info)) { /* Give 30 seconds to the app to come up, if desired. Probably only needed when starting app immediately before making a DDE connection. */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 2481fb6faa2..968953f9abb 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2816,6 +2816,7 @@ static void test_directory(void) char path[MAX_PATH + 10], curdir[MAX_PATH]; char params[1024], dirpath[1024]; INT_PTR rc; + BOOL ret; sprintf(path, "%s\\test2.exe", tmpdir); CopyFileA(argv0, path, FALSE); @@ -2876,7 +2877,18 @@ static void test_directory(void) okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); + + SetCurrentDirectoryA(tmpdir); + ret = CreateDirectoryA( "tmp", NULL ); + ok(ret || GetLastError() == ERROR_ALREADY_EXISTS, "Failed to create 'tmp' err %u\n", GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, path, params, "tmp", NULL); + okShell(rc > 32, "returned %lu\n", rc); + DeleteFileA(path); + + RemoveDirectoryA("tmp"); + SetCurrentDirectoryA(curdir); } START_TEST(shlexec)

1 0

Paul Gofman : jscript: Parse 'let' and 'const' variable declarations.
by Alexandre Julliard June 16, 2021

June 16, 2021

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

Hugh McMaster : reg/tests: Update delete_value() declaration to deconstify 'const HKEY'.
by Alexandre Julliard June 16, 2021

June 16, 2021

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

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP get/set values tests.
by Alexandre Julliard June 16, 2021

June 16, 2021

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 June 16, 2021

June 16, 2021

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

Hugh McMaster : reg/tests: Update reg_open() and reg_open_() definitions.
by Alexandre Julliard June 16, 2021

June 16, 2021

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 June 16, 2021

June 16, 2021

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

Alexandre Julliard : ntdll: Copy the implementation of __wine_dbg_output to the PE side.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: b572cf30253b0922c7c476bfc666c0345eb50256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b572cf30253b0922c7c476bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 15:33:07 2021 +0200 ntdll: Copy the implementation of __wine_dbg_output to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/unix/debug.c | 10 +++++++++- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unixlib.h | 5 +---- include/wine/debug.h | 1 + 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8cba4fa164a..bd72f50b864 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1621,6 +1621,7 @@ @ extern -arch=i386 __wine_ldt_copy # Debugging +@ stdcall -syscall -norelay __wine_dbg_write(ptr long) @ cdecl -norelay __wine_dbg_get_channel_flags(ptr) @ cdecl -norelay __wine_dbg_header(long long str) @ cdecl -norelay __wine_dbg_output(str) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d86d20448bf..d0c2a89d4bb 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -69,6 +69,22 @@ static void init_options(void) while (debug_options[nb_debug_options].name[0]) nb_debug_options++; } +/* add a string to the output buffer */ +static int append_output( struct debug_info *info, const char *str, size_t len ) +{ + if (len >= sizeof(info->output) - info->out_pos) + { + __wine_dbg_write( info->output, info->out_pos ); + info->out_pos = 0; + ERR_(thread)( "debug buffer overflow:\n" ); + __wine_dbg_write( str, len ); + RtlRaiseStatus( STATUS_BUFFER_OVERFLOW ); + } + memcpy( info->output + info->out_pos, str, len ); + info->out_pos += len; + return len; +} + /*********************************************************************** * __wine_dbg_get_channel_flags (NTDLL.@) * @@ -146,7 +162,19 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ */ int __cdecl __wine_dbg_output( const char *str ) { - return unix_funcs->dbg_output( str ); + struct debug_info *info = get_info(); + const char *end = strrchr( str, '\n' ); + int ret = 0; + + if (end) + { + ret += append_output( info, str, end + 1 - str ); + __wine_dbg_write( info->output, info->out_pos ); + info->out_pos = 0; + str = end + 1; + } + if (*str) ret += append_output( info, str, strlen( str )); + return ret; } diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 0272e68bea6..d43cdaeb917 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -249,6 +249,14 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) return memcpy( info->strings + pos, str, n ); } +/*********************************************************************** + * __wine_dbg_write (NTDLL.@) + */ +int WINAPI __wine_dbg_write( const char *str, unsigned int len ) +{ + return write( 2, str, len ); +} + /*********************************************************************** * __wine_dbg_output (NTDLL.@) */ @@ -261,7 +269,7 @@ int __cdecl __wine_dbg_output( const char *str ) if (end) { ret += append_output( info, str, end + 1 - str ); - write( 2, info->output, info->out_pos ); + __wine_dbg_write( info->output, info->out_pos ); info->out_pos = 0; str = end + 1; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index fca63141ba3..b9f1fee6a9d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1850,7 +1850,6 @@ static struct unix_funcs unix_funcs = init_builtin_dll, init_unix_lib, unwind_builtin_dll, - __wine_dbg_output, }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index cbe5c9d3ccd..ba37297a324 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 122 +#define NTDLL_UNIXLIB_VERSION 123 struct unix_funcs { @@ -78,9 +78,6 @@ struct unix_funcs NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); - - /* debugging functions */ - int (CDECL *dbg_output)( const char *str ); }; #endif /* __NTDLL_UNIXLIB_H */ diff --git a/include/wine/debug.h b/include/wine/debug.h index 2255f62e502..6aac7fe82e8 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -143,6 +143,7 @@ struct __wine_debug_channel #endif /* !__GNUC__ && !__SUNPRO_C */ +extern int WINAPI __wine_dbg_write( const char *str, unsigned int len ); extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str );

1 0