wine-devel May 2022

wine-devel@winehq.org

77 participants
705 discussions

[PATCH 0/6] MR81: windows.gaming.input: More force feedback effect tests and implementation.
by Rémi Bernon (＠rbernon) 17 May '22

17 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/81

3 7

[PATCH v2 1/2] dinput: Pass a single GUID pointer to hid_joystick_device_open().
by Rémi Bernon 17 May '22

17 May '22

From: Zebediah Figura <zfigura(a)codeweavers.com> We set the instance and product IDs for all joysticks to match the latter parts of hid_joystick_guid and dinput_pidvid_guid, respectively. Therefore there is no need to manually check which one we are matching against. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 235833-235834 dlls/dinput/joystick_hid.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5fdc563054b..70b44c28474 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1564,8 +1564,8 @@ failed: return DIERR_DEVICENOTREG; } -static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, WCHAR *device_path, - HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, +static HRESULT hid_joystick_device_open( int index, const GUID *guid, DIDEVICEINSTANCEW *filter, + WCHAR *device_path, HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DWORD version ) { char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; @@ -1580,8 +1580,7 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W DWORD type; GUID hid; - TRACE( "index %d, product %s, instance %s\n", index, debugstr_guid( &filter->guidProduct ), - debugstr_guid( &filter->guidInstance ) ); + TRACE( "index %d, guid %s\n", index, debugstr_guid( guid ) ); HidD_GetHidGuid( &hid ); @@ -1626,8 +1625,7 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W } /* enumerate device by GUID */ - if (index < 0 && IsEqualGUID( &filter->guidProduct, &instance.guidProduct )) break; - if (index < 0 && IsEqualGUID( &filter->guidInstance, &instance.guidInstance )) break; + if (IsEqualGUID( guid, &instance.guidProduct ) || IsEqualGUID( guid, &instance.guidInstance )) break; /* enumerate all devices */ if (index >= 0 && !index--) break; @@ -1653,13 +1651,14 @@ HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *in HIDD_ATTRIBUTES attrs = {.Size = sizeof(attrs)}; PHIDP_PREPARSED_DATA preparsed; WCHAR device_path[MAX_PATH]; + GUID guid = GUID_NULL; HIDP_CAPS caps; HANDLE device; HRESULT hr; TRACE( "type %#lx, flags %#lx, instance %p, version %#lx, index %d\n", type, flags, instance, version, index ); - hr = hid_joystick_device_open( index, instance, device_path, &device, &preparsed, + hr = hid_joystick_device_open( index, &guid, instance, device_path, &device, &preparsed, &attrs, &caps, version ); if (hr != DI_OK) return hr; @@ -2035,19 +2034,6 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); *out = NULL; - instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; - instance.guidInstance.Data1 = hid_joystick_guid.Data1; - if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) - instance.guidProduct = *guid; - else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) - instance.guidInstance = *guid; - else - { - instance.guidInstance.Data1 = device_path_guid.Data1; - instance.guidInstance.Data2 = device_path_guid.Data2; - instance.guidInstance.Data3 = device_path_guid.Data3; - if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) return DIERR_DEVICENOTREG; - } if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; dinput_device_init( &impl->base, &hid_joystick_vtbl, guid, dinput ); @@ -2056,8 +2042,8 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi impl->base.read_event = CreateEventW( NULL, TRUE, FALSE, NULL ); impl->internal_ref = 1; - if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) - hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, + if (memcmp( device_path_guid.Data4, guid->Data4, sizeof(device_path_guid.Data4) )) + hr = hid_joystick_device_open( -1, guid, &instance, impl->device_path, &impl->device, &impl->preparsed, &attrs, &impl->caps, dinput->dwVersion ); else { -- 2.35.1

1 1

[v2 PATCH 1/2] vbscript: Implement DateSerial().
by Nikolay Sivov 17 May '22

17 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 31 ++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 30 ++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ab06db87624..7503f2864ab 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2044,10 +2044,35 @@ static HRESULT Global_TimeValue(BuiltinDisp *This, VARIANT *arg, unsigned args_c return E_NOTIMPL; } -static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int year, month, day; + UDATE ud = { 0 }; + HRESULT hres; + double date; + + TRACE("\n"); + + assert(args_cnt == 3); + + hres = to_int(args, &year); + if (SUCCEEDED(hres)) + hres = to_int(args + 1, &month); + if (SUCCEEDED(hres)) + hres = to_int(args + 2, &day); + + if (SUCCEEDED(hres)) + { + ud.st.wYear = year; + ud.st.wMonth = month; + ud.st.wDay = day; + hres = VarDateFromUdateEx(&ud, 0, 0, &date); + } + + if (SUCCEEDED(hres)) + hres = return_date(res, date); + + return hres; } static HRESULT Global_TimeSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 20798a0aacd..3bc64d74193 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1958,4 +1958,34 @@ sub testErrRaise() end sub call testErrRaise() +sub testDateSerial(yy, mm, dd, yyexp, mmexp, ddexp) + dim x + x = DateSerial(yy, mm, dd) + call ok(Year(x) = yyexp, "year = " & Year(x) & " expected " & yyexp) + call ok(Month(x) = mmexp, "month = " & Month(x) & " expected " & mmexp) + call ok(Day(x) = ddexp, "day = " & Day(x) & " expected " & ddexp) + call ok(Hour(x) = 0, "hour = " & Hour(x)) + call ok(Minute(x) = 0, "minute = " & Minute(x)) + call ok(Second(x) = 0, "second = " & Second(x)) + call ok(getVT(x) = "VT_DATE*", "getVT = " & getVT(x)) +end sub + +sub testDateSerialError() + on error resume next + call Err.clear() + call DateSerial(10000, 1, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call DateSerial(-10000, 1, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) +end sub + +call testDateSerial(100, 2, 1, 100, 2, 1) +call testDateSerial(0, 2, 1, 2000, 2, 1) +call testDateSerial(50, 2, 1, 1950, 2, 1) +call testDateSerial(99, 2, 1, 1999, 2, 1) +call testDateSerial(2000, 14, 2, 2001, 2, 2) +call testDateSerial(9999, 12, 1, 9999, 12, 1) +call testDateSerialError() + Call reportSuccess() -- 2.35.1

2 4

[PATCH 0/9] MR77: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 17 May '22

17 May '22

Avoid using advapi32. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/77

3 10

[PATCH 0/5] MR80: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 17 May '22

17 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/80

2 5

[PATCH] maintainers: Add myself to some sections.
by Zhiyi Zhang 17 May '22

17 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b012f3c4e09..f532c2eb570 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -50,6 +50,7 @@ F: dlls/xaudio*/ Common Controls Library P: Nikolay Sivov <nsivov(a)codeweavers.com> +P: Zhiyi Zhang <zzhang(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog @@ -278,6 +279,11 @@ P: Huw Davies <huw(a)codeweavers.com> P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 +Theming +M: Zhiyi Zhang <zzhang(a)codeweavers.com> +F: dlls/light.msstyles/ +F: dlls/uxtheme/ + TWAIN P: Esme Povirk <esme(a)codeweavers.com> F: dlls/twain_32/ @@ -363,6 +369,7 @@ F: dlls/wpcap/ X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> P: Rémi Bernon <rbernon(a)codeweavers.com> +P: Zhiyi Zhang <zzhang(a)codeweavers.com> F: dlls/winex11.drv/ XML parsing -- 2.34.1

1 0

[PATCH 1/2] dinput: Combine GUID checks into a single if/else block in hid_joystick_create_device().
by Zebediah Figura 17 May '22

17 May '22

I find this clearer, especially with respect to how device_path_guid is handled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5fdc563054b..e54d50f8bfa 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2035,19 +2035,6 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); *out = NULL; - instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; - instance.guidInstance.Data1 = hid_joystick_guid.Data1; - if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) - instance.guidProduct = *guid; - else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) - instance.guidInstance = *guid; - else - { - instance.guidInstance.Data1 = device_path_guid.Data1; - instance.guidInstance.Data2 = device_path_guid.Data2; - instance.guidInstance.Data3 = device_path_guid.Data3; - if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) return DIERR_DEVICENOTREG; - } if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; dinput_device_init( &impl->base, &hid_joystick_vtbl, guid, dinput ); @@ -2056,15 +2043,31 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi impl->base.read_event = CreateEventW( NULL, TRUE, FALSE, NULL ); impl->internal_ref = 1; - if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) + instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; + instance.guidInstance.Data1 = hid_joystick_guid.Data1; + if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) + { + instance.guidProduct = *guid; hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, &attrs, &impl->caps, dinput->dwVersion ); - else + } + else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) + { + instance.guidInstance = *guid; + hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, + &attrs, &impl->caps, dinput->dwVersion ); + } + else if (!memcmp( &device_path_guid.Data4, instance.guidInstance.Data4, sizeof(device_path_guid.Data4) )) { wcscpy( impl->device_path, *(const WCHAR **)guid ); hr = hid_joystick_device_try_open( 0, impl->device_path, &impl->device, &impl->preparsed, &attrs, &impl->caps, &instance, dinput->dwVersion ); } + else + { + hr = DIERR_DEVICENOTREG; + } + if (hr != DI_OK) goto failed; impl->base.instance = instance; -- 2.35.1

1 1

[PATCH 0/2] MR76: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Brendan Shanks (＠bshanks) 16 May '22

16 May '22

- signal_alloc_thread() and signal_free_thread() mostly match signal_i386.c, but with the difference that first thread’s FS needs to be allocated in signal_init_process(). signal_alloc_thread() is called too early before the Wow TEB is allocated. - The LDT code is copied from signal_i386.c. Would it be worthwhile to move that into a common file? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/76

2 2

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

16 May '22

Not just for interpreted functions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 33 +++++++++++++++++++++++---------- dlls/jscript/tests/api.js | 2 ++ dlls/jscript/tests/lang.js | 3 +++ dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 73b9d86..7dce4fe 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -314,9 +314,13 @@ static HRESULT exprval_propget(script_ctx_t *ctx, exprval_t *ref, jsval_t *r) static HRESULT exprval_call(script_ctx_t *ctx, exprval_t *ref, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + jsdisp_t *jsdisp; + HRESULT hres; + jsval_t v; + switch(ref->type) { case EXPRVAL_STACK_REF: { - jsval_t v = ctx->stack[ref->u.off]; + v = ctx->stack[ref->u.off]; if(!is_object_instance(v)) { FIXME("invoke %s\n", debugstr_jsval(v)); @@ -326,10 +330,24 @@ static HRESULT exprval_call(script_ctx_t *ctx, exprval_t *ref, WORD flags, unsig return disp_call_value(ctx, get_object(v), NULL, flags, argc, argv, r); } case EXPRVAL_IDREF: + /* ECMA-262 3rd Edition 11.2.3.7 / ECMA-262 5.1 Edition 11.2.3.6 * + * Don't treat scope object props as PropertyReferences. */ + if((jsdisp = to_jsdisp(ref->u.idref.disp)) && jsdisp->builtin_info->class == JSCLASS_NONE) { + hres = disp_propget(ctx, ref->u.idref.disp, ref->u.idref.id, &v); + if(FAILED(hres)) + return hres; + if(!is_object_instance(v)) { + FIXME("invoke %s\n", debugstr_jsval(v)); + hres = E_FAIL; + }else { + hres = disp_call_value(ctx, get_object(v), NULL, flags, argc, argv, r); + } + jsval_release(v); + return hres; + } return disp_call(ctx, ref->u.idref.disp, ref->u.idref.id, flags, argc, argv, r); case EXPRVAL_JSVAL: { IDispatch *obj; - HRESULT hres; hres = to_object(ctx, ref->u.val, &obj); if(SUCCEEDED(hres)) { @@ -3300,16 +3318,11 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } } - /* ECMA-262 3rd Edition 11.2.3.7 */ 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/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 0f9df4c..1916199 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1791,6 +1791,26 @@ sync_test("let scope instances", function() { ok(f() == 2, "f() = " + f()); }); +sync_test("substituted 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(); }); })())(); + todo_wine. + ok(r === "[object Undefined]", "detached scope Object.toString returned " + r); + + var r = (function() { this.f = Object.prototype.toString; return this.f(); })(); + todo_wine. + ok(r === "[object Window]", "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

3 5

Re: [PATCH v3 0/7] MR68: rsaenh RC2 bigger keys weirdness support and MAC hashes fixes. - approved
by Alexandre Julliard (＠julliard) 16 May '22

16 May '22

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

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
71
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-devel May 2022