wine-devel

wine-devel@winehq.org

4 participants
84401 discussions

[PATCH v5 0/3] NtQueryDirectoryObject multiple entires case (#52585)
by Jinoh Kang 08 May '22

08 May '22

This is a split off resend of Zebediah's original patch. v3: original patch by Zebediah Figura v3 -> v4: split patch v4 -> v5: fix author Zebediah Figura (3): server: Don't set error in find_object_index if the object is not found. ntdll: Implement reading multiple entries in NtQueryDirectoryObject. server: Generalize get_directory_entries to single_entry case. dlls/ntdll/tests/om.c | 57 +++++++++----------- dlls/ntdll/unix/sync.c | 116 +++++++++++++++++++++++++++-------------- server/directory.c | 76 +++++++++++++++++++++------ server/object.c | 1 - server/protocol.def | 20 ++++--- server/trace.c | 34 ++++++++++++ 6 files changed, 209 insertions(+), 95 deletions(-) -- 2.34.1

2 4

[PATCH 0/3] NtQueryDirectoryObject multiple entires case (#52585)
by Jinoh Kang 08 May '22

08 May '22

This is a split off resend of Zebediah's original patch. Jinoh Kang (2): server: Don't set error in find_object_index if the object is not found. server: Generalize get_directory_entries to single_entry case. Zebediah Figura (1): ntdll: Implement reading multiple entries in NtQueryDirectoryObject. dlls/ntdll/tests/om.c | 57 +++++++++----------- dlls/ntdll/unix/sync.c | 116 +++++++++++++++++++++++++++-------------- server/directory.c | 76 +++++++++++++++++++++------ server/object.c | 1 - server/protocol.def | 20 ++++--- server/trace.c | 34 ++++++++++++ 6 files changed, 209 insertions(+), 95 deletions(-) -- 2.34.1

1 3

[PATCH 0/4] MR47: kernel32/tests: Add tests for CancelSynchronousIo.
by Daniel Lehman (＠dlehman25) 07 May '22

07 May '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/47

2 4

Re: [PATCH v2 0/1] MR29: mfplat: Avoid a race condition when releasing a tracked sample.
by Nikolay Sivov (＠nsivov) 07 May '22

07 May '22

Turns out I missed a problem with this. When queues are shut down, releasing result object reenters sample release method, and potentially destroys it. On return original call continues, and uses critical section that has been just destroyed. Attaching a possible fix for this. [2.diff](/uploads/94a959648e483587b11172a6cc34b015/2.diff) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/29#note_743

1 0

[PATCH 0/1] MR45: ntdll: Always prefer native signal restorer over the custom one.
by Jinoh Kang (＠iamahuman) 07 May '22

07 May '22

A few months after commit 1b1ea639cd6 (ntdll: Use a custom signal restorer for Android., 2014-07-17) has been introduced, bionic rolled its own signal restorer. The patch is at: https://android-review.googlesource.com/c/platform/bionic/+/107692 In general, rolling our own signal restorer is not a good idea since it interferes with unwinding. GDB seems especially unhappy when the signal restorer's name isn't exactly "__restore_rt". Fix this by using the custom signal restorer only if the vDSO has disappeared and libc doesn't supply its own signal restorer. This also removes Android-specific code, although there aren't many libcs out there that lack a backup signal restorer. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/45

2 1

Wine staging 7.8 release
by Alistair Leslie-Hughes 07 May '22

07 May '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.8 (550 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * server: Create message queue and thread input in set_key_state. * server: Lock thread input keystate whenever it is modified. * server: Create message queue and thread input in get_key_state. Added: * [48121] Improve Alt+tab for unity games. Updated: * winex11-_NET_ACTIVE_WINDOW * user32-Mouse_Message_Hwnd * user32-rawinput-mouse * api-iteration-tokens Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2] kernelbase: Add RaiseFailFastException stub.
by Brendan Shanks 06 May '22

06 May '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Fix format string for DWORD parameter. dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/debug.c | 8 ++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bc5913b6d7d..b7da3b68db7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1197,7 +1197,7 @@ @ stdcall -import QueueUserAPC(ptr long long) @ stdcall -import QueueUserWorkItem(ptr ptr long) @ stdcall -import RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall -import RaiseFailFastException(ptr ptr long) @ stdcall -import ReadConsoleA(long ptr long ptr ptr) @ stdcall -import ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 6848d5af125..9e954e3ffbe 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -303,6 +303,14 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou } __ASM_STDCALL_IMPORT(RaiseException,16) +/******************************************************************* + * RaiseFailFastException (kernelbase.@) + */ +void WINAPI DECLSPEC_HOTPATCH RaiseFailFastException( EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags ) +{ + FIXME( "(%p, %p, %ld) stub\n", record, context, flags ); + TerminateProcess( GetCurrentProcess(), STATUS_FAIL_FAST_EXCEPTION ); +} /*********************************************************************** * SetUnhandledExceptionFilter (kernelbase.@) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 854797ddeb0..ab580e03594 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1264,7 +1264,7 @@ # @ stub QuirkIsEnabledForPackage4 # @ stub QuirkIsEnabledForProcess @ stdcall RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall RaiseFailFastException(ptr ptr long) @ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) -- 2.32.0 (Apple Git-132)

1 0

[PATCH 0/4] Some small registry access fixes
by Torge Matthies 06 May '22

06 May '22

I had these in my patch repo for quite a while. Patch 1 shouldn't need explanation. The problem fixed by patch 2 and 3 is that sizeof(KEY_{BASIC,VALUE_PARTIAL,FULL}_INFORMATION) are all slightly bigger than the actual minimum size required to get all the requested info, because those structs include an array of size 1 as their last member, which is intended to be a variable length array. Fixing these size calculations removes one allocation in wineserver and reduces the amount of data transmitted by 1 - 2 bytes. Patch 4 just reduces the amount of data transmitted from wineserver for each update_display_cache_from_registry call, which is called every time the display device lists are locked. Torge Matthies (4): ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey. ntdll: Calculate buffer sizes from registry structs correctly. win32u: Calculate buffer sizes from registry structs correctly. win32u: Query basic instead of full key information to get the LastWriteTime. dlls/ntdll/reg.c | 10 +++++----- dlls/ntdll/unix/system.c | 2 +- dlls/win32u/sysparams.c | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) -- 2.36.0

1 4

[PATCH v2 1/2] jscript: Handle detached scope objects 'this' in all calls.
by Gabriel Ivăncescu 06 May '22

06 May '22

Not just for interpreted functions. And set to undefined in ES5+ modes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes 234852-234853. dlls/jscript/engine.c | 12 ++++-------- dlls/jscript/function.c | 30 ++++++++++++++++++++++++------ dlls/jscript/tests/api.js | 2 ++ dlls/jscript/tests/lang.js | 3 +++ dlls/mshtml/tests/es5.js | 15 +++++++++++++++ 5 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 73b9d86..83005eb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3300,16 +3300,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } } - /* ECMA-262 3rd Edition 11.2.3.7 */ + /* FIXME: Workaround for ES5 mode because we don't have the JS global == window yet */ if(this_obj) { - jsdisp_t *jsthis; + jsdisp_t *jsthis = to_jsdisp(this_obj); - jsthis = iface_to_jsdisp(this_obj); - if(jsthis) { - if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) - this_obj = NULL; - jsdisp_release(jsthis); - } + if(jsthis && jsthis->builtin_info->class == JSCLASS_GLOBAL) + this_obj = NULL; } if(ctx->call_ctx && (flags & EXEC_EVAL)) { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 12511bb..942ec9d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -247,6 +247,24 @@ void detach_arguments_object(jsdisp_t *args_disp) jsdisp_release(frame->arguments_obj); } +/* ECMA-262 3rd Edition 11.2.3.7 + ECMA-262 5.1 Edition 11.2.3.6 */ +static inline HRESULT call(script_ctx_t *ctx, FunctionInstance *function, jsval_t vthis, unsigned flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsdisp_t *jsthis; + + if(is_object_instance(vthis) && (jsthis = to_jsdisp(get_object(vthis)))) { + if(ctx->version < SCRIPTLANGUAGEVERSION_ES5) { + if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) + vthis = jsval_null(); + }else if(jsthis->builtin_info->class == JSCLASS_NONE) + vthis = jsval_undefined(); + } + + return function->vtbl->call(ctx, function, vthis, flags, argc, argv, r); +} + HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; @@ -256,7 +274,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi assert(is_class(func_this, JSCLASS_FUNCTION)); function = function_from_jsdisp(func_this); - return function->vtbl->call(function->dispex.ctx, function, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); + return call(function->dispex.ctx, function, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); } static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) @@ -378,7 +396,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi if(SUCCEEDED(hres)) { if(function) { - hres = function->vtbl->call(ctx, function, this_val, flags, cnt, args, r); + hres = call(ctx, function, this_val, flags, cnt, args, r); }else { jsval_t res; hres = disp_call_value(ctx, get_object(vthis), is_object_instance(this_val) ? get_object(this_val) : NULL, @@ -429,7 +447,7 @@ static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig cnt = argc-1; } - hres = function->vtbl->call(ctx, function, this_val, flags, cnt, argv + 1, r); + hres = call(ctx, function, this_val, flags, cnt, argv + 1, r); jsval_release(this_val); return hres; @@ -483,7 +501,7 @@ HRESULT Function_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar return E_FAIL; } - return function->vtbl->call(ctx, function, vthis, flags, argc, argv, r); + return call(ctx, function, vthis, flags, argc, argv, r); } HRESULT Function_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) @@ -839,8 +857,8 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsva memcpy(call_args + function->argc, argv, argc * sizeof(*call_args)); } - hres = function->target->vtbl->call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(), - flags, call_argc, call_args, r); + hres = call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(), + flags, call_argc, call_args, r); heap_free(call_args); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e81bbea..1368f39 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2634,6 +2634,8 @@ testException(function() {null.toString();}, "E_OBJECT_EXPECTED"); testException(function() {RegExp.prototype.toString.call(new Object());}, "E_REGEXP_EXPECTED"); testException(function() {/a/.lastIndex();}, "E_NOT_FUNC"); testException(function() {"a".length();}, "E_NOT_FUNC"); +testException(function() {((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())();}, "E_NOT_NUM"); +testException(function() {((function() { var f = Object.prototype.hasOwnProperty; return (function() { return f("f"); }); })())();}, "E_OBJECT_EXPECTED"); testException(function() { return arguments.callee(); }, "E_STACK_OVERFLOW"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index cf08423..67e4576 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -310,6 +310,9 @@ argumentsTest(); ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); })(1,2); +tmp = ((function() { var f = function() {return this}; return (function() { return f(); }); })())(); +ok(tmp === this, "detached scope function call this != global this"); + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;"); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 8238e5d..fb756ac 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1784,6 +1784,21 @@ sync_test("let scope instances", function() { ok(f() == 2, "f() = " + f()); }); +sync_test("builtins detached scope this", function() { + try { + ((function() { var f = Number.prototype.toString; return (function() { return f(); }); })())(); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === JS_E_NUMBER_EXPECTED, "Number.toString threw " + n); + } + + var r = ((function() { var f = Object.prototype.toString; return (function() { return f(); }); })())(); + ok(r === "[object Undefined]", "Object.toString returned " + r); + + var r = ((function() { return (function() { return this; }); })())(); + ok(r === window, "detached scope this = " + r); +}); + sync_test("functions scope", function() { function f(){ return 1; } function f(){ return 2; } -- 2.34.1

2 3

Re: [PATCH v3 0/9] MR44: winex11: PE conversion - approved
by Alexandre Julliard (＠julliard) 06 May '22

06 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/44

1 0

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