- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : jscript: Throw error when accessing `arguments` prop of bind functions.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: a4c2f6ab72d233f103445f711808b29fa2cc8590 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4c2f6ab72d233f103445f711808b2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Throw error when accessing `arguments` prop of bind functions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 7 ++++++- dlls/mshtml/tests/es5.js | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index abd6638cab8..c4ee495a428 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -912,13 +912,18 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod return S_OK; } +static HRESULT BindFunction_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + return JS_E_INVALID_ACTION; +} + static HRESULT BindFunction_get_caller(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { return JS_E_INVALID_ACTION; } static const builtin_prop_t BindFunction_props[] = { - {L"arguments", NULL, 0, Function_get_arguments}, + {L"arguments", NULL, 0, BindFunction_get_arguments}, {L"caller", NULL, 0, BindFunction_get_caller}, {L"length", NULL, 0, Function_get_length} }; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 43723a68d00..fb9b710c70c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -532,8 +532,10 @@ sync_test("getOwnPropertyDescriptor", function() { test_own_data_prop_desc(String, "prototype", false, false, false); test_own_data_prop_desc(function(){}, "prototype", true, false, false); test_own_data_prop_desc(function(){}, "caller", false, false, false); + test_own_data_prop_desc(function(){}, "arguments", false, false, false); test_own_data_prop_desc(Function, "prototype", false, false, false); test_own_data_prop_desc(Function.prototype, "caller", false, false, false); + test_own_data_prop_desc(Function.prototype, "arguments", false, false, false); test_own_data_prop_desc(String.prototype, "constructor", true, false, true); try { @@ -1140,6 +1142,13 @@ sync_test("bind", function() { r = f.call(o2); ok(r === 1, "r = " + r); + try { + f.arguments; + ok(false, "expected exception getting f.arguments"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_INVALID_ACTION, "f.arguments threw " + n); + } try { f.caller; ok(false, "expected exception getting f.caller");

1 0

Gabriel Ivăncescu : jscript: Implement `caller` for function instances and prototype.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: 426f4bb3eadcf15378f7d4682a8ea904d5143408 URL: https://gitlab.winehq.org/wine/wine/-/commit/426f4bb3eadcf15378f7d4682a8ea9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Implement `caller` for function instances and prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 49 ++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 1 + dlls/mshtml/tests/documentmode.js | 21 +++++++++++++++++ dlls/mshtml/tests/es5.js | 12 ++++++++++ 4 files changed, 82 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 83dbfed6054..abd6638cab8 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -270,6 +270,26 @@ HRESULT Function_invoke(jsdisp_t *func_this, jsval_t vthis, WORD flags, unsigned return function->vtbl->call(function->dispex.ctx, function, vthis, flags, argc, argv, r); } +static HRESULT Function_get_caller(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + FunctionInstance *function = function_from_jsdisp(jsthis); + call_frame_t *frame; + + TRACE("%p\n", jsthis); + + for(frame = ctx->call_ctx; frame; frame = frame->prev_frame) { + if(frame->function_instance == &function->dispex) { + if(!frame->prev_frame || !frame->prev_frame->function_instance) + break; + *r = jsval_obj(jsdisp_addref(frame->prev_frame->function_instance)); + return S_OK; + } + } + + *r = jsval_null(); + return S_OK; +} + static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("%p\n", jsthis); @@ -565,6 +585,7 @@ static const builtin_prop_t Function_props[] = { {L"arguments", NULL, 0, Function_get_arguments}, {L"bind", Function_bind, PROPF_METHOD|PROPF_ES5|1}, {L"call", Function_call, PROPF_METHOD|1}, + {L"caller", NULL, PROPF_HTML, Function_get_caller}, {L"length", NULL, 0, Function_get_length}, {L"toString", Function_toString, PROPF_METHOD} }; @@ -584,6 +605,7 @@ static const builtin_info_t Function_info = { static const builtin_prop_t FunctionInst_props[] = { {L"arguments", NULL, 0, Function_get_arguments}, + {L"caller", NULL, PROPF_HTML, Function_get_caller}, {L"length", NULL, 0, Function_get_length} }; @@ -769,6 +791,7 @@ static HRESULT InterpretedFunction_set_prototype(script_ctx_t *ctx, jsdisp_t *js static const builtin_prop_t InterpretedFunction_props[] = { {L"arguments", NULL, 0, Function_get_arguments}, + {L"caller", NULL, PROPF_HTML, Function_get_caller}, {L"length", NULL, 0, Function_get_length}, {L"prototype", NULL, 0, InterpretedFunction_get_prototype, InterpretedFunction_set_prototype} }; @@ -889,6 +912,30 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod return S_OK; } +static HRESULT BindFunction_get_caller(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + return JS_E_INVALID_ACTION; +} + +static const builtin_prop_t BindFunction_props[] = { + {L"arguments", NULL, 0, Function_get_arguments}, + {L"caller", NULL, 0, BindFunction_get_caller}, + {L"length", NULL, 0, Function_get_length} +}; + +static const builtin_info_t BindFunction_info = { + JSCLASS_FUNCTION, + Function_value, + ARRAY_SIZE(BindFunction_props), + BindFunction_props, + Function_destructor, + NULL, + NULL, + NULL, + NULL, + Function_gc_traverse +}; + static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsval_t vthis, unsigned flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -975,7 +1022,7 @@ static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, BindFunction *function; HRESULT hres; - hres = create_function(ctx, NULL, &BindFunctionVtbl, FIELD_OFFSET(BindFunction, args[argc]), PROPF_METHOD, + hres = create_function(ctx, &BindFunction_info, &BindFunctionVtbl, FIELD_OFFSET(BindFunction, args[argc]), PROPF_METHOD, FALSE, NULL, (void**)&function); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 481e0612be5..a7a6f5a0ac2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -286,6 +286,7 @@ ok(unescape(escape(tmp)) === tmp, "unescape(escape('" + tmp + "')) = " + unescap ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty('toString') is false"); ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); +ok(!Function.prototype.hasOwnProperty('caller'), "Function.prototype.hasOwnProperty('caller') is true"); Object(); new Object(); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9007d451bdb..dd67a117e64 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -840,6 +840,27 @@ sync_test("for..in", function() { ok(found === 1, "ondragstart enumerated " + found + " times in document after set to empty string"); }); +sync_test("function caller", function() { + ok(Function.prototype.hasOwnProperty("caller"), "caller not prop of Function.prototype"); + + function test_caller(expected_caller, stop) { + ok(test_caller.caller === expected_caller, "caller = " + test_caller.caller); + if(stop) return; + function nested() { + ok(nested.caller === test_caller, "nested caller = " + nested.caller); + test_caller(nested, true); + ok(test_caller.caller === expected_caller, "caller within nested = " + test_caller.caller); + } + nested(); + ok(test_caller.caller === expected_caller, "caller after nested = " + test_caller.caller); + } + ok(test_caller.hasOwnProperty("caller"), "caller not prop of test_caller"); + ok(test_caller.caller === null, "test_caller.caller = " + test_caller.caller); + + function f1() { test_caller(f1); } f1(); + function f2() { test_caller(f2); } f2(); +}); + sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; var v = document.documentMode, found, i; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 1ed3a64bcba..43723a68d00 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -18,6 +18,7 @@ var E_INVALIDARG = 0x80070057; var JS_E_PROP_DESC_MISMATCH = 0x800a01bd; +var JS_E_INVALID_ACTION = 0x800a01bd; var JS_E_NUMBER_EXPECTED = 0x800a1389; var JS_E_FUNCTION_EXPECTED = 0x800a138a; var JS_E_DATE_EXPECTED = 0x800a138e; @@ -525,11 +526,14 @@ sync_test("getOwnPropertyDescriptor", function() { (function() { test_own_data_prop_desc(arguments, "length", true, false, true); test_own_data_prop_desc(arguments, "callee", true, false, true); + ok(!("caller" in arguments), "caller in arguments"); })(); test_own_data_prop_desc(String, "prototype", false, false, false); test_own_data_prop_desc(function(){}, "prototype", true, false, false); + test_own_data_prop_desc(function(){}, "caller", false, false, false); test_own_data_prop_desc(Function, "prototype", false, false, false); + test_own_data_prop_desc(Function.prototype, "caller", false, false, false); test_own_data_prop_desc(String.prototype, "constructor", true, false, true); try { @@ -1136,6 +1140,14 @@ sync_test("bind", function() { r = f.call(o2); ok(r === 1, "r = " + r); + try { + f.caller; + ok(false, "expected exception getting f.caller"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_INVALID_ACTION, "f.caller threw " + n); + } + f = (function() { ok(this === o, "this != o"); ok(arguments.length === 1, "arguments.length = " + arguments.length);

1 0

Gabriel Ivăncescu : jscript: Store ref to scope directly instead of frame in arguments object.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: 963be08bcc30c5a89f89ea78cc74c2f8407b5ee0 URL: https://gitlab.winehq.org/wine/wine/-/commit/963be08bcc30c5a89f89ea78cc74c2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Store ref to scope directly instead of frame in arguments object. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 37 ++++++++++++++++++++++++------------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d2b1089b8ac..379d209f0b0 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3116,7 +3116,7 @@ static void pop_call_frame(script_ctx_t *ctx) } if(frame->arguments_obj) - detach_arguments_object(frame->arguments_obj); + detach_arguments_object(frame); if(frame->scope) scope_release(frame->scope); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 917f67c17d8..68b60401063 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -310,4 +310,4 @@ HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; -void detach_arguments_object(jsdisp_t*) DECLSPEC_HIDDEN; +void detach_arguments_object(call_frame_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index a0450c57fe4..4942c70e75e 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -66,7 +66,7 @@ typedef struct { typedef struct { jsdisp_t jsdisp; jsval_t *buf; - call_frame_t *frame; + scope_chain_t *scope; unsigned argc; } ArgumentsInstance; @@ -113,6 +113,9 @@ static void Arguments_destructor(jsdisp_t *jsdisp) free(arguments->buf); } + if(arguments->scope) + scope_release(arguments->scope); + free(arguments); } @@ -126,9 +129,9 @@ static jsval_t *get_argument_ref(ArgumentsInstance *arguments, unsigned idx) { if(arguments->buf) return arguments->buf + idx; - if(!arguments->frame->base_scope->detached_vars) - return arguments->jsdisp.ctx->stack + arguments->frame->arguments_off + idx; - return arguments->frame->base_scope->detached_vars->var + idx; + if(!arguments->scope->detached_vars) + return arguments->jsdisp.ctx->stack + arguments->scope->frame->arguments_off + idx; + return arguments->scope->detached_vars->var + idx; } static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) @@ -172,6 +175,12 @@ static HRESULT Arguments_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op } } + if(arguments->scope) { + hres = gc_process_linked_obj(gc_ctx, op, jsdisp, &arguments->scope->dispex, (void**)&arguments->scope); + if(FAILED(hres)) + return hres; + } + return S_OK; } @@ -203,7 +212,7 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) } args->argc = frame->argc; - args->frame = frame; + args->scope = scope_addref(frame->base_scope); hres = jsdisp_define_data_property(&args->jsdisp, L"length", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_number(args->argc)); @@ -221,23 +230,22 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) return S_OK; } -void detach_arguments_object(jsdisp_t *args_disp) +void detach_arguments_object(call_frame_t *frame) { - ArgumentsInstance *arguments = arguments_from_jsdisp(args_disp); - call_frame_t *frame = arguments->frame; - const BOOL on_stack = frame->base_scope->frame == frame; - jsdisp_t *jsobj = as_jsdisp(frame->base_scope->obj); + ArgumentsInstance *arguments = arguments_from_jsdisp(frame->arguments_obj); + scope_chain_t *scope = arguments->scope; + const BOOL on_stack = scope->frame == frame; + jsdisp_t *jsobj = as_jsdisp(scope->obj); /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have * their own arguments property, it's impossible to use prototype's one during name lookup */ jsdisp_propput_name(jsobj, L"arguments", jsval_undefined()); - arguments->frame = NULL; /* Don't bother coppying arguments if call frame holds the last reference. */ if(arguments->jsdisp.ref > 1) { arguments->buf = malloc(arguments->argc * sizeof(*arguments->buf)); if(arguments->buf) { - const jsval_t *args = on_stack ? arguments->jsdisp.ctx->stack + frame->arguments_off : frame->base_scope->detached_vars->var; + const jsval_t *args = on_stack ? arguments->jsdisp.ctx->stack + frame->arguments_off : scope->detached_vars->var; int i; for(i = 0; i < arguments->argc ; i++) { @@ -248,9 +256,12 @@ void detach_arguments_object(jsdisp_t *args_disp) ERR("out of memory\n"); arguments->argc = 0; } + + arguments->scope = NULL; + scope_release(scope); } - jsdisp_release(frame->arguments_obj); + jsdisp_release(&arguments->jsdisp); } HRESULT Function_invoke(jsdisp_t *func_this, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r)

1 0

Gabriel Ivăncescu : jscript: Don't expose Function.prototype.arguments in non-html mode.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: 898b705e834f445c497b66ef240f7af1a1e7907b URL: https://gitlab.winehq.org/wine/wine/-/commit/898b705e834f445c497b66ef240f7a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Don't expose Function.prototype.arguments in non-html mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 2 +- dlls/jscript/tests/api.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index c4ee495a428..a0450c57fe4 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -582,7 +582,7 @@ static HRESULT Function_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op o static const builtin_prop_t Function_props[] = { {L"apply", Function_apply, PROPF_METHOD|2}, - {L"arguments", NULL, 0, Function_get_arguments}, + {L"arguments", NULL, PROPF_HTML, Function_get_arguments}, {L"bind", Function_bind, PROPF_METHOD|PROPF_ES5|1}, {L"call", Function_call, PROPF_METHOD|1}, {L"caller", NULL, PROPF_HTML, Function_get_caller}, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a7a6f5a0ac2..d632d889476 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -287,6 +287,7 @@ ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); ok(!Function.prototype.hasOwnProperty('caller'), "Function.prototype.hasOwnProperty('caller') is true"); +ok(!Function.prototype.hasOwnProperty('arguments'), "Function.prototype.hasOwnProperty('arguments') is true"); Object(); new Object();

1 0

Gabriel Ivăncescu : jscript: Use jsstr_empty instead of allocating empty string.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: e748ead5cf41a72a92cab16a9b1deee2ca2e74c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e748ead5cf41a72a92cab16a9b1dee… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Use jsstr_empty instead of allocating empty string. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/json.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 7826000f87d..e07ad863348 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -396,13 +396,11 @@ static HRESULT JSON_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned if(SUCCEEDED(hres)) { struct transform_json_object_ctx proc_ctx = { ctx, get_object(argv[1]), S_OK }; - if(!(str = jsstr_alloc(L""))) - hres = E_OUTOFMEMORY; - else { - ret = transform_json_object(&proc_ctx, root, str); - jsstr_release(str); - hres = proc_ctx.hres; - } + + str = jsstr_empty(); + ret = transform_json_object(&proc_ctx, root, str); + jsstr_release(str); + hres = proc_ctx.hres; } jsdisp_release(root); if(FAILED(hres))

1 0

Alexandre Julliard : wow64: Don't load the 32-bit ntdll as an image to avoid debugger notifications.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: 1c13f0e69478a7cbdef177a4f3ae7272fbdd16b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c13f0e69478a7cbdef177a4f3ae72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 11:54:08 2023 +0200 wow64: Don't load the 32-bit ntdll as an image to avoid debugger notifications. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55109 --- dlls/wow64/syscall.c | 43 ++++++++++++++++++++++++++++--------------- dlls/wow64/wow64_private.h | 5 ----- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 4bd4f4f2741..85db80a53df 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -663,35 +663,48 @@ static DWORD get_syscall_num( const BYTE *syscall ) } +/********************************************************************** + * get_rva + */ +static void *get_rva( const IMAGE_NT_HEADERS *nt, HMODULE module, DWORD rva, + IMAGE_SECTION_HEADER **section, BOOL image ) +{ + if (image) return (void *)((char *)module + rva); + return RtlImageRvaToVa( nt, module, rva, section ); +} + + /********************************************************************** * init_syscall_table */ -static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_TABLE *orig_table ) +static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_TABLE *orig_table, BOOL image ) { static syscall_thunk thunks[2048]; static ULONG start_pos; + const IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + IMAGE_SECTION_HEADER *section = NULL; const IMAGE_EXPORT_DIRECTORY *exports; const ULONG *functions, *names; const USHORT *ordinals; ULONG id, exp_size, exp_pos, wrap_pos, max_pos = 0; const char **syscall_names = (const char **)orig_table->CounterTable; - exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); - ordinals = get_rva( module, exports->AddressOfNameOrdinals ); - functions = get_rva( module, exports->AddressOfFunctions ); - names = get_rva( module, exports->AddressOfNames ); + exports = RtlImageDirectoryEntryToData( module, image, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); + ordinals = get_rva( nt, module, exports->AddressOfNameOrdinals, &section, image ); + functions = get_rva( nt, module, exports->AddressOfFunctions, &section, image ); + names = get_rva( nt, module, exports->AddressOfNames, &section, image ); for (exp_pos = wrap_pos = 0; exp_pos < exports->NumberOfNames; exp_pos++) { - char *name = get_rva( module, names[exp_pos] ); + char *name = get_rva( nt, module, names[exp_pos], &section, image ); int res = -1; if (strncmp( name, "Nt", 2 ) && strncmp( name, "wine", 4 ) && strncmp( name, "__wine", 6 )) continue; /* not a syscall */ - if ((id = get_syscall_num( get_rva( module, functions[ordinals[exp_pos]] ))) == ~0u) - continue; /* not a syscall */ + id = get_syscall_num( get_rva( nt, module, functions[ordinals[exp_pos]], &section, image )); + if (id == ~0u) continue; /* not a syscall */ if (wrap_pos < orig_table->ServiceLimit) res = strcmp( name, syscall_names[wrap_pos] ); @@ -739,7 +752,7 @@ void init_image_mapping( HMODULE module ) if (!win32u_module && RtlFindExportedRoutineByName( module, "NtUserInitializeClientPfnArrays" )) { win32u_module = module; - init_syscall_table( win32u_module, 1, psdwhwin32 ); + init_syscall_table( win32u_module, 1, psdwhwin32, TRUE ); } } @@ -747,7 +760,7 @@ void init_image_mapping( HMODULE module ) /********************************************************************** * load_32bit_module */ -static HMODULE load_32bit_module( const WCHAR *name, WORD machine ) +static HMODULE load_32bit_module( const WCHAR *name, WORD machine, BOOL image ) { NTSTATUS status; OBJECT_ATTRIBUTES attr; @@ -771,8 +784,8 @@ static HMODULE load_32bit_module( const WCHAR *name, WORD machine ) size.QuadPart = 0; status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | - SECTION_MAP_READ | SECTION_MAP_EXECUTE, - NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); + SECTION_MAP_READ | SECTION_MAP_EXECUTE, NULL, + &size, PAGE_EXECUTE_READ, image ? SEC_IMAGE : SEC_COMMIT, handle ); NtClose( handle ); if (status) return NULL; @@ -897,12 +910,12 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex *(void **)RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ) = p__wine_get_unix_opcode(); GET_PTR( KiRaiseUserExceptionDispatcher ); - if ((ntdll = load_32bit_module( L"ntdll.dll", current_machine ))) + if ((ntdll = load_32bit_module( L"ntdll.dll", current_machine, FALSE ))) { - init_syscall_table( ntdll, 0, &ntdll_syscall_table ); + init_syscall_table( ntdll, 0, &ntdll_syscall_table, FALSE ); NtUnmapViewOfSection( NtCurrentProcess(), ntdll ); } - else init_syscall_table( module, 0, &ntdll_syscall_table ); + else init_syscall_table( module, 0, &ntdll_syscall_table, TRUE ); init_file_redirects(); return TRUE; diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index bba191ad439..a840c1d01c0 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -47,11 +47,6 @@ struct object_attr64 SECURITY_DESCRIPTOR sd; }; -static inline void *get_rva( HMODULE module, DWORD va ) -{ - return (void *)((char *)module + va); -} - /* cf. GetSystemWow64Directory2 */ static inline const WCHAR *get_machine_wow64_dir( USHORT machine ) {

1 0

Davide Beatrici : wineoss: Use create_stream's channel count in AudioClient's Initialize.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: 5a79e98046743ae59a51181560b59f7483cde6e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a79e98046743ae59a51181560b59f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 21 12:41:52 2023 +0200 wineoss: Use create_stream's channel count in AudioClient's Initialize. --- dlls/wineoss.drv/mmdevdrv.c | 13 ++++++------- dlls/wineoss.drv/oss.c | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index bacf22a9029..5f2236ce63e 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -527,7 +527,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; stream_handle stream; - unsigned int i; + unsigned int i, channel_count; WCHAR *name; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, @@ -575,7 +575,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; - params.channel_count = NULL; + params.channel_count = &channel_count; params.stream = &stream; OSS_CALL(create_stream, &params); @@ -587,17 +587,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return params.result; } - This->channel_count = fmt->nChannels; - This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); + This->vols = HeapAlloc(GetProcessHeap(), 0, channel_count * sizeof(float)); if(!This->vols){ params.result = E_OUTOFMEMORY; goto exit; } - for(i = 0; i < This->channel_count; ++i) + for(i = 0; i < channel_count; ++i) This->vols[i] = 1.f; - params.result = get_audio_session(sessionguid, This->parent, This->channel_count, - &This->session); + params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); exit: if(FAILED(params.result)){ @@ -607,6 +605,7 @@ exit: } else { list_add_tail(&This->session->clients, &This->entry); This->stream = stream; + This->channel_count = channel_count; set_stream_volumes(This); } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 5049c711e98..2097137f749 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -674,6 +674,7 @@ exit: free(stream->fmt); free(stream); }else{ + *params->channel_count = params->fmt->nChannels; *params->stream = (stream_handle)(UINT_PTR)stream; }

1 0

Davide Beatrici : winepulse: Refactor AudioClient's Initialize to match other drivers.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: 58b545fb60c795c1d96c572479224b8a9547fca1 URL: https://gitlab.winehq.org/wine/wine/-/commit/58b545fb60c795c1d96c572479224b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Jun 22 20:36:48 2023 +0200 winepulse: Refactor AudioClient's Initialize to match other drivers. --- dlls/winepulse.drv/mmdevdrv.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index c932652f2e9..299d5dc67c5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -563,10 +563,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, { ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; - unsigned int i, channel_count; + UINT32 i, channel_count; stream_handle stream; WCHAR *name; - HRESULT hr; TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -599,10 +598,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - if (FAILED(hr = main_loop_start())) + if (FAILED(params.result = main_loop_start())) { sessions_unlock(); - return hr; + return params.result; } params.name = name = get_application_name(); @@ -617,38 +616,37 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.channel_count = &channel_count; pulse_call(create_stream, &params); free(name); - if (FAILED(hr = params.result)) + if (FAILED(params.result)) { sessions_unlock(); - return hr; + return params.result; } if (!(This->vols = malloc(channel_count * sizeof(*This->vols)))) { - stream_release(stream, NULL); - sessions_unlock(); - return E_OUTOFMEMORY; + params.result = E_OUTOFMEMORY; + goto exit; } for (i = 0; i < channel_count; i++) This->vols[i] = 1.f; - hr = get_audio_session(sessionguid, This->parent, channel_count, &This->session); - if (FAILED(hr)) - { + params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session); + +exit: + if (FAILED(params.result)) { + stream_release(stream, NULL); free(This->vols); This->vols = NULL; - sessions_unlock(); - stream_release(stream, NULL); - return E_OUTOFMEMORY; + } else { + list_add_tail(&This->session->clients, &This->entry); + This->stream = stream; + This->channel_count = channel_count; + set_stream_volumes(This); } - This->stream = stream; - This->channel_count = channel_count; - list_add_tail(&This->session->clients, &This->entry); - set_stream_volumes(This); - sessions_unlock(); - return S_OK; + + return params.result; } extern HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface,

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's set_stream_volumes.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: 9bd7d848a6225255eec390163021db886a77409a URL: https://gitlab.winehq.org/wine/wine/-/commit/9bd7d848a6225255eec390163021db… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 05:59:21 2023 +0200 winecoreaudio: Use mmdevapi's set_stream_volumes. --- dlls/winecoreaudio.drv/mmdevdrv.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 683e22e35a2..fc011021d68 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -79,6 +79,8 @@ extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); extern WCHAR *get_application_name(void); +extern void set_stream_volumes(struct audio_client *This); + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -198,18 +200,6 @@ static void get_device_guid(EDataFlow flow, const char *dev, GUID *guid) RegCloseKey(key); } -static void set_stream_volumes(ACImpl *This) -{ - struct set_volumes_params params; - - params.stream = This->stream; - params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; - params.volumes = This->vols; - params.session_volumes = This->session->channel_vols; - - UNIX_CALL(set_volumes, &params); -} - HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) {

1 0

Davide Beatrici : wineoss: Use mmdevapi's set_stream_volumes.
by Alexandre Julliard June 23, 2023

June 23, 2023

Module: wine Branch: master Commit: 694d713d1b7e8bca4c25caf9c45fa1af60d050b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/694d713d1b7e8bca4c25caf9c45fa1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jun 20 05:59:36 2023 +0200 wineoss: Use mmdevapi's set_stream_volumes. --- dlls/wineoss.drv/mmdevdrv.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 950b711bad0..bacf22a9029 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -91,6 +91,8 @@ extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); extern WCHAR *get_application_name(void); +extern void set_stream_volumes(struct audio_client *This); + void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -215,17 +217,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static void set_stream_volumes(ACImpl *This) -{ - struct set_volumes_params params; - - params.stream = This->stream; - params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); - params.volumes = This->vols; - params.session_volumes = This->session->channel_vols; - OSS_CALL(set_volumes, &params); -} - static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item;

1 0