June 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : jscript: Don't execute any functions if script state does not allow it.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 469219dcf7d7455b680ff2a6d799794c52956bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=469219dcf7d7455b680ff2a6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 2 20:00:45 2022 +0300 jscript: Don't execute any functions if script state does not allow it. Instead of only interpreted functions. Property retrievals or setters are allowed though, as long as they are not accessors. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 ++ dlls/jscript/function.c | 10 ++--- dlls/jscript/tests/run.c | 111 +++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 111 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index df829b76c4d..298f7e1af89 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1971,6 +1971,9 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig return JS_E_FUNCTION_EXPECTED; } + if(jsfunc->ctx->state == SCRIPTSTATE_UNINITIALIZED || jsfunc->ctx->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsfunc->builtin_info->call(jsfunc->ctx, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 18465e53a86..984eebf4270 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -257,6 +257,11 @@ 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); + if(function->dispex.ctx->state == SCRIPTSTATE_UNINITIALIZED || function->dispex.ctx->state == SCRIPTSTATE_CLOSED) { + WARN("Script engine state does not allow running code.\n"); + return E_UNEXPECTED; + } + if(jsthis) vthis = jsval_disp(jsthis); else @@ -725,11 +730,6 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun TRACE("%p\n", function); - if(ctx->state == SCRIPTSTATE_UNINITIALIZED || ctx->state == SCRIPTSTATE_CLOSED) { - WARN("Script engine state does not allow running code.\n"); - return E_UNEXPECTED; - } - if(flags & DISPATCH_CONSTRUCT) { hres = create_object(ctx, &function->function.dispex, &new_obj); if(FAILED(hres)) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 94dc2e1f440..f7ad1feb408 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2914,13 +2914,20 @@ static void test_default_value(void) V_VT(&v) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); - ok(hres == S_OK || broken(hres == 0x8000ffff), "Invoke failed: %08lx\n", hres); - if(hres == S_OK) - { - ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); - } + ok(hres == E_UNEXPECTED, "Invoke failed: %08lx\n", hres); + + hres = parse_script_expr(L"new Date()", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); IDispatch_Release(disp); + close_script(script); hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr.valueOf = function() {return 42;}; arr", &v, &script); ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); @@ -3149,15 +3156,15 @@ static void test_script_exprs(void) static void test_invokeex(void) { - DISPID func_id, prop_id; - DISPPARAMS dp = {NULL}; + DISPPARAMS dp = {NULL}, dp_max = {NULL}; + DISPID func_id, max_id, prop_id; IActiveScript *script; IDispatchEx *dispex; VARIANT v, arg; BSTR str; HRESULT hres; - hres = parse_script_expr(L"var o = {func: function() {return 3;}, prop: 6}; o", &v, &script); + hres = parse_script_expr(L"var o = {func: function() {return 3;}, max: Math.max, prop: 6}; o", &v, &script); ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); @@ -3170,16 +3177,31 @@ static void test_invokeex(void) SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + str = SysAllocString(L"max"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &max_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + str = SysAllocString(L"prop"); hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + dp_max.rgvarg = &arg; + dp_max.cArgs = 1; + V_VT(&arg) = VT_I4; + V_I4(&arg) = 42; + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); ok(V_I4(&v) == 3, "V_I4(v) = %ld\n", V_I4(&v)); + hres = IDispatchEx_InvokeEx(dispex, max_id, 0, DISPATCH_METHOD, &dp_max, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %ld\n", V_I4(&v)); + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); @@ -3193,9 +3215,23 @@ static void test_invokeex(void) SysFreeString(str); ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); ok(hres == E_UNEXPECTED || broken(hres == 0x800a1393), "InvokeEx failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(dispex, max_id, 0, DISPATCH_METHOD, &dp_max, &v, NULL, NULL); + ok(hres == E_UNEXPECTED || broken(hres == 0x800a1393), "InvokeEx failed: %08lx\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %ld\n", V_I4(&v)); + + IActiveScript_Close(script); + + V_VT(&v) = VT_EMPTY; hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); @@ -3204,6 +3240,65 @@ static void test_invokeex(void) IDispatchEx_Release(dispex); IActiveScript_Release(script); + hres = parse_script_expr(L"Math.max", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); + VariantClear(&v); + + str = SysAllocString(L"call"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08lx\n", hres); + + str = SysAllocString(L"call"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + + str = SysAllocString(L"length"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 2, "V_I4(v) = %ld\n", V_I4(&v)); + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); + + hres = parse_script_expr(L"Math.max", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); + VariantClear(&v); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08lx\n", hres); + + str = SysAllocString(L"call"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + todo_wine + ok(hres == E_UNEXPECTED, "GetDispID failed: %08lx\n", hres); + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); + /* test InvokeEx following prototype chain of builtin object (PROP_PROTREF) */ hres = parse_script_expr(L"o = new Array(); o.push(\"foo\"); o", &v, &script); ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);

1 0

Gabriel Ivăncescu : jscript: Forward actual error in to_primitive if it's not just missing prop.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: c35e5274edcbd70df5a96057d1de35d06264f4f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c35e5274edcbd70df5a96057… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 2 20:00:46 2022 +0300 jscript: Forward actual error in to_primitive if it's not just missing prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3251abfddbf..96e42625dc6 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -422,6 +422,9 @@ HRESULT to_primitive(script_ctx_t *ctx, jsval_t val, jsval_t *ret, hint_t hint) }else { IDispatch_Release(get_object(prim)); } + }else if(hres != DISP_E_UNKNOWNNAME) { + jsdisp_release(jsdisp); + return hres; } hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? L"valueOf" : L"toString", 0, &id); @@ -438,6 +441,9 @@ HRESULT to_primitive(script_ctx_t *ctx, jsval_t val, jsval_t *ret, hint_t hint) }else { IDispatch_Release(get_object(prim)); } + }else if(hres != DISP_E_UNKNOWNNAME) { + jsdisp_release(jsdisp); + return hres; } jsdisp_release(jsdisp);

1 0

Gabriel Ivăncescu : jscript: Release all globals when the script is uninitialized.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 79e51d6bc50bc1d519c275944f5b87ccc503c216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e51d6bc50bc1d519c27594… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 2 20:00:47 2022 +0300 jscript: Release all globals when the script is uninitialized. Most of these globals were leaking before as they were never freed at all. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 31 ++++++++++++------------------ dlls/jscript/jscript.h | 50 +++++++++++++++++++++++++++--------------------- dlls/jscript/tests/run.c | 1 - 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index d6028e69888..8a54f32f234 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -91,6 +91,17 @@ void script_release(script_ctx_t *ctx) heap_free(ctx); } +static void script_globals_release(script_ctx_t *ctx) +{ + unsigned i; + for(i = 0; i < ARRAY_SIZE(ctx->global_objects); i++) { + if(ctx->global_objects[i]) { + jsdisp_release(ctx->global_objects[i]); + ctx->global_objects[i] = NULL; + } + } +} + static void change_state(JScript *This, SCRIPTSTATE state) { if(This->ctx->state == state) @@ -483,25 +494,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->site = NULL; } - if(This->ctx->map_prototype) { - jsdisp_release(This->ctx->map_prototype); - This->ctx->map_prototype = NULL; - } - - if(This->ctx->set_prototype) { - jsdisp_release(This->ctx->set_prototype); - This->ctx->set_prototype = NULL; - } - - if(This->ctx->object_prototype) { - jsdisp_release(This->ctx->object_prototype); - This->ctx->object_prototype = NULL; - } - - if(This->ctx->global) { - jsdisp_release(This->ctx->global); - This->ctx->global = NULL; - } + script_globals_release(This->ctx); /* FALLTHROUGH */ case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 000bcc287f4..0f8baea0188 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -387,29 +387,35 @@ struct _script_ctx_t { DWORD last_match_index; DWORD last_match_length; - jsdisp_t *global; - jsdisp_t *function_constr; - jsdisp_t *array_constr; - jsdisp_t *bool_constr; - jsdisp_t *date_constr; - jsdisp_t *enumerator_constr; - jsdisp_t *error_constr; - jsdisp_t *eval_error_constr; - jsdisp_t *range_error_constr; - jsdisp_t *reference_error_constr; - jsdisp_t *regexp_error_constr; - jsdisp_t *syntax_error_constr; - jsdisp_t *type_error_constr; - jsdisp_t *uri_error_constr; - jsdisp_t *number_constr; - jsdisp_t *object_constr; - jsdisp_t *object_prototype; - jsdisp_t *regexp_constr; - jsdisp_t *string_constr; - jsdisp_t *vbarray_constr; - jsdisp_t *map_prototype; - jsdisp_t *set_prototype; + union { + struct { + jsdisp_t *global; + jsdisp_t *function_constr; + jsdisp_t *array_constr; + jsdisp_t *bool_constr; + jsdisp_t *date_constr; + jsdisp_t *enumerator_constr; + jsdisp_t *error_constr; + jsdisp_t *eval_error_constr; + jsdisp_t *range_error_constr; + jsdisp_t *reference_error_constr; + jsdisp_t *regexp_error_constr; + jsdisp_t *syntax_error_constr; + jsdisp_t *type_error_constr; + jsdisp_t *uri_error_constr; + jsdisp_t *number_constr; + jsdisp_t *object_constr; + jsdisp_t *object_prototype; + jsdisp_t *regexp_constr; + jsdisp_t *string_constr; + jsdisp_t *vbarray_constr; + jsdisp_t *map_prototype; + jsdisp_t *set_prototype; + }; + jsdisp_t *global_objects[22]; + }; }; +C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, set_prototype) == RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, global_objects)); void script_release(script_ctx_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index f7ad1feb408..ec054f03d0d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -3293,7 +3293,6 @@ static void test_invokeex(void) str = SysAllocString(L"call"); hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); SysFreeString(str); - todo_wine ok(hres == E_UNEXPECTED, "GetDispID failed: %08lx\n", hres); IDispatchEx_Release(dispex);

1 0

Gabriel Ivăncescu : jscript: Don't allow construction on builtin methods.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 738e306bf72fface4a813f2a990e7d6eed310373 URL: https://source.winehq.org/git/wine.git/?a=commit;h=738e306bf72fface4a813f2a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 2 20:00:48 2022 +0300 jscript: Don't allow construction on builtin methods. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 2 ++ dlls/jscript/tests/api.js | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 984eebf4270..bf152e22868 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -619,6 +619,8 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, js { NativeFunction *function = (NativeFunction*)func; + if((flags & DISPATCH_CONSTRUCT) && !(function->function.flags & PROPF_CONSTR)) + return JS_E_INVALID_ACTION; return function->proc(ctx, vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1368f399b50..123665cfdde 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2622,6 +2622,7 @@ testException(function() {"test" in nullDisp;}, "E_OBJECT_EXPECTED"); testException(function() {new 3;}, "E_UNSUPPORTED_ACTION"); testException(function() {new null;}, "E_OBJECT_EXPECTED"); testException(function() {new nullDisp;}, "E_NO_PROPERTY"); +testException(function() {new Math.max(5);}, "E_UNSUPPORTED_ACTION"); testException(function() {new VBArray();}, "E_NOT_VBARRAY"); testException(function() {new VBArray(new VBArray(createArray()));}, "E_NOT_VBARRAY"); testException(function() {VBArray.prototype.lbound.call(new Object());}, "E_NOT_VBARRAY");

1 0

Alexandre Julliard : Release 7.10.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 631f4d5e42b7c2f705eb4b40eeea0ce1866bf513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=631f4d5e42b7c2f705eb4b40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 22:51:22 2022 +0200 Release 7.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 948 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 523 insertions(+), 448 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=631f4d5e42b7c2f705eb…

1 0

Tag wine-7.10 : Alexandre Julliard : Release 7.10
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: refs/tags/wine-7.10 Tag: c08570ebe2bbf1fe6bb64a9fabcb835ad4570472 URL: https://source.winehq.org/git/wine.git/?a=tag;h=c08570ebe2bbf1fe6bb64a9fabc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 22:51:22 2022 +0200 Release 7.10

1 0

Jacek Caban : winemac: Move driver implementation to unixlib.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: f1549e7f6c6ae9898ce6093a0888ffa2c549bfbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1549e7f6c6ae9898ce6093a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 00:25:16 2022 +0200 winemac: Move driver implementation to unixlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 3 ++- dlls/winemac.drv/clipboard.c | 4 ++++ dlls/winemac.drv/display.c | 6 +++++- dlls/winemac.drv/dllmain.c | 10 +++++++++- dlls/winemac.drv/event.c | 12 ++++++++---- dlls/winemac.drv/gdi.c | 4 ++++ dlls/winemac.drv/image.c | 4 ++++ dlls/winemac.drv/keyboard.c | 4 ++++ dlls/winemac.drv/macdrv.h | 9 ++------- dlls/winemac.drv/macdrv_main.c | 30 +++++++++++++++++++++--------- dlls/winemac.drv/mouse.c | 4 ++++ dlls/winemac.drv/opengl.c | 4 ++++ dlls/winemac.drv/surface.c | 4 ++++ dlls/winemac.drv/systray.c | 4 ++++ dlls/winemac.drv/unixlib.h | 6 ++++-- dlls/winemac.drv/vulkan.c | 4 ++++ dlls/winemac.drv/window.c | 4 ++++ tools/makedep.c | 2 ++ 18 files changed, 93 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1549e7f6c6ae9898ce6…

1 0

Jacek Caban : winemac: Build with msvcrt.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: daddd9b3d41c6be9e294ee83d1722400642e05cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=daddd9b3d41c6be9e294ee83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 1 01:29:17 2022 +0200 winemac: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 2 -- dlls/winemac.drv/dllmain.c | 5 ++--- dlls/winemac.drv/dragdrop.c | 5 ++--- dlls/winemac.drv/ime.c | 8 ++------ dlls/winemac.drv/macdrv.h | 12 ------------ dlls/winemac.drv/macdrv_dll.h | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index e3d3180b2d1..19f3e834cec 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = uuid rpcrt4 user32 gdi32 win32u DELAYIMPORTS = ole32 shell32 imm32 EXTRALIBS = -lwin32u -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo -framework QuartzCore $(METAL_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ clipboard.c \ display.c \ diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 2ffbc12083d..0618ec83228 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> -#include "macdrv.h" +#include "macdrv_dll.h" +#include "macdrv_res.h" #include "shellapi.h" #include "wine/debug.h" diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index aec8b1f4790..afd4fb0a6d2 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -20,18 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS -#include "macdrv.h" +#include "macdrv_dll.h" #define COBJMACROS #include "objidl.h" #include "shellapi.h" #include "shlobj.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dragdrop); diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 756e880c5a3..fd94591a2b8 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -34,14 +34,10 @@ * here the IMM level deals with if the application is IME aware or not. */ -#include "config.h" - -#include <stdarg.h> - -#include "macdrv.h" -#include "winuser.h" +#include "macdrv_dll.h" #include "imm.h" #include "ddk/imm.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 735cfc84d87..7c0f7127883 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -41,7 +41,6 @@ extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; extern BOOL allow_software_rendering DECLSPEC_HIDDEN; extern BOOL disable_window_decorations DECLSPEC_HIDDEN; -extern HMODULE macdrv_module DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN, BOOLEAN,const LARGE_INTEGER*) DECLSPEC_HIDDEN; @@ -276,13 +275,6 @@ extern void check_retina_status(void) DECLSPEC_HIDDEN; extern void macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN; extern void init_user_driver(void) DECLSPEC_HIDDEN; -/************************************************************************** - * Mac IME driver - */ - -extern NTSTATUS WINAPI macdrv_ime_set_text(void *params, ULONG size) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECLSPEC_HIDDEN; - /* unixlib interface */ extern NTSTATUS macdrv_dnd_get_data(void *arg) DECLSPEC_HIDDEN; @@ -296,10 +288,6 @@ extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, ULONG size) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) DECLSPEC_HIDDEN; - /* user helpers */ static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) diff --git a/dlls/winemac.drv/macdrv_dll.h b/dlls/winemac.drv/macdrv_dll.h new file mode 100644 index 00000000000..3a11528eabc --- /dev/null +++ b/dlls/winemac.drv/macdrv_dll.h @@ -0,0 +1,39 @@ +/* + * MAC driver definitions + * + * Copyright 2022 Jacek Caban for CodeWeavers + * + * 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 + */ + +#ifndef __WINE_MACDRV_DLL_H +#define __WINE_MACDRV_DLL_H + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "ntgdi.h" +#include "unixlib.h" + +extern NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) DECLSPEC_HIDDEN; + +extern NTSTATUS WINAPI macdrv_ime_set_text(void *params, ULONG size) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECLSPEC_HIDDEN; + +extern HMODULE macdrv_module DECLSPEC_HIDDEN; + +#endif /* __WINE_MACDRV_DLL_H */

1 0

Jacek Caban : winemac: Don't use unicode.h.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: c4dd394aa428831b3896916dc4147726bc076f93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4dd394aa428831b3896916d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 00:18:24 2022 +0200 winemac: Don't use unicode.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 9 ++++----- dlls/winemac.drv/display.c | 1 - dlls/winemac.drv/keyboard.c | 7 +++---- dlls/winemac.drv/macdrv_main.c | 3 --- dlls/winemac.drv/mouse.c | 13 +++++-------- dlls/winemac.drv/window.c | 6 ++---- 6 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 0f7bace1050..af8d99b59a3 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -36,7 +36,6 @@ #include "shlobj.h" #include "wine/list.h" #include "wine/server.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(clipboard); @@ -766,7 +765,7 @@ static void *import_nsfilenames_to_hdrop(CFDataRef data, size_t *ret_size) len = 1; /* for the terminating null */ for (i = 0; i < count; i++) - len += strlenW(paths[i]) + 1; + len += wcslen(paths[i]) + 1; *ret_size = sizeof(*dropfiles) + len * sizeof(WCHAR); if (!(dropfiles = malloc(*ret_size))) @@ -784,8 +783,8 @@ static void *import_nsfilenames_to_hdrop(CFDataRef data, size_t *ret_size) p = (WCHAR*)(dropfiles + 1); for (i = 0; i < count; i++) { - strcpyW(p, paths[i]); - p += strlenW(p) + 1; + wcscpy(p, paths[i]); + p += wcslen(p) + 1; } *p = 0; @@ -994,7 +993,7 @@ static CFDataRef export_hdrop_to_filenames(void *data, size_t size) } if (dropfiles->fWide) - p = (WCHAR*)p + strlenW(p) + 1; + p = (WCHAR*)p + wcslen(p) + 1; else p = (char*)p + strlen(p) + 1; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2e126b384d1..19b9a9cdd9d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -31,7 +31,6 @@ #include "ddrawi.h" #define WIN32_NO_STATUS #include "winternl.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(display); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 102f945e79c..824addad78b 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -32,7 +32,6 @@ #include "macdrv.h" #include "winuser.h" -#include "wine/unicode.h" #include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); @@ -403,7 +402,7 @@ static BOOL char_matches_string(WCHAR wchar, UniChar *string, BOOL ignore_diacri { BOOL ret; CFStringRef s1 = CFStringCreateWithCharactersNoCopy(NULL, (UniChar*)&wchar, 1, kCFAllocatorNull); - CFStringRef s2 = CFStringCreateWithCharactersNoCopy(NULL, string, strlenW(string), kCFAllocatorNull); + CFStringRef s2 = CFStringCreateWithCharactersNoCopy(NULL, string, wcslen(string), kCFAllocatorNull); CFStringCompareFlags flags = kCFCompareCaseInsensitive | kCFCompareNonliteral | kCFCompareWidthInsensitive; if (ignore_diacritics) flags |= kCFCompareDiacriticInsensitive; @@ -1366,7 +1365,7 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) if (status == noErr && deadKeyState) { lstrcpynW(buffer + len, dead, size - len); - len = strlenW(buffer); + len = wcslen(buffer); } TRACE("lparam 0x%08x -> %s\n", lparam, debugstr_w(buffer)); @@ -1526,7 +1525,7 @@ UINT macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) } if (status == noErr && len) - ret = toupperW(s[0]) | (deadKey ? 0x80000000 : 0); + ret = RtlUpcaseUnicodeChar(s[0]) | (deadKey ? 0x80000000 : 0); break; } diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 6ed0fdb7730..e1fd7b2d331 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -32,10 +32,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "macdrv.h" -#include "winuser.h" -#include "winreg.h" #include "wine/server.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(macdrv); diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index fcdd1d1be1a..3f79dda2073 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -28,10 +28,7 @@ #define OEMRESOURCE #include "macdrv.h" -#include "winuser.h" -#include "winreg.h" #include "wine/server.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); @@ -182,11 +179,11 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) if (!info->szModName[0]) return NULL; - p = strrchrW(info->szModName, '\\'); - strcpyW(name, p ? p + 1 : info->szModName); - p = name + strlenW(name); + p = wcsrchr(info->szModName, '\\'); + wcscpy(name, p ? p + 1 : info->szModName); + p = name + wcslen(name); *p++ = ','; - if (info->szResName[0]) strcpyW(p, info->szResName); + if (info->szResName[0]) wcscpy(p, info->szResName); else { char buf[16]; @@ -212,7 +209,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) return NULL; /* force standard cursor */ } - cursor_name = CFStringCreateWithCharacters(NULL, value, strlenW(value)); + cursor_name = CFStringCreateWithCharacters(NULL, value, wcslen(value)); if (!cursor_name) { WARN("CFStringCreateWithCharacters failed for %s\n", debugstr_w(value)); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index f533f1d6310..9d778f427b0 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -35,8 +35,6 @@ #undef LoadResource #include "macdrv.h" -#include "winuser.h" -#include "wine/unicode.h" #include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(macdrv); @@ -715,7 +713,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) /* set the window text */ if (!NtUserInternalGetWindowText(data->hwnd, text, ARRAY_SIZE(text))) text[0] = 0; - macdrv_set_cocoa_window_title(data->cocoa_window, text, strlenW(text)); + macdrv_set_cocoa_window_title(data->cocoa_window, text, wcslen(text)); /* set the window region */ if (win_rgn || IsRectEmpty(&data->window_rect)) sync_window_region(data, win_rgn); @@ -1773,7 +1771,7 @@ void macdrv_SetWindowText(HWND hwnd, LPCWSTR text) TRACE("%p, %s\n", hwnd, debugstr_w(text)); if ((win = macdrv_get_cocoa_window(hwnd, FALSE))) - macdrv_set_cocoa_window_title(win, text, strlenW(text)); + macdrv_set_cocoa_window_title(win, text, wcslen(text)); }

1 0

Alexandre Julliard : kernelbase: Initialize all the compression tables the first time.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: d1580fd209e1de120e673c5b838f4f2d1f68d6d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1580fd209e1de120e673c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 12:50:41 2022 +0200 kernelbase: Initialize all the compression tables the first time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53094 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 33f24863740..ac4dc188345 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3328,7 +3328,7 @@ static int get_compression_weights( UINT compression, const WCHAR *compr_tables[ if (!compr_tables[0]) { compr_tables[0] = sort.compr_data + compr->offset; - for (i = 1; i <= maxlen - 2; i++) + for (i = 1; i < 8; i++) compr_tables[i] = compr_tables[i - 1] + compr->len[i - 1] * compression_size( i + 1 ); } for (i = maxlen - 2; i >= 0; i--)

1 0