February 2019 - Wine-commits

Zebediah Figura : xinput: Fix axis scaling arithmetic.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 7fd8ae1e4f0f44f58745119d35ac3c1fd231780b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fd8ae1e4f0f44f58745119d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 00:06:07 2019 -0600 xinput: Fix axis scaling arithmetic. Cast difference to ULONGLONG to ensure unsigned division, and correct off-by-one error present when inverting axes (previously hidden by signed division bug). Fixes a regression introduced by bd9e130ee5b569433f2c847c5b2b562f0ae35ac5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46623 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 7553aab..c0c405f 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -318,8 +318,15 @@ void HID_destroy_gamepads(xinput_controller *devices) LeaveCriticalSection(&hid_xinput_crit); } -#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(v - (r).min))/(r).range)-32767) -#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(v - (r).min))/(r).range)) +static SHORT scale_short(LONG value, const struct axis_info *axis) +{ + return ((((ULONGLONG)(value - axis->min)) * 0xffff) / axis->range) - 32768; +} + +static BYTE scale_byte(LONG value, const struct axis_info *axis) +{ + return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; +} void HID_update_state(xinput_controller* device) { @@ -382,22 +389,22 @@ void HID_update_state(xinput_controller* device) } HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLX = SCALE_SHORT(value, private->lx); + device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLY = -SCALE_SHORT(value, private->ly); + device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRX = SCALE_SHORT(value, private->rx); + device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRY = -SCALE_SHORT(value, private->ry); + device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bRightTrigger = SCALE_BYTE(value, private->rtrigger); + device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->ltrigger); + device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); LeaveCriticalSection(&private->crit); }

1 0

Alexandre Julliard : Release 4.2.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 06531b1d9898ba3ac3b7c69d6192682202606f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06531b1d9898ba3ac3b7c69d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:34:44 2019 +0100 Release 4.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 794 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 409 insertions(+), 406 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06531b1d9898ba3ac3b7…

1 0

Tag wine-4.2 : Alexandre Julliard : Release 4.2
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: refs/tags/wine-4.2 Tag: 8b8bac42edaab7e7ed32b2c21a9e416514bf8d6f URL: https://source.winehq.org/git/wine.git/?a=tag;h=8b8bac42edaab7e7ed32b2c21a9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:34:44 2019 +0100 Release 4.2

1 0

Nikolay Sivov : msvcrt: Add _ismbcl2().
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: cebb94702761914ee169b3c421f3d744d09ae567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cebb94702761914ee169b3c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 15 12:24:57 2019 +0100 msvcrt: Add _ismbcl2(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index eefa573..aa817bf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -990,7 +990,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a6ed5c1..1b85830 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1336,7 +1336,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 441c0be..769ee50 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1341,7 +1341,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 629dce9..1a68a65 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -383,7 +383,7 @@ @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) @ cdecl _ismbcl1(long) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f0009be..f4c0e6d 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -378,7 +378,7 @@ @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) @ cdecl _ismbcl1(long) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 43c3e46..8295a71 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -662,7 +662,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a9bf0a2..9e97770 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -640,7 +640,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ca6dca3..9b22adc 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2629,3 +2629,11 @@ int CDECL _ismbcl2_l(unsigned int c, MSVCRT__locale_t locale) return 0; } + +/********************************************************************* + * _ismbcl2 (MSVCRT.@) + */ +int CDECL _ismbcl2(unsigned int c) +{ + return _ismbcl2_l(c, NULL); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 42de9ce..c2c272b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -611,7 +611,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 53fbfd3..eb8e304 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3278,6 +3278,9 @@ static void test__ismbclx(void) ret = _ismbcl1(0); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0); + ok(!ret, "got %d\n", ret); + cp = _setmbcp(1252); ret = _ismbcl0(0x8140); @@ -3286,6 +3289,9 @@ static void test__ismbclx(void) ret = _ismbcl1(0x889f); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0x989f); + ok(!ret, "got %d\n", ret); + _setmbcp(932); ret = _ismbcl0(0); @@ -3306,6 +3312,15 @@ static void test__ismbclx(void) ret = _ismbcl1(0x88fd); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl2(0x989f); + ok(ret, "got %d\n", ret); + + ret = _ismbcl2(0x993f); + ok(!ret, "got %d\n", ret); + _setmbcp(cp); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e1315ec..eb08843 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -480,7 +480,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr)

1 0

Piotr Caban : msvcrt: Change __getmainargs signature.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 35e570eb0949742a00e691a2149a347756e139c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35e570eb0949742a00e691a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 12:25:14 2019 +0100 msvcrt: Change __getmainargs signature. It was changed in newer versions of msvcrt/msvcrXX dlls. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c781503..82ad47b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -444,7 +444,7 @@ static int build_expanded_argv(int *argc, char **argv) /********************************************************************* * __getmainargs (MSVCRT.@) */ -void CDECL __getmainargs(int *argc, char** *argv, char** *envp, +int CDECL __getmainargs(int *argc, char** *argv, char** *envp, int expand_wildcards, int *new_mode) { TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); @@ -475,6 +475,7 @@ void CDECL __getmainargs(int *argc, char** *argv, char** *envp, if (new_mode) MSVCRT__set_new_mode( *new_mode ); + return 0; } static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) @@ -542,7 +543,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) /********************************************************************* * __wgetmainargs (MSVCRT.@) */ -void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *wenvp, +int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *wenvp, int expand_wildcards, int *new_mode) { TRACE("(%p,%p,%p,%d,%p).\n", argc, wargv, wenvp, expand_wildcards, new_mode); @@ -575,6 +576,7 @@ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** * *wenvp = MSVCRT___winitenv; if (new_mode) MSVCRT__set_new_mode( *new_mode ); + return 0; } /*********************************************************************

1 0

Brendan McGrath : vbscript: Allow more keywords to be used as identifiers.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: d2937bfff2d59e3b5d41baa173e9c634b0a12a22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2937bfff2d59e3b5d41baa1… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Fri Feb 15 14:06:15 2019 +0100 vbscript: Allow more keywords to be used as identifiers. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 9 +++++---- dlls/vbscript/parser.y | 21 ++++++++++++--------- dlls/vbscript/tests/lang.vbs | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 571854d..fa467f0 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -156,7 +156,7 @@ static inline BOOL is_identifier_char(WCHAR c) return isalnumW(c) || c == '_'; } -static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) +static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lval) { const WCHAR *p1 = ctx->ptr; const WCHAR *p2 = word; @@ -174,17 +174,18 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) return 1; ctx->ptr = p1; + *lval = word; return 0; } -static int check_keywords(parser_ctx_t *ctx) +static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) { int min = 0, max = ARRAY_SIZE(keywords)-1, r, i; while(min <= max) { i = (min+max)/2; - r = check_keyword(ctx, keywords[i].word); + r = check_keyword(ctx, keywords[i].word, lval); if(!r) return keywords[i].token; @@ -412,7 +413,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return parse_numeric_literal(ctx, lval); if(isalphaW(c)) { - int ret = check_keywords(ctx); + int ret = check_keywords(ctx, lval); if(!ret) return parse_identifier(ctx, lval); if(ret != tREM) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 0201099..b81d791 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -71,8 +71,6 @@ static class_decl_t *add_dim_prop(parser_ctx_t*,class_decl_t*,dim_decl_t*,unsign static statement_t *link_statements(statement_t*,statement_t*); -static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; - #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -108,17 +106,18 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %token tTRUE tFALSE %token tNOT tAND tOR tXOR tEQV tIMP tNEQ %token tIS tLTEQ tGTEQ tMOD -%token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST +%token tCALL tDIM tSUB tFUNCTION tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP tEACH tIN +%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN %token tSELECT tCASE %token tBYREF tBYVAL -%token tOPTION tEXPLICIT +%token tOPTION %token tSTOP %token tNOTHING tEMPTY tNULL -%token tCLASS tSET tNEW tPUBLIC tPRIVATE tDEFAULT tME -%token tERROR tNEXT tON tRESUME tGOTO +%token tCLASS tSET tNEW tPUBLIC tPRIVATE tME +%token tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString +%token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP %token <lng> tLong tShort %token <dbl> tDouble @@ -443,10 +442,14 @@ ArgumentDecl | tBYREF Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, TRUE); } | tBYVAL Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, FALSE); } -/* 'property' may be both keyword and identifier, depending on context */ +/* these keywords may also be an identifier, depending on context */ Identifier : tIdentifier { $$ = $1; } - | tPROPERTY { $$ = propertyW; } + | tDEFAULT { $$ = $1; } + | tERROR { $$ = $1; } + | tEXPLICIT { $$ = $1; } + | tPROPERTY { $$ = $1; } + | tSTEP { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2af77bd..15ad84a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1345,4 +1345,24 @@ end class set x = new RegExp Call ok(x.Global = false, "x.Global = " & x.Global) +sub test_identifiers + ' test keywords that can also be a declared identifier + Dim default + default = "xx" + Call ok(default = "xx", "default = " & default & " expected ""xx""") + + Dim error + error = "xx" + Call ok(error = "xx", "error = " & error & " expected ""xx""") + + Dim explicit + explicit = "xx" + Call ok(explicit = "xx", "explicit = " & explicit & " expected ""xx""") + + Dim step + step = "xx" + Call ok(step = "xx", "step = " & step & " expected ""xx""") +end sub +call test_identifiers() + reportSuccess()

1 0

Jacek Caban : mshtml: Suport load event in HTMLXMLHttpRequest object.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: a5c79dc8a908f0bbab9ce6107f270ac332df2f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5c79dc8a908f0bbab9ce610… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 15 14:30:04 2019 +0100 mshtml: Suport load event in HTMLXMLHttpRequest object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 1 + dlls/mshtml/tests/xhr.js | 9 +++- dlls/mshtml/xmlhttprequest.c | 111 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 106 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2e13f9b..c0ddc81 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3463,6 +3463,7 @@ static void run_js_tests(void) init_protocol_handler(); + run_script_as_http_with_mode("xhr.js", NULL, "9"); run_script_as_http_with_mode("xhr.js", NULL, "11"); run_script_as_http_with_mode("elements.js", NULL, "11"); run_script_as_http_with_mode("es5.js", NULL, "11"); diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index fb198c1..8c42816 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -18,14 +18,21 @@ function test_xhr() { var xhr = new XMLHttpRequest(); + var complete_cnt = 0; xhr.onreadystatechange = function() { if(xhr.readyState != 4) return; ok(xhr.responseText === "Testing...", "unexpected responseText " + xhr.responseText); - next_test(); + if(complete_cnt++) + next_test(); } + var onload_func = xhr.onload = function() { + if(complete_cnt++) + next_test(); + }; + ok(xhr.onload === onload_func, "xhr.onload != onload_func"); xhr.open("POST", "echo.php", true); xhr.setRequestHeader("X-Test", "True"); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 5164570..e235bf9 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define MSHTML_DISPID_HTMLXMLHTTPREQUEST_ONLOAD MSHTML_DISPID_CUSTOM_MIN + static HRESULT bstr_to_nsacstr(BSTR bstr, nsACString *str) { char *cstr = heap_strdupWtoU(bstr); @@ -96,6 +98,8 @@ typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; LONG ref; HTMLXMLHttpRequest *xhr; + BOOL readystatechange_event; + BOOL load_event; } XMLHttpReqEventListener; struct HTMLXMLHttpRequest { @@ -113,15 +117,27 @@ static void detach_xhr_event_listener(XMLHttpReqEventListener *event_listener) nsAString str; nsresult nsres; + static const WCHAR loadW[] = {'l','o','a','d',0}; static const WCHAR readystatechangeW[] = {'o','n','r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; nsres = nsIXMLHttpRequest_QueryInterface(event_listener->xhr->nsxhr, &IID_nsIDOMEventTarget, (void**)&event_target); assert(nsres == NS_OK); - nsAString_InitDepend(&str, readystatechangeW); - nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); - nsAString_Finish(&str); + if(event_listener->readystatechange_event) { + nsAString_InitDepend(&str, readystatechangeW); + nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); + nsAString_Finish(&str); + assert(nsres == NS_OK); + } + + if(event_listener->load_event) { + nsAString_InitDepend(&str, loadW); + nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); + nsAString_Finish(&str); + assert(nsres == NS_OK); + } + nsIDOMEventTarget_Release(event_target); event_listener->xhr->event_listener = NULL; @@ -738,6 +754,49 @@ static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); } +static HRESULT HTMLXMLHttpRequest_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; + + /* onload event handler property is supported, but not exposed by any interface. We implement as a custom property. */ + if(!strcmpW(onloadW, name)) { + *dispid = MSHTML_DISPID_HTMLXMLHTTPREQUEST_ONLOAD; + return S_OK; + } + + return DISP_E_UNKNOWNNAME; +} + +static HRESULT HTMLXMLHttpRequest_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); + + if(id == MSHTML_DISPID_HTMLXMLHTTPREQUEST_ONLOAD) { + switch(flags) { + case DISPATCH_PROPERTYGET: + TRACE("(%p) get onload\n", This); + return get_event_handler(&This->event_target, EVENTID_LOAD, res); + + case DISPATCH_PROPERTYPUT: + if(params->cArgs != 1 || (params->cNamedArgs == 1 && *params->rgdispidNamedArgs != DISPID_PROPERTYPUT) + || params->cNamedArgs > 1) { + FIXME("invalid args\n"); + return E_INVALIDARG; + } + + TRACE("(%p)->(%p) set onload\n", This, params->rgvarg); + return set_event_handler(&This->event_target, EVENTID_LOAD, params->rgvarg); + + default: + FIXME("Unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + } + + return DISP_E_UNKNOWNNAME; +} + static nsISupports *HTMLXMLHttpRequest_get_gecko_target(DispatchEx *dispex) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); @@ -748,37 +807,61 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); nsIDOMEventTarget *nstarget; + const WCHAR *type_name; nsAString type_str; nsresult nsres; static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; + static const WCHAR loadW[] = {'l','o','a','d',0}; TRACE("(%p)\n", This); - if(eid != EVENTID_READYSTATECHANGE || This->event_listener) + switch(eid) { + case EVENTID_READYSTATECHANGE: + type_name = readystatechangeW; + break; + case EVENTID_LOAD: + type_name = loadW; + break; + default: return; + } - This->event_listener = heap_alloc(sizeof(*This->event_listener)); - if(!This->event_listener) - return; + if(!This->event_listener) { + This->event_listener = heap_alloc(sizeof(*This->event_listener)); + if(!This->event_listener) + return; - This->event_listener->nsIDOMEventListener_iface.lpVtbl = &XMLHttpReqEventListenerVtbl; - This->event_listener->ref = 1; - This->event_listener->xhr = This; + This->event_listener->nsIDOMEventListener_iface.lpVtbl = &XMLHttpReqEventListenerVtbl; + This->event_listener->ref = 1; + This->event_listener->xhr = This; + This->event_listener->readystatechange_event = FALSE; + This->event_listener->load_event = FALSE; + } nsres = nsIXMLHttpRequest_QueryInterface(This->nsxhr, &IID_nsIDOMEventTarget, (void**)&nstarget); assert(nsres == NS_OK); - nsAString_InitDepend(&type_str, readystatechangeW); + nsAString_InitDepend(&type_str, type_name); nsres = nsIDOMEventTarget_AddEventListener(nstarget, &type_str, &This->event_listener->nsIDOMEventListener_iface, FALSE, TRUE, 2); nsAString_Finish(&type_str); - nsIDOMEventTarget_Release(nstarget); if(NS_FAILED(nsres)) - ERR("AddEventListener failed: %08x\n", nsres); + ERR("AddEventListener(%s) failed: %08x\n", debugstr_w(type_name), nsres); + + nsIDOMEventTarget_Release(nstarget); + + if(eid == EVENTID_READYSTATECHANGE) + This->event_listener->readystatechange_event = TRUE; + else + This->event_listener->load_event = TRUE; } static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { - {NULL}, + { + NULL, + HTMLXMLHttpRequest_get_dispid, + HTMLXMLHttpRequest_invoke + }, HTMLXMLHttpRequest_get_gecko_target, HTMLXMLHttpRequest_bind_event };

1 0

Hans Leidekker : msi: Initialize assembly caches before disabling redirection.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: a70ece68b7fa98e55e62eaed1006ceea961666ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a70ece68b7fa98e55e62eaed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 15 10:32:30 2019 +0100 msi: Initialize assembly caches before disabling redirection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46638 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 13 ++++++------- dlls/msi/assembly.c | 5 +++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9407d36..d959605 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -995,13 +995,6 @@ UINT msi_load_all_components( MSIPACKAGE *package ) if (r != ERROR_SUCCESS) return r; - if (!msi_init_assembly_caches( package )) - { - ERR("can't initialize assembly caches\n"); - msiobj_release( &view->hdr ); - return ERROR_FUNCTION_FAILED; - } - r = MSI_IterateRecords(view, NULL, load_component, package); msiobj_release(&view->hdr); return r; @@ -8094,6 +8087,12 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) TRACE("Performing action (%s)\n", debugstr_w(action)); + if (!msi_init_assembly_caches( package )) + { + ERR("can't initialize assembly caches\n"); + return ERROR_FUNCTION_FAILED; + } + package->action_progress_increment = 0; rc = ACTION_HandleStandardAction(package, action); diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index f46ff02..cb40611 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -41,6 +41,7 @@ static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, D static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; +static BOOL assembly_caches_initialized; static BOOL init_function_pointers( void ) { @@ -91,12 +92,16 @@ static BOOL init_function_pointers( void ) BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { + if (assembly_caches_initialized) return TRUE; if (!init_function_pointers()) return FALSE; + if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); + + assembly_caches_initialized = TRUE; return TRUE; }

1 0

Hans Leidekker : msi: Link directly to sxs.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: aaead3e433239898c0747bab32a2d2dfe63e5b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaead3e433239898c0747bab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 15 10:32:31 2019 +0100 msi: Link directly to sxs. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/Makefile.in | 2 +- dlls/msi/assembly.c | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 1a17d7e..4434a3f 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,6 +1,6 @@ MODULE = msi.dll IMPORTLIB = msi -IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 +IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp mspatcha EXTRAIDLFLAGS = --prefix-server=s_ diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index cb40611..73977ee 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -35,19 +35,17 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet10)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); -static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; +static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree; static BOOL assembly_caches_initialized; static BOOL init_function_pointers( void ) { static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; static const WCHAR szMscoree[] = {'\\','m','s','c','o','r','e','e','.','d','l','l',0}; - static const WCHAR szSxs[] = {'s','x','s','.','d','l','l',0}; static const WCHAR szVersion10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; @@ -56,13 +54,6 @@ static BOOL init_function_pointers( void ) WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); - if (!hsxs && !(hsxs = LoadLibraryW( szSxs ))) return FALSE; - if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) - { - FreeLibrary( hsxs ); - hsxs = NULL; - return FALSE; - } strcpyW( path + len, szMscoree ); if (hmscoree || !(hmscoree = LoadLibraryW( path ))) return TRUE; pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ @@ -95,7 +86,7 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) if (assembly_caches_initialized) return TRUE; if (!init_function_pointers()) return FALSE; - if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; + if (CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); @@ -134,13 +125,11 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) FreeLibrary( hfusion20 ); FreeLibrary( hfusion40 ); FreeLibrary( hmscoree ); - FreeLibrary( hsxs ); hfusion10 = NULL; hfusion11 = NULL; hfusion20 = NULL; hfusion40 = NULL; hmscoree = NULL; - hsxs = NULL; } static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp )

1 0

Paul Gofman : d3dx9/tests: Clear vertex shader constants in test_effect_states().
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: cf992bebb056814a05fe3a82011c4de701c144c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf992bebb056814a05fe3a82… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Feb 13 21:03:38 2019 +0300 d3dx9/tests: Clear vertex shader constants in test_effect_states(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 83 +++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf992bebb056814a05fe…

1 0