January 2020 - Wine-Commits

Jacek Caban : vbscript: Allow assignment left expression to be member expression.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: c9941184016f3b21340a5112acb9aad2709e5196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9941184016f3b21340a5112… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 17:25:59 2020 +0100 vbscript: Allow assignment left expression to be member expression. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 28 +++++++++++++++++++++------- dlls/vbscript/parse.h | 2 +- dlls/vbscript/parser.y | 11 ++--------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e52d8b1a24..eac048daa1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -993,15 +993,27 @@ static HRESULT compile_select_statement(compile_ctx_t *ctx, select_statement_t * return S_OK; } -static HRESULT compile_assignment(compile_ctx_t *ctx, call_expression_t *left, expression_t *value_expr, BOOL is_set) +static HRESULT compile_assignment(compile_ctx_t *ctx, expression_t *left, expression_t *value_expr, BOOL is_set) { + call_expression_t *call_expr = NULL; member_expression_t *member_expr; - unsigned args_cnt; + unsigned args_cnt = 0; vbsop_t op; HRESULT hres; - assert(left->call_expr->type == EXPR_MEMBER); - member_expr = (member_expression_t*)left->call_expr; + switch(left->type) { + case EXPR_MEMBER: + member_expr = (member_expression_t*)left; + break; + case EXPR_CALL: + call_expr = (call_expression_t*)left; + assert(call_expr->call_expr->type == EXPR_MEMBER); + member_expr = (member_expression_t*)call_expr->call_expr; + break; + default: + assert(0); + return E_FAIL; + } if(member_expr->obj_expr) { hres = compile_expression(ctx, member_expr->obj_expr); @@ -1017,9 +1029,11 @@ static HRESULT compile_assignment(compile_ctx_t *ctx, call_expression_t *left, e if(FAILED(hres)) return hres; - hres = compile_args(ctx, left->args, &args_cnt); - if(FAILED(hres)) - return hres; + if(call_expr) { + hres = compile_args(ctx, call_expr->args, &args_cnt); + if(FAILED(hres)) + return hres; + } hres = push_instr_bstr_uint(ctx, op, member_expr->identifier, args_cnt); if(FAILED(hres)) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 568d8b9a42..ab81bb3ae4 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -145,7 +145,7 @@ typedef struct { typedef struct { statement_t stat; - call_expression_t *left_expr; + expression_t *left_expr; expression_t *value_expr; } assign_statement_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8ebfc82f00..39287bb7a6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -763,16 +763,9 @@ static statement_t *new_assign_statement(parser_ctx_t *ctx, unsigned loc, expres if(!stat) return NULL; + stat->left_expr = left; stat->value_expr = right; - if(left->type == EXPR_CALL) { - stat->left_expr = (call_expression_t*)left; - }else { - stat->left_expr = new_call_expression(ctx, left, NULL); - if(!stat->left_expr) - return NULL; - } - return &stat->stat; } @@ -785,7 +778,7 @@ static statement_t *new_set_statement(parser_ctx_t *ctx, unsigned loc, member_ex return NULL; stat->value_expr = right; - stat->left_expr = new_call_expression(ctx, &left->expr, arguments); + stat->left_expr = (expression_t*)new_call_expression(ctx, &left->expr, arguments); if(!stat->left_expr) return NULL;

1 0

Zebediah Figura : include: Don't use the printf format attribute when compiling against msvcrt and not cross-compiling.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 6895470ab0bf07cc1444f30f845cbb5b7c96e659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6895470ab0bf07cc1444f30f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:56:03 2020 -0600 include: Don't use the printf format attribute when compiling against msvcrt and not cross-compiling. Since it will spit out bogus warnings in the case we use Microsoft-specific extensions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wine/debug.h b/include/wine/debug.h index 8985163894..2a63f4351d 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -88,7 +88,11 @@ struct __wine_debug_channel #define __WINE_DBG_LOG(args...) \ wine_dbg_log( __dbcl, __dbch, __FUNCTION__, args); } } while(0) +#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) #define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif #ifdef WINE_NO_TRACE_MSGS

1 0

Nikolay Sivov : ole32: Fix a leak when creating pointer moniker through activation.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 157651a7846c227638ce9121d99ddf0af4722f41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=157651a7846c227638ce9121… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 30 14:53:45 2020 +0300 ole32: Fix a leak when creating pointer moniker through activation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/pointermoniker.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index b2f6c2af95..2ece11f53b 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -699,9 +699,7 @@ HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, return hr; hr = IMoniker_QueryInterface(pMoniker, riid, ppv); - - if (FAILED(hr)) - IMoniker_Release(pMoniker); + IMoniker_Release(pMoniker); return hr; }

1 0

Jacek Caban : mshtml/tests: Get rid of a2bstr from style.c.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: fd1ad27df9b2a94089271bc2ebe998e9d6b1213c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd1ad27df9b2a94089271bc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 20:37:28 2020 +0100 mshtml/tests: Get rid of a2bstr from style.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 380 ++++++++++++++++++++++------------------------ 1 file changed, 184 insertions(+), 196 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd1ad27df9b2a9408927…

1 0

Jacek Caban : rpcrt4: Use MustFree for all non-base types in get_param_pointer_info.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 1980fcafe111c5e6958bc01b121cfbd0a42a5abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1980fcafe111c5e6958bc01b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 20:02:53 2020 +0100 rpcrt4: Use MustFree for all non-base types in get_param_pointer_info. Fixes a leak for VT_VARIANT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index fb78c9b5ab..c90c60c7b8 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -925,12 +925,6 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int ITypeInfo_ReleaseTypeAttr(refinfo, attr); ITypeInfo_Release(refinfo); break; - case VT_BSTR: - *flags |= IsSimpleRef | MustFree; - *tfs_tdesc = tdesc; - if (!is_in && is_out) - *server_size = sizeof(void *); - break; default: *flags |= IsSimpleRef; *tfs_tdesc = tdesc; @@ -938,6 +932,8 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int *server_size = type_memsize(typeinfo, tdesc); if ((*basetype = get_basetype(typeinfo, tdesc))) *flags |= IsBasetype; + else + *flags |= MustFree; break; }

1 0

Fabian Maurer : find/tests: Add tests for file based search.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: c74770c51bf47335471b136f6eda41e0955904b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74770c51bf47335471b136f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 28 21:41:00 2020 +0100 find/tests: Add tests for file based search. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/tests/find.c | 120 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 9 deletions(-) diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index 147b59c8ce..b8345034b5 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -180,10 +180,44 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp heap_free(child_output); } +static void run_find_file_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +{ + char path_temp_file[MAX_PATH]; + char path_temp_dir[MAX_PATH]; + HANDLE handle_file; + WCHAR commandline_new[MAX_PATH]; + BYTE *out_expected_new; + char header[MAX_PATH]; + int header_len; + + GetTempPathA(ARRAY_SIZE(path_temp_dir), path_temp_dir); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file); + handle_file = CreateFileA(path_temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, input, input_len); + CloseHandle(handle_file); + + wsprintfW(commandline_new, L"%s %hs", commandline, path_temp_file); + + CharUpperA(path_temp_file); + wsprintfA(header, "\r\n---------- %s\r\n", path_temp_file); + header_len = lstrlenA(header); + out_expected_new = heap_alloc(header_len + out_expected_len); + memcpy(out_expected_new, header, header_len); + memcpy(out_expected_new + header_len, out_expected, out_expected_len); + + run_find_stdin_(commandline_new, (BYTE*)"", 0, out_expected_new, header_len + out_expected_len, exitcode_expected, file, line); + heap_free(out_expected_new); + + DeleteFileA(path_temp_file); +} + #define run_find_stdin_str(commandline, input, out_expected, exitcode_expected) \ - run_find_stdin_str_(commandline, input, out_expected, exitcode_expected, __FILE__, __LINE__) + run_find_str_(commandline, input, out_expected, exitcode_expected, 0, __FILE__, __LINE__) -static void run_find_stdin_str_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, const char *file, int line) +#define run_find_file_str(commandline, input, out_expected, exitcode_expected) \ + run_find_str_(commandline, input, out_expected, exitcode_expected, 1, __FILE__, __LINE__) + +static void run_find_str_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, BOOL is_file, const char *file, int line) { WCHAR *commandlineW; int len_commandlineW; @@ -193,15 +227,20 @@ static void run_find_stdin_str_(const char *commandline, const char *input, cons commandlineW = heap_alloc(len_commandlineW * sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, commandline, -1, commandlineW, len_commandlineW); - run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); - + if (is_file) + run_find_file_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); + else + run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); heap_free(commandlineW); } #define run_find_stdin_unicode(input, out_expected, exitcode_expected) \ - run_find_stdin_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, __FILE__, __LINE__) + run_find_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, 0, __FILE__, __LINE__) -static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +#define run_find_file_unicode(input, out_expected, exitcode_expected) \ + run_find_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, 1, __FILE__, __LINE__) + +static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, BOOL is_file, const char *file, int line) { /* Need "test" as char and quoted wchar */ static const WCHAR wstr_quoted_test[] = { '"','t', 'e', 's', 't','"',0 }; @@ -219,7 +258,10 @@ static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE exitcode_expected = 1; } - run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); + if (is_file) + run_find_file_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); + else + run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); } static void test_errors(void) @@ -230,6 +272,8 @@ static void test_errors(void) todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); + todo_wine + run_find_stdin_str("\"test\" C:\\doesnotexist.dat", "", "File not found - C:\\DOESNOTEXIST.DAT\r\n", 1); } static void test_singleline_without_switches(void) @@ -272,7 +316,7 @@ static const BYTE str_rus_utf8_nobom[] = { 0xD0,0xBF,0xD1,0x static const BYTE str_en_utf8_bom[] = { 0xEF,0xBB,0xBF,'e','n','t','e','s','t','\r','\n' }; static const BYTE str_en_utf8_nobom[] = { 'e','n','t','e','s','t','\r','\n' }; -static void test_unicode_support(void) +static void test_unicode_support_stdin(void) { /* Test unicode support on STDIN * Those depend on the active codepage - e.g. 932 (japanese) behaves different from 1252 (latin) @@ -302,6 +346,62 @@ static void test_unicode_support(void) run_find_stdin_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); } +static void test_file_search(void) +{ + todo_wine + run_find_file_str("\"\"", "test", "", 1); + todo_wine + run_find_file_str("\"test\"", "", "", 1); + todo_wine + run_find_file_str("\"test\"", "test", "test\r\n", 0); + todo_wine + run_find_file_str("\"test\"", "test2", "test2\r\n", 0); + todo_wine + run_find_file_str("\"test\"", "test\r2", "test\r2\r\n", 0); + todo_wine + run_find_file_str("\"test2\"", "test", "", 1); + todo_wine + run_find_file_str("\"test\"", "test\nother\ntest2\ntest3", "test\r\ntest2\r\ntest3\r\n", 0); +} + +static void test_unicode_support_file(void) +{ + /* Test unicode support on files */ + + /* Test UTF-8 BOM */ + todo_wine + run_find_file_unicode(str_en_utf8_nobom, str_en_utf8_nobom, 0); + todo_wine + run_find_file_unicode(str_en_utf8_bom, str_en_utf8_bom, 0); + + /* Test russian characters */ + todo_wine + run_find_file_unicode(str_rus_utf8_bom, str_rus_utf8_bom, 0); + todo_wine + run_find_file_unicode(str_rus_utf8_nobom, str_rus_utf8_nobom, 0); + + /* Test japanese characters */ + todo_wine + run_find_file_unicode(str_jap_utf8_nobom, str_jap_utf8_nobom, 0); + todo_wine + run_find_file_unicode(str_jap_utf8_bom, str_jap_utf8_bom, 0); + todo_wine + run_find_file_unicode(str_jap_shiftjis, str_jap_shiftjis, 0); + + /* Test unsupported encodings */ + todo_wine + run_find_file_unicode(str_jap_utf16le_nobom, str_empty, 1); + todo_wine + run_find_file_unicode(str_jap_utf16be_bom, str_empty, 1); + todo_wine + run_find_file_unicode(str_jap_utf16be_nobom, str_empty, 1); + + /* Test utf16le */ + todo_wine + run_find_file_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); +} + + START_TEST(find) { if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) @@ -314,5 +414,7 @@ START_TEST(find) } test_singleline_without_switches(); test_multiline(); - test_unicode_support(); + test_unicode_support_stdin(); + test_file_search(); + test_unicode_support_file(); }

1 0

Jacek Caban : vbscript: Allow any call expression to be used in set statement.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: d26998d6e542bfd021f4dcbf5f8fe8dbb70786c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26998d6e542bfd021f4dcbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 17:26:04 2020 +0100 vbscript: Allow any call expression to be used in set statement. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 17 +++++------------ dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 39287bb7a6..5c18af13d4 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -48,7 +48,7 @@ static call_expression_t *make_call_expression(parser_ctx_t*,expression_t*,expre static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); static statement_t *new_call_statement(parser_ctx_t*,unsigned,BOOL,expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); -static statement_t *new_set_statement(parser_ctx_t*,unsigned,member_expression_t*,expression_t*,expression_t*); +static statement_t *new_set_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,unsigned,dim_decl_t*); static statement_t *new_redim_statement(parser_ctx_t*,unsigned,const WCHAR*,BOOL,expression_t*); static statement_t *new_while_statement(parser_ctx_t*,unsigned,statement_type_t,expression_t*,statement_t*); @@ -136,7 +136,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression SignExpression %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression -%type <expression> Arguments Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList +%type <expression> Arguments ArgumentList ArgumentList_opt Step_opt ExpressionList %type <boolean> DoType Preserve_opt %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl @@ -216,8 +216,7 @@ SimpleStatement | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0, @$); CHECK_ERROR; } | tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0, @$); CHECK_ERROR; } | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0, @$); CHECK_ERROR; } - | tSET MemberExpression Arguments_opt '=' Expression - { $$ = new_set_statement(ctx, @$, $2, $3, $5); CHECK_ERROR; } + | tSET CallExpression '=' Expression { $$ = new_set_statement(ctx, @$, $2, $4); CHECK_ERROR; } | tSTOP { $$ = new_statement(ctx, STAT_STOP, 0, @$); CHECK_ERROR; } | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, @$, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, @$, FALSE); CHECK_ERROR; } @@ -310,10 +309,6 @@ Arguments : tEMPTYBRACKETS { $$ = NULL; } | '(' ArgumentList ')' { $$ = $2; } -Arguments_opt - : /* empty */ { $$ = NULL; } - | Arguments { $$ = $1; } - ArgumentList_opt : /* empty */ { $$ = NULL; } | ArgumentList { $$ = $1; } @@ -769,7 +764,7 @@ static statement_t *new_assign_statement(parser_ctx_t *ctx, unsigned loc, expres return &stat->stat; } -static statement_t *new_set_statement(parser_ctx_t *ctx, unsigned loc, member_expression_t *left, expression_t *arguments, expression_t *right) +static statement_t *new_set_statement(parser_ctx_t *ctx, unsigned loc, expression_t *left, expression_t *right) { assign_statement_t *stat; @@ -777,10 +772,8 @@ static statement_t *new_set_statement(parser_ctx_t *ctx, unsigned loc, member_ex if(!stat) return NULL; + stat->left_expr = left; stat->value_expr = right; - stat->left_expr = (expression_t*)new_call_expression(ctx, &left->expr, arguments); - if(!stat->left_expr) - return NULL; return &stat->stat; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 12104a2a4a..04e3cbfe91 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1630,6 +1630,10 @@ x.prop.prop.prop = 2 call ok(x.getProp().getProp.prop = 2, "x.getProp().getProp.prop = " & x.getProp().getProp.prop) x.getprop.getprop().prop = 3 call ok(x.getProp.prop.prop = 3, "x.getProp.prop.prop = " & x.getProp.prop.prop) +set x.getprop.getprop().prop = new emptyclass +set obj = new emptyclass +set x.getprop.getprop().prop = obj +call ok(x.getprop.getprop().prop is obj, "x.getprop.getprop().prop is not obj (emptyclass)") ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x())

1 0

Zebediah Figura : mapi32: Use the %I length modifier to print pointer-size integers.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 0ca19c3cfbc1649671b2aa77e73445f168224b27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ca19c3cfbc1649671b2aa77… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:56:04 2020 -0600 mapi32: Use the %I length modifier to print pointer-size integers. "long int" is 32 bits on Windows, so %l will silently truncate the argument to 32 bits. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/imalloc.c | 4 ++-- dlls/mapi32/mapi32_main.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index 3e95a6c7cd..561df1a60a 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -114,7 +114,7 @@ static ULONG WINAPI IMAPIMalloc_fnRelease(LPMALLOC iface) */ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb) { - TRACE("(%p)->(%ld)\n", iface, cb); + TRACE("(%p)->(%Id)\n", iface, cb); return LocalAlloc(LMEM_FIXED, cb); } @@ -124,7 +124,7 @@ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb) */ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, SIZE_T cb) { - TRACE("(%p)->(%p, %ld)\n", iface, pv, cb); + TRACE("(%p)->(%p, %Id)\n", iface, pv, cb); if (!pv) return LocalAlloc(LMEM_FIXED, cb); diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 0dcc811c24..ac83062679 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -129,7 +129,7 @@ HRESULT WINAPI MAPIInitialize(LPVOID init) ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - TRACE("(0x%08lx %s %p 0x%08x 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08x 0x%08x %p)\n", uiparam, debugstr_a(profile), password, flags, reserved, session); if (mapiFunctions.MAPILogon) @@ -149,7 +149,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { - TRACE("(0x%08lx 0x%08lx 0x%08x 0x%08x)\n", session, + TRACE("(0x%08Ix 0x%08Ix 0x%08x 0x%08x)\n", session, uiparam, flags, reserved); if (mapiFunctions.MAPILogoff) @@ -167,7 +167,7 @@ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, LPWSTR password, ULONG flags, LPMAPISESSION *session) { - TRACE("(0x%08lx %s %p 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08x %p)\n", uiparam, debugstr_w(profile), password, flags, session); if (mapiFunctions.MAPILogonEx)

1 0

Zebediah Figura : widl: Output a registry script for all interfaces written into the typelib.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 56995dd3223c59340037d33a6073a42bdbba1d3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=56995dd3223c59340037d33a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 10:10:27 2020 -0600 widl: Output a registry script for all interfaces written into the typelib. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46005 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 1 + tools/widl/register.c | 11 +++-------- tools/widl/widltypes.h | 3 +++ tools/widl/write_msft.c | 11 +++++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5f6eb50878..92b4f8ebd5 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1792,6 +1792,7 @@ static type_t *make_safearray(type_t *type) static typelib_t *make_library(const char *name, const attr_list_t *attrs) { typelib_t *typelib = xmalloc(sizeof(*typelib)); + memset(typelib, 0, sizeof(*typelib)); typelib->name = xstrdup(name); typelib->attrs = attrs; list_init( &typelib->importlibs ); diff --git a/tools/widl/register.c b/tools/widl/register.c index f65cbddf53..c03ab3c56b 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -119,8 +119,6 @@ static void write_typelib_interface( const type_t *iface, const typelib_t *typel if (!uuid) return; if (!is_object( iface )) return; - if (!is_attr( iface->attrs, ATTR_OLEAUTOMATION ) && !is_attr( iface->attrs, ATTR_DISPINTERFACE )) - return; put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); put_str( indent, "{\n" ); indent++; @@ -137,13 +135,10 @@ static void write_typelib_interface( const type_t *iface, const typelib_t *typel static void write_typelib_interfaces( const typelib_t *typelib ) { - const statement_t *stmt; + unsigned int i; - if (typelib->stmts) LIST_FOR_EACH_ENTRY( stmt, typelib->stmts, const statement_t, entry ) - { - if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) - write_typelib_interface( stmt->u.type, typelib ); - } + for (i = 0; i < typelib->reg_iface_count; ++i) + write_typelib_interface( typelib->reg_ifaces[i], typelib ); } static int write_coclass( const type_t *class, const typelib_t *typelib ) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 5e28329278..085a0ff55f 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -538,6 +538,9 @@ struct _typelib_t { const attr_list_t *attrs; struct list importlibs; statement_list_t *stmts; + + type_t **reg_ifaces; + unsigned int reg_iface_count; }; struct _user_type_t { diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index dc0a6cb45b..3a11d2ddd7 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2068,6 +2068,10 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte if(add_func_desc(msft_typeinfo, func, idx) == S_OK) idx++; } + + typelib->typelib->reg_ifaces = xrealloc(typelib->typelib->reg_ifaces, + (typelib->typelib->reg_iface_count + 1) * sizeof(dispinterface)); + typelib->typelib->reg_ifaces[typelib->typelib->reg_iface_count++] = dispinterface; } static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) @@ -2142,6 +2146,13 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) if(add_func_desc(msft_typeinfo, func, idx) == S_OK) idx++; } + + if (is_attr(interface->attrs, ATTR_OLEAUTOMATION) || is_attr(interface->attrs, ATTR_DUAL)) + { + typelib->typelib->reg_ifaces = xrealloc(typelib->typelib->reg_ifaces, + (typelib->typelib->reg_iface_count + 1) * sizeof(interface)); + typelib->typelib->reg_ifaces[typelib->typelib->reg_iface_count++] = interface; + } } static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure)

1 0

Nikolay Sivov : ole32: Fix a leak when creating antimoniker through activation.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 82044449c45d4037dae393bc348579e87d9c4b10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82044449c45d4037dae393bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 30 14:53:46 2020 +0300 ole32: Fix a leak when creating antimoniker through activation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 6efd4ae853..7abbfc544f 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -668,9 +668,7 @@ HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, return hr; hr = IMoniker_QueryInterface(pMoniker, riid, ppv); - - if (FAILED(hr)) - IMoniker_Release(pMoniker); + IMoniker_Release(pMoniker); return hr; }

1 0

Nikolay Sivov : ole32: Get rid of pointer moniker initialization helper.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: bea01f4532f7cade40a2fc4482543c040d04a862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bea01f4532f7cade40a2fc44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 30 14:53:44 2020 +0300 ole32: Get rid of pointer moniker initialization helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/pointermoniker.c | 89 ++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 58 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 101fda4e3b..b2f6c2af95 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "oleidl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -42,7 +43,7 @@ typedef struct PointerMonikerImpl IMoniker IMoniker_iface; IMarshal IMarshal_iface; - LONG ref; /* reference counter for this object */ + LONG refcount; IUnknown *pObject; } PointerMonikerImpl; @@ -88,40 +89,30 @@ static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker *iface, REFIID return S_OK; } -/****************************************************************************** - * PointerMoniker_AddRef - ******************************************************************************/ -static ULONG WINAPI -PointerMonikerImpl_AddRef(IMoniker* iface) +static ULONG WINAPI PointerMonikerImpl_AddRef(IMoniker *iface) { - PointerMonikerImpl *This = impl_from_IMoniker(iface); + PointerMonikerImpl *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedIncrement(&moniker->refcount); - TRACE("(%p)\n",This); + TRACE("%p, refcount %u.\n", iface, refcount); - return InterlockedIncrement(&This->ref); + return refcount; } -/****************************************************************************** - * PointerMoniker_Release - ******************************************************************************/ -static ULONG WINAPI -PointerMonikerImpl_Release(IMoniker* iface) +static ULONG WINAPI PointerMonikerImpl_Release(IMoniker *iface) { - PointerMonikerImpl *This = impl_from_IMoniker(iface); - ULONG ref; - - TRACE("(%p)\n",This); + PointerMonikerImpl *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->refcount); - ref = InterlockedDecrement(&This->ref); + TRACE("%p, refcount %u.\n", iface, refcount); - /* destroy the object if there are no more references on it */ - if (ref == 0) + if (!refcount) { - if (This->pObject) IUnknown_Release(This->pObject); - HeapFree(GetProcessHeap(),0,This); + if (moniker->pObject) IUnknown_Release(moniker->pObject); + heap_free(moniker); } - return ref; + return refcount; } /****************************************************************************** @@ -659,52 +650,34 @@ static const IMarshalVtbl pointer_moniker_marshal_vtbl = pointer_moniker_marshal_DisconnectObject }; -/****************************************************************************** - * PointerMoniker_Construct (local function) - *******************************************************************************/ -static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *punk) -{ - TRACE("(%p)\n",This); - - This->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl; - This->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl; - This->ref = 1; - if (punk) - IUnknown_AddRef(punk); - This->pObject = punk; -} - /*********************************************************************** * CreatePointerMoniker (OLE32.@) - * - * Creates a moniker which represents a pointer. - * - * PARAMS - * punk [I] Pointer to the object to represent. - * ppmk [O] Address that receives the pointer to the created moniker. - * - * RETURNS - * Success: S_OK. - * Failure: Any HRESULT code. */ -HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk) +HRESULT WINAPI CreatePointerMoniker(IUnknown *object, IMoniker **ret) { - PointerMonikerImpl *This; + PointerMonikerImpl *moniker; - TRACE("(%p, %p)\n", punk, ppmk); + TRACE("(%p, %p)\n", object, ret); - if (!ppmk) + if (!ret) return E_INVALIDARG; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) + moniker = heap_alloc(sizeof(*moniker)); + if (!moniker) { - *ppmk = NULL; + *ret = NULL; return E_OUTOFMEMORY; } - PointerMonikerImpl_Construct(This, punk); - *ppmk = &This->IMoniker_iface; + moniker->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl; + moniker->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl; + moniker->refcount = 1; + moniker->pObject = object; + if (moniker->pObject) + IUnknown_AddRef(moniker->pObject); + + *ret = &moniker->IMoniker_iface; + return S_OK; }

1 0

Jacek Caban : mshtml/tests: Get rid of strcmp_wa from style.c.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 7c9595ef17966504afb304d24e80ef0d459db6c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9595ef17966504afb304d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 20:37:38 2020 +0100 mshtml/tests: Get rid of strcmp_wa from style.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 325 ++++++++++++++++++++++------------------------ 1 file changed, 158 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c9595ef17966504afb3…

1 0

Jacek Caban : mshtml/tests: Get rid of wstr_contains.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: fe0dfdbc896428a94c3f339dfd5b357607c5ef00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe0dfdbc896428a94c3f339d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 20:37:32 2020 +0100 mshtml/tests: Get rid of wstr_contains. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 2e8438a2f8..67c29c3a85 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -59,13 +59,6 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } -static BOOL wstr_contains(const WCHAR *strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return strstr(buf, stra) != NULL; -} - #define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b) static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) { @@ -753,7 +746,7 @@ static void test_style6(IHTMLStyle6 *style) str = (void*)0xdeadbeef; hres = IHTMLStyle6_get_outline(style, &str); ok(hres == S_OK, "get_outline failed: %08x\n", hres); - ok(wstr_contains(str, "1px"), "outline = %s\n", wine_dbgstr_w(str)); + ok(wcsstr(str, L"1px") != NULL, "outline = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = (void*)0xdeadbeef;

1 0

Jacek Caban : jscript: Add IActiveScriptError implementation.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 75482382979193af5321816f1e03a9f785cafca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75482382979193af5321816f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:50:47 2020 +0100 jscript: Add IActiveScriptError implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 133 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/run.c | 13 +++-- 2 files changed, 139 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 1564e859b8..81bf7e440d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -64,6 +64,12 @@ typedef struct { struct list queued_code; } JScript; +typedef struct { + IActiveScriptError IActiveScriptError_iface; + LONG ref; + jsexcept_t ei; +} JScriptError; + void script_release(script_ctx_t *ctx) { if(--ctx->ref) @@ -101,6 +107,106 @@ static inline BOOL is_started(script_ctx_t *ctx) || ctx->state == SCRIPTSTATE_DISCONNECTED; } +static inline JScriptError *impl_from_IActiveScriptError(IActiveScriptError *iface) +{ + return CONTAINING_RECORD(iface, JScriptError, IActiveScriptError_iface); +} + +static HRESULT WINAPI JScriptError_QueryInterface(IActiveScriptError *iface, REFIID riid, void **ppv) +{ + JScriptError *This = impl_from_IActiveScriptError(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IActiveScriptError_iface; + }else if(IsEqualGUID(riid, &IID_IActiveScriptError)) { + TRACE("(%p)->(IID_IActiveScriptError %p)\n", This, ppv); + *ppv = &This->IActiveScriptError_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JScriptError_AddRef(IActiveScriptError *iface) +{ + JScriptError *This = impl_from_IActiveScriptError(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI JScriptError_Release(IActiveScriptError *iface) +{ + JScriptError *This = impl_from_IActiveScriptError(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + reset_ei(&This->ei); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI JScriptError_GetExceptionInfo(IActiveScriptError *iface, EXCEPINFO *excepinfo) +{ + JScriptError *This = impl_from_IActiveScriptError(iface); + + TRACE("(%p)->(%p)\n", This, excepinfo); + + if(!excepinfo) + return E_POINTER; + + memset(excepinfo, 0, sizeof(*excepinfo)); + excepinfo->scode = This->ei.error; + return S_OK; +} + +static HRESULT WINAPI JScriptError_GetSourcePosition(IActiveScriptError *iface, DWORD *source_context, ULONG *line, LONG *character) +{ + JScriptError *This = impl_from_IActiveScriptError(iface); + + FIXME("(%p)->(%p %p %p)\n", This, source_context, line, character); + + if(source_context) + *source_context = 0; + if(line) + *line = 0; + if(character) + *character = 0; + return S_OK; +} + +static HRESULT WINAPI JScriptError_GetSourceLineText(IActiveScriptError *iface, BSTR *source) +{ + JScriptError *This = impl_from_IActiveScriptError(iface); + + FIXME("(%p)->(%p)\n", This, source); + + if(!source) + return E_POINTER; + *source = NULL; + return E_FAIL; +} + +static const IActiveScriptErrorVtbl JScriptErrorVtbl = { + JScriptError_QueryInterface, + JScriptError_AddRef, + JScriptError_Release, + JScriptError_GetExceptionInfo, + JScriptError_GetSourcePosition, + JScriptError_GetSourceLineText +}; + void reset_ei(jsexcept_t *ei) { ei->error = S_OK; @@ -121,14 +227,33 @@ void enter_script(script_ctx_t *ctx, jsexcept_t *ei) HRESULT leave_script(script_ctx_t *ctx, HRESULT result) { jsexcept_t *ei = ctx->ei; + JScriptError *error; TRACE("ctx %p ei %p prev %p\n", ctx, ei, ei->prev); ctx->ei = ei->prev; - if(result == DISP_E_EXCEPTION) + if(result == DISP_E_EXCEPTION) { result = ei->error; - if(FAILED(result)) + }else { + reset_ei(ei); + ei->error = result; + } + if(FAILED(result)) { WARN("%08x\n", result); + if(ctx->site && (error = heap_alloc(sizeof(*error)))) { + HRESULT hres; + + error->IActiveScriptError_iface.lpVtbl = &JScriptErrorVtbl; + error->ref = 1; + error->ei = *ei; + memset(ei, 0, sizeof(*ei)); + + hres = IActiveScriptSite_OnScriptError(ctx->site, &error->IActiveScriptError_iface); + IActiveScriptError_Release(&error->IActiveScriptError_iface); + if(hres == S_OK) + result = SCRIPT_E_REPORTED; + } + } if(ei->enter_notified && ctx->site) IActiveScriptSite_OnLeaveScript(ctx->site); reset_ei(ei); @@ -162,12 +287,14 @@ static void exec_queued_code(JScript *This) { bytecode_t *iter; jsexcept_t ei; - HRESULT hres; + HRESULT hres = S_OK; LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry) { enter_script(This->ctx, &ei); hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); leave_script(This->ctx, hres); + if(FAILED(hres)) + break; } clear_script_queue(This); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ddac4fb904..8b3cc8a1d2 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2265,9 +2265,10 @@ static void test_error_reports(void) script_error = NULL; SET_EXPECT(ActiveScriptSite_OnScriptError); hres = IActiveScriptParse_ParseScriptText(parser, tests[i].script, NULL, NULL, NULL, 10, 0, 0, NULL, NULL); - todo_wine - ok(hres == SCRIPT_E_REPORTED || (tests[i].error == JS_E_EXCEPTION_THROWN && hres == SCRIPT_E_PROPAGATE), "[%u] got: 0x%08x\n", i, hres); - todo_wine + todo_wine_if(tests[i].todo_flags & ERROR_TODO_PARSE) + ok(hres == SCRIPT_E_REPORTED || (tests[i].error == JS_E_EXCEPTION_THROWN && hres == SCRIPT_E_PROPAGATE), + "[%u] got: 0x%08x for %s\n", i, hres, wine_dbgstr_w(tests[i].script)); + todo_wine_if(tests[i].todo_flags & ERROR_TODO_PARSE) CHECK_CALLED(ActiveScriptSite_OnScriptError); if (script_error) @@ -2284,16 +2285,19 @@ static void test_error_reports(void) source_context = 0xdeadbeef; hres = IActiveScriptError_GetSourcePosition(script_error, &source_context, NULL, NULL); ok(hres == S_OK, "GetSourcePosition failed0x%08x\n", hres); + todo_wine ok(source_context == 10, "source_context = %x\n", source_context); line_number = 0xdeadbeef; hres = IActiveScriptError_GetSourcePosition(script_error, NULL, &line_number, NULL); ok(hres == S_OK, "GetSourcePosition failed%08x\n", hres); + todo_wine_if(tests[i].line) ok(line_number == tests[i].line, "[%u] line = %u expected %u\n", i, line_number, tests[i].line); character = 0xdeadbeef; hres = IActiveScriptError_GetSourcePosition(script_error, NULL, NULL, &character); ok(hres == S_OK, "GetSourcePosition failed: %08x\n", hres); + todo_wine_if(tests[i].character) ok(character == tests[i].character, "[%u] character = %u expected %u\n", i, character, tests[i].character); hres = IActiveScriptError_GetSourceLineText(script_error, NULL); @@ -2341,12 +2345,13 @@ static void test_error_reports(void) if (is_lang_english()) { if(tests[i].error_source) + todo_wine ok(ei.bstrSource && !lstrcmpW(ei.bstrSource, tests[i].error_source), "[%u] bstrSource = %s expected %s\n", i, wine_dbgstr_w(ei.bstrSource), wine_dbgstr_w(tests[i].error_source)); else ok(!ei.bstrSource, "[%u] bstrSource = %s expected NULL\n", i, wine_dbgstr_w(ei.bstrSource)); if(tests[i].description) - todo_wine_if(tests[i].todo_flags & ERROR_TODO_DESCRIPTION) + todo_wine ok(ei.bstrDescription && !lstrcmpW(ei.bstrDescription, tests[i].description), "[%u] bstrDescription = %s expected %s\n", i, wine_dbgstr_w(ei.bstrDescription), wine_dbgstr_w(tests[i].description)); else

1 0

Jacek Caban : jscript: Use enter_script and leave_script to call script site notifications.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 33984c390df823b1d23890f2ed8b5223b067f7ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=33984c390df823b1d23890f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:50:39 2020 +0100 jscript: Use enter_script and leave_script to call script site notifications. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 5 +++++ dlls/jscript/engine.h | 1 + dlls/jscript/jscript.c | 22 ++++------------------ dlls/jscript/tests/caller.c | 2 -- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0d9af71715..8b121747fe 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2977,6 +2977,11 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi unsigned i; HRESULT hres; + if(!ctx->ei->enter_notified) { + ctx->ei->enter_notified = TRUE; + IActiveScriptSite_OnEnterScript(ctx->site); + } + for(i = 0; i < function->func_cnt; i++) { jsdisp_t *func_obj; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 5f0035baac..a33611fced 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -227,6 +227,7 @@ struct _jsexcept_t { BOOL valid_value; jsval_t value; + BOOL enter_notified; jsexcept_t *prev; }; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 28bde3bb33..1564e859b8 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -129,22 +129,12 @@ HRESULT leave_script(script_ctx_t *ctx, HRESULT result) result = ei->error; if(FAILED(result)) WARN("%08x\n", result); + if(ei->enter_notified && ctx->site) + IActiveScriptSite_OnLeaveScript(ctx->site); reset_ei(ei); return result; } -static HRESULT exec_global_code(JScript *This, bytecode_t *code) -{ - HRESULT hres; - - IActiveScriptSite_OnEnterScript(This->site); - - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); - - IActiveScriptSite_OnLeaveScript(This->site); - return hres; -} - static void clear_script_queue(JScript *This) { while(!list_empty(&This->queued_code)) @@ -176,7 +166,7 @@ static void exec_queued_code(JScript *This) LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry) { enter_script(This->ctx, &ei); - hres = exec_global_code(This, iter); + hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); leave_script(This->ctx, hres); } @@ -818,8 +808,6 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { jsval_t r; - IActiveScriptSite_OnEnterScript(This->site); - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) @@ -827,7 +815,6 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, jsval_release(r); } - IActiveScriptSite_OnLeaveScript(This->site); return leave_script(This->ctx, hres); } @@ -840,8 +827,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(!pvarResult && !is_started(This->ctx)) { list_add_tail(&This->queued_code, &code->entry); }else { - hres = exec_global_code(This, code); - + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); if(code->is_persistent) list_add_tail(&This->persistent_code, &code->entry); else diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 9fb59844c4..19323e8eaf 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -105,9 +105,7 @@ static void _call_change_type(unsigned line, IVariantChangeType *change_type, VA ok_(__FILE__,line)(hres == S_OK, "ChangeType(%d) failed: %08x\n", vt, hres); ok_(__FILE__,line)(V_VT(dst) == vt, "V_VT(dst) = %d\n", V_VT(dst)); if(V_VT(src) == VT_DISPATCH && vt != VT_BOOL) { - todo_wine CHECK_CALLED(OnEnterScript); - todo_wine CHECK_CALLED(OnLeaveScript); } }

1 0

Jacek Caban : jscript: Store error code in jsexcept_t.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 9855c248f844e2903a5fe866f41e112e1a5d084c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9855c248f844e2903a5fe866… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:50:33 2020 +0100 jscript: Store error code in jsexcept_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 19 +++++++++++++++++++ dlls/jscript/engine.h | 2 ++ dlls/jscript/jscript.c | 3 +++ dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + po/ar.po | 24 ++++++++++++++---------- po/ast.po | 24 ++++++++++++++---------- po/bg.po | 24 ++++++++++++++---------- po/ca.po | 24 ++++++++++++++---------- po/cs.po | 24 ++++++++++++++---------- po/da.po | 24 ++++++++++++++---------- po/de.po | 24 ++++++++++++++---------- po/el.po | 24 ++++++++++++++---------- po/en.po | 24 ++++++++++++++---------- po/en_US.po | 24 ++++++++++++++---------- po/eo.po | 24 ++++++++++++++---------- po/es.po | 24 ++++++++++++++---------- po/fa.po | 24 ++++++++++++++---------- po/fi.po | 24 ++++++++++++++---------- po/fr.po | 24 ++++++++++++++---------- po/he.po | 24 ++++++++++++++---------- po/hi.po | 24 ++++++++++++++---------- po/hr.po | 24 ++++++++++++++---------- po/hu.po | 24 ++++++++++++++---------- po/it.po | 24 ++++++++++++++---------- po/ja.po | 24 ++++++++++++++---------- po/ko.po | 24 ++++++++++++++---------- po/lt.po | 24 ++++++++++++++---------- po/ml.po | 24 ++++++++++++++---------- po/nb_NO.po | 24 ++++++++++++++---------- po/nl.po | 24 ++++++++++++++---------- po/or.po | 24 ++++++++++++++---------- po/pa.po | 24 ++++++++++++++---------- po/pl.po | 24 ++++++++++++++---------- po/pt_BR.po | 24 ++++++++++++++---------- po/pt_PT.po | 24 ++++++++++++++---------- po/rm.po | 24 ++++++++++++++---------- po/ro.po | 24 ++++++++++++++---------- po/ru.po | 24 ++++++++++++++---------- po/si.po | 24 ++++++++++++++---------- po/sk.po | 24 ++++++++++++++---------- po/sl.po | 24 ++++++++++++++---------- po/sr_RS(a)cyrillic.po | 24 ++++++++++++++---------- po/sr_RS(a)latin.po | 24 ++++++++++++++---------- po/sv.po | 24 ++++++++++++++---------- po/ta.po | 24 ++++++++++++++---------- po/te.po | 24 ++++++++++++++---------- po/th.po | 24 ++++++++++++++---------- po/tr.po | 24 ++++++++++++++---------- po/uk.po | 24 ++++++++++++++---------- po/wa.po | 24 ++++++++++++++---------- po/wine.pot | 24 ++++++++++++++---------- po/zh_CN.po | 24 ++++++++++++++---------- po/zh_TW.po | 24 ++++++++++++++---------- 55 files changed, 713 insertions(+), 490 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9855c248f844e2903a5f…

1 0

Nikolay Sivov : ole32: Fix (file moniker + antimoniker) composing.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 69bb0c7765e8223f0f4b11c92c92f7d0c877317d URL: https://source.winehq.org/git/wine.git/?a=commit;h=69bb0c7765e8223f0f4b11c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 30 14:53:41 2020 +0300 ole32: Fix (file moniker + antimoniker) composing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 9 ++++----- dlls/ole32/tests/moniker.c | 6 +----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 1e945f9a5f..6310a5acd5 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -666,7 +666,7 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, static const WCHAR bkSlash[]={'\\',0}; IBindCtx *bind=0; int i=0,j=0,lastIdx1=0,lastIdx2=0; - DWORD mkSys; + DWORD mkSys, order; TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite); @@ -735,10 +735,9 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, return res; } - else if(mkSys==MKSYS_ANTIMONIKER){ - - *ppmkComposite=NULL; - return S_OK; + else if (is_anti_moniker(pmkRight, &order)) + { + return order > 1 ? create_anti_moniker(order - 1, ppmkComposite) : S_OK; } else if (fOnlyIfNotGeneric){ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index ea1e5b1933..7b2dfcfe08 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1958,16 +1958,12 @@ todo_wine anti = create_antimoniker(2); hr = IMoniker_ComposeWith(moniker1, anti, TRUE, &moniker2); ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); -todo_wine - ok(!!moniker2, "Unexpected pointer.\n"); -if (moniker2) -{ TEST_MONIKER_TYPE(moniker2, MKSYS_ANTIMONIKER); hr = IMoniker_Hash(moniker2, &hash); ok(hr == S_OK, "Failed to get hash, hr %#x.\n", hr); ok(hash == 0x80000001, "Unexpected hash.\n"); IMoniker_Release(moniker2); -} + IMoniker_Release(anti); IMoniker_Release(moniker1);

1 0

Nikolay Sivov : ole32: Enumeration is not supported for pointer monikers.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 2017977cb30b1ed724491cd87dc043a6c15780ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2017977cb30b1ed724491cd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 30 14:53:43 2020 +0300 ole32: Enumeration is not supported for pointer monikers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/pointermoniker.c | 9 ++++----- dlls/ole32/tests/moniker.c | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index bb578a6f61..101fda4e3b 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -328,17 +328,16 @@ PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, /****************************************************************************** * PointerMoniker_Enum ******************************************************************************/ -static HRESULT WINAPI -PointerMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) +static HRESULT WINAPI PointerMonikerImpl_Enum(IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker) { - TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); + TRACE("%p, %d, %p.\n", iface, fForward, ppenumMoniker); - if (ppenumMoniker == NULL) + if (!ppenumMoniker) return E_POINTER; *ppenumMoniker = NULL; - return S_OK; + return E_NOTIMPL; } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 4c273547cb..7e7d615645 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3008,11 +3008,9 @@ todo_wine /* Enum() */ hr = IMoniker_Enum(moniker, TRUE, &enummoniker); -todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); hr = IMoniker_Enum(moniker, FALSE, &enummoniker); -todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); IMoniker_Release(moniker);

1 0

Nikolay Sivov : ole32: Get rid of redundant pointer check.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 5d5eb585280262a9e27b75a3f80a6eddb2295f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5eb585280262a9e27b75a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 30 14:53:42 2020 +0300 ole32: Get rid of redundant pointer check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/pointermoniker.c | 20 ++++++++------------ dlls/ole32/tests/moniker.c | 3 +++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index a16a56a098..bb578a6f61 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -58,20 +58,18 @@ static PointerMonikerImpl *impl_from_IMarshal(IMarshal *iface) } static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); -static HRESULT WINAPI -PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) + +static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker *iface, REFIID riid, void **ppvObject) { - PointerMonikerImpl *This = impl_from_IMoniker(iface); + PointerMonikerImpl *moniker = impl_from_IMoniker(iface); - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppvObject); - if ( (This==0) || (ppvObject==0) ) - return E_INVALIDARG; + if (!ppvObject) + return E_INVALIDARG; - /* Initialize the return parameter */ *ppvObject = 0; - /* Compare the riid with the interface IDs implemented by this object.*/ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || @@ -80,13 +78,11 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) *ppvObject = iface; } else if (IsEqualIID(&IID_IMarshal, riid)) - *ppvObject = &This->IMarshal_iface; + *ppvObject = &moniker->IMarshal_iface; - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) + if (!*ppvObject) return E_NOINTERFACE; - /* always increase the reference count by one when it is successful */ IMoniker_AddRef(iface); return S_OK; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7b2dfcfe08..4c273547cb 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2886,6 +2886,9 @@ static void test_pointer_moniker(void) hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); ok_ole_success(hr, CreatePointerMoniker); + hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Jacek Caban : jscript: Store separated flag indicating if current exception value is valid.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 3c9b7011ffc52cba78171576617217640ec9a091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9b7011ffc52cba78171576… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:50:22 2020 +0100 jscript: Store separated flag indicating if current exception value is valid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 27 ++++++++++++++++++++------- dlls/jscript/engine.h | 2 ++ dlls/jscript/error.c | 3 ++- dlls/jscript/jscript.c | 6 ++++-- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b277f8631c..41d422ad98 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -855,13 +855,21 @@ static HRESULT interp_case(script_ctx_t *ctx) return S_OK; } +static void set_error_value(script_ctx_t *ctx, jsval_t value) +{ + jsexcept_t *ei = ctx->ei; + + reset_ei(ei); + ei->valid_value = TRUE; + ei->value = value; +} + /* ECMA-262 3rd Edition 12.13 */ static HRESULT interp_throw(script_ctx_t *ctx) { TRACE("\n"); - jsval_release(ctx->ei->value); - ctx->ei->value = stack_pop(ctx); + set_error_value(ctx, stack_pop(ctx)); return DISP_E_EXCEPTION; } @@ -957,7 +965,7 @@ static HRESULT interp_end_finally(script_ctx_t *ctx) if(!get_bool(v)) { TRACE("passing exception\n"); - ctx->ei->value = stack_pop(ctx); + set_error_value(ctx, stack_pop(ctx)); return DISP_E_EXCEPTION; } @@ -2713,6 +2721,7 @@ static void print_backtrace(script_ctx_t *ctx) static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) { except_frame_t *except_frame; + jsexcept_t *ei = ctx->ei; call_frame_t *frame; jsval_t except_val; unsigned catch_off; @@ -2724,8 +2733,8 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; - WARN("Exception %08x %s", exception_hres, debugstr_jsval(ctx->ei->value)); - if(jsval_type(ctx->ei->value) == JSV_OBJECT) { + WARN("Exception %08x %s", exception_hres, debugstr_jsval(ei->valid_value ? ei->value : jsval_undefined())); + if(ei->valid_value && jsval_type(ctx->ei->value) == JSV_OBJECT) { error_obj = to_jsdisp(get_object(ctx->ei->value)); if(error_obj) { hres = jsdisp_propget_name(error_obj, messageW, &msg); @@ -2766,8 +2775,12 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) frame->ip = catch_off ? catch_off : except_frame->finally_off; if(catch_off) assert(frame->bytecode->instrs[frame->ip].op == OP_enter_catch); - except_val = ctx->ei->value; - ctx->ei->value = jsval_undefined(); + if(ei->valid_value) { + except_val = ctx->ei->value; + ctx->ei->valid_value = FALSE; + }else { + except_val = jsval_undefined(); + } /* keep current except_frame if we're entering catch block with finally block associated */ if(catch_off && except_frame->finally_off) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 172f03323f..82abfeb743 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -222,7 +222,9 @@ static inline scope_chain_t *scope_addref(scope_chain_t *scope) } struct _jsexcept_t { + BOOL valid_value; jsval_t value; + jsexcept_t *prev; }; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 847f6de92d..66dbccfbc0 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -404,7 +404,8 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j if(FAILED(hres)) return hres; - jsval_release(ctx->ei->value); + reset_ei(ctx->ei); + ctx->ei->valid_value = TRUE; ctx->ei->value = jsval_obj(err); return error; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 552861b130..e9f214f07a 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -103,8 +103,10 @@ static inline BOOL is_started(script_ctx_t *ctx) void reset_ei(jsexcept_t *ei) { - jsval_release(ei->value); - ei->value = jsval_undefined(); + if(ei->valid_value) { + jsval_release(ei->value); + ei->valid_value = FALSE; + } } void enter_script(script_ctx_t *ctx, jsexcept_t *ei)

1 0

Jacek Caban : jscript: Support DISP_E_EXCEPTION InvokeEx result.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 274503c839de2a30aef22eab4b9dc879d254a813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=274503c839de2a30aef22eab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:50:06 2020 +0100 jscript: Support DISP_E_EXCEPTION InvokeEx result. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 184 +++++++++++++++++++------------------------------- 1 file changed, 69 insertions(+), 115 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index cd610e4e88..265e84aee8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1941,11 +1941,51 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, unsigned return invoke_prop_func(disp, to_disp(disp), prop, flags, argc, argv, r, NULL); } -HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, unsigned argc, jsval_t *argv, jsval_t *ret) +static HRESULT disp_invoke(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *params, VARIANT *r) { IDispatchEx *dispex; - jsdisp_t *jsdisp; + EXCEPINFO ei; + HRESULT hres; + + memset(&ei, 0, sizeof(ei)); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, params, r, &ei, &ctx->jscaller->IServiceProvider_iface); + IDispatchEx_Release(dispex); + }else { + UINT err = 0; + + if(flags == DISPATCH_CONSTRUCT) { + WARN("IDispatch cannot be constructor\n"); + return DISP_E_MEMBERNOTFOUND; + } + + if(params->cNamedArgs == 1 && params->rgdispidNamedArgs[0] == DISPID_THIS) { + params->cNamedArgs = 0; + params->rgdispidNamedArgs = NULL; + params->cArgs--; + params->rgvarg++; + } + + TRACE("using IDispatch\n"); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, params, r, &ei, &err); + } + + if(hres == DISP_E_EXCEPTION) { + TRACE("DISP_E_EXCEPTION: %08x %s %s\n", ei.scode, debugstr_w(ei.bstrSource), debugstr_w(ei.bstrDescription)); + hres = SUCCEEDED(ei.scode) ? E_FAIL : ei.scode; + SysFreeString(ei.bstrSource); + SysFreeString(ei.bstrDescription); + SysFreeString(ei.bstrHelpFile); + } + + return hres; +} + +HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, unsigned argc, jsval_t *argv, jsval_t *ret) +{ VARIANT buf[6], retv; + jsdisp_t *jsdisp; DISPPARAMS dp; unsigned i; HRESULT hres; @@ -1980,7 +2020,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns dp.rgdispidNamedArgs = NULL; } - if(argc > 6) { + if(dp.cArgs > ARRAY_SIZE(buf)) { dp.rgvarg = heap_alloc(argc*sizeof(VARIANT)); if(!dp.rgvarg) return E_OUTOFMEMORY; @@ -2000,48 +2040,29 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns } V_VT(&retv) = VT_EMPTY; - clear_ei(ctx); - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, &dp, ret ? &retv : NULL, &ctx->ei.ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - }else { - UINT err = 0; - - if(flags == DISPATCH_CONSTRUCT) { - WARN("IDispatch cannot be constructor\n"); - return DISP_E_MEMBERNOTFOUND; - } - - TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, &dp, ret ? &retv : NULL, &ctx->ei.ei, &err); - } + hres = disp_invoke(ctx, disp, id, flags, &dp, ret ? &retv : NULL); for(i=0; i<argc; i++) VariantClear(dp.rgvarg+argc-i-1); if(dp.rgvarg != buf) heap_free(dp.rgvarg); - if(FAILED(hres)) - return hres; - if(ret) { + if(SUCCEEDED(hres) && ret) hres = variant_to_jsval(&retv, ret); - VariantClear(&retv); - } - + VariantClear(&retv); return hres; } HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + VARIANT buf[6], retv, *args = buf; jsdisp_t *jsdisp; - IDispatchEx *dispex; - VARIANT buf[6], retv; DISPPARAMS dp; unsigned i; - HRESULT hres; + HRESULT hres = S_OK; + + static DISPID this_id = DISPID_THIS; assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); @@ -2058,17 +2079,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W if(r && argc && flags == DISPATCH_METHOD) flags |= DISPATCH_PROPERTYGET; - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { - TRACE("using IDispatch\n"); - dispex = NULL; - jsthis = NULL; - } - if(jsthis) { - static DISPID this_id = DISPID_THIS; - - dp.cArgs = argc+1; + dp.cArgs = argc + 1; dp.cNamedArgs = 1; dp.rgdispidNamedArgs = &this_id; }else { @@ -2077,57 +2089,25 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W dp.rgdispidNamedArgs = NULL; } - if(dp.cArgs > ARRAY_SIZE(buf)) { - dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); - if(!dp.rgvarg) { - if(dispex) - IDispatchEx_Release(dispex); - return E_OUTOFMEMORY; - } - }else { - dp.rgvarg = buf; - } - - for(i=0; i<argc; i++) { - hres = jsval_to_variant(argv[i], dp.rgvarg+dp.cArgs-i-1); - if(FAILED(hres)) { - while(i--) - VariantClear(dp.rgvarg+dp.cArgs-i-1); - if(dp.rgvarg != buf) - heap_free(dp.rgvarg); - if(dispex) - IDispatchEx_Release(dispex); - return hres; - } - } - if(jsthis) { - V_VT(dp.rgvarg) = VT_DISPATCH; - V_DISPATCH(dp.rgvarg) = jsthis; - } + if(argc > ARRAY_SIZE(buf) && !(args = heap_alloc(argc * sizeof(VARIANT)))) + return E_OUTOFMEMORY; + dp.rgvarg = args; - V_VT(&retv) = VT_EMPTY; - clear_ei(ctx); - if(dispex) { - hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, ctx->lcid, flags, &dp, r ? &retv : NULL, &ctx->ei.ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - }else { - UINT err = 0; + V_VT(dp.rgvarg) = VT_DISPATCH; + V_DISPATCH(dp.rgvarg) = jsthis; - if(flags == DISPATCH_CONSTRUCT) { - WARN("IDispatch cannot be constructor\n"); - return DISP_E_MEMBERNOTFOUND; - } + for(i=0; SUCCEEDED(hres) && i < argc; i++) + hres = jsval_to_variant(argv[i], dp.rgvarg+dp.cArgs-i-1); - hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, ctx->lcid, flags, &dp, r ? &retv : NULL, &ctx->ei.ei, &err); + if(SUCCEEDED(hres)) { + V_VT(&retv) = VT_EMPTY; + hres = disp_invoke(ctx, disp, DISPID_VALUE, flags, &dp, r ? &retv : NULL); } - for(i=0; i<argc; i++) - VariantClear(dp.rgvarg+dp.cArgs-i-1); - if(dp.rgvarg != buf) - heap_free(dp.rgvarg); - if(FAILED(hres)) - return hres; + for(i = 0; i < argc&&0; i++) + VariantClear(dp.rgvarg + dp.cArgs - i - 1); + if(args != buf) + heap_free(args); if(!r) return S_OK; @@ -2185,7 +2165,6 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) DWORD flags = DISPATCH_PROPERTYPUT; VARIANT var; DISPPARAMS dp = {&var, &dispid, 1, 1}; - IDispatchEx *dispex; hres = jsval_to_variant(val, &var); if(FAILED(hres)) @@ -2194,19 +2173,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) if(V_VT(&var) == VT_DISPATCH) flags |= DISPATCH_PROPERTYPUTREF; - clear_ei(ctx); - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, &dp, NULL, &ctx->ei.ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - }else { - ULONG err = 0; - - TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, &dp, NULL, &ctx->ei.ei, &err); - } - + hres = disp_invoke(ctx, disp, id, flags, &dp, NULL); VariantClear(&var); } @@ -2266,7 +2233,6 @@ HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, jsval_t *val) HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val) { DISPPARAMS dp = {NULL,NULL,0,0}; - IDispatchEx *dispex; jsdisp_t *jsdisp; VARIANT var; HRESULT hres; @@ -2279,23 +2245,11 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val } V_VT(&var) = VT_EMPTY; - clear_ei(ctx); - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + hres = disp_invoke(ctx, disp, id, INVOKE_PROPERTYGET, &dp, &var); if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, INVOKE_PROPERTYGET, &dp, &var, &ctx->ei.ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - }else { - ULONG err = 0; - - TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, INVOKE_PROPERTYGET, &dp, &var, &ctx->ei.ei, &err); + hres = variant_to_jsval(&var, val); + VariantClear(&var); } - if(FAILED(hres)) - return hres; - - hres = variant_to_jsval(&var, val); - VariantClear(&var); return hres; }

1 0

Jacek Caban : jscript: Store source context and starting line in bytecode_t.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: ba500a6a9ef59d1410ad8d1c01147a3022e8ddd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba500a6a9ef59d1410ad8d1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:49:58 2020 +0100 jscript: Store source context and starting line in bytecode_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 10 ++++++---- dlls/jscript/engine.h | 4 +++- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 7 ++++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a96adb235c..f1e005a6d3 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2258,7 +2258,7 @@ void release_bytecode(bytecode_t *code) heap_free(code); } -static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) +static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source, UINT64 source_context, unsigned start_line) { size_t len = source ? lstrlenW(source) : 0; @@ -2270,6 +2270,8 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) return E_OUTOFMEMORY; compiler->code->ref = 1; + compiler->code->source_context = source_context; + compiler->code->start_line = start_line; heap_pool_init(&compiler->code->heap); compiler->code->source = heap_alloc((len + 1) * sizeof(WCHAR)); @@ -2482,13 +2484,13 @@ static HRESULT compile_arguments(compiler_ctx_t *ctx, const WCHAR *args) return parse_arguments(ctx, args, ctx->code->global_code.params, NULL); } -HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *args, const WCHAR *delimiter, - BOOL from_eval, BOOL use_decode, bytecode_t **ret) +HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_context, unsigned start_line, + const WCHAR *args, const WCHAR *delimiter, BOOL from_eval, BOOL use_decode, bytecode_t **ret) { compiler_ctx_t compiler = {0}; HRESULT hres; - hres = init_code(&compiler, code); + hres = init_code(&compiler, code, source_context, start_line); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d158a8b51a..c5ed3c7690 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -182,6 +182,8 @@ struct _bytecode_t { function_code_t global_code; WCHAR *source; + UINT64 source_context; + unsigned start_line; BSTR *bstr_pool; unsigned bstr_pool_size; @@ -194,7 +196,7 @@ struct _bytecode_t { struct list entry; }; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; static inline bytecode_t *bytecode_addref(bytecode_t *code) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 52c12676dc..e5701835b0 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -984,7 +984,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg if(FAILED(hres)) return hres; - hres = compile_script(ctx, str, NULL, NULL, FALSE, FALSE, &code); + hres = compile_script(ctx, str, 0, 0, NULL, NULL, FALSE, FALSE, &code); heap_free(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2f7dbcd53f..bd1f45b940 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -204,7 +204,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a return E_OUTOFMEMORY; TRACE("parsing %s\n", debugstr_jsval(argv[0])); - hres = compile_script(ctx, src, NULL, NULL, TRUE, FALSE, &code); + hres = compile_script(ctx, src, 0, 0, NULL, NULL, TRUE, FALSE, &code); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_jsval(argv[0]), hres); return throw_syntax_error(ctx, hres, NULL); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 5b6fe3ecca..f9c2430a2b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -774,8 +774,8 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, NULL, pstrDelimiter, (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, - This->is_encode, &code); + hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLine, NULL, pstrDelimiter, + (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, This->is_encode, &code); if(FAILED(hres)) return hres; @@ -871,7 +871,8 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, pstrFormalParams, pstrDelimiter, FALSE, This->is_encode, &code); + hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLineNumber, pstrFormalParams, + pstrDelimiter, FALSE, This->is_encode, &code); if(FAILED(hres)) { WARN("Parse failed %08x\n", hres); return hres;

1 0

Giovanni Mascellani : d2d1: Do not fill hollow figures.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: b728b2ff5f0870bc4ae0023dc79f13855f41cff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b728b2ff5f0870bc4ae0023d… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:40 2020 +0330 d2d1: Do not fill hollow figures. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 1 + dlls/d2d1/geometry.c | 14 ++++++++++---- dlls/d2d1/tests/d2d1.c | 8 ++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 64b3041b2c..0d10ac3e13 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -942,6 +942,7 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t if (geometry->fill.bezier_vertex_count) { buffer_desc.ByteWidth = geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices); + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.bezier_vertices; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 2a1fbf5f7c..6e1c648707 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1548,6 +1548,9 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge { figure = &geometry->u.path.figures[i]; + if (figure->flags & D2D_FIGURE_FLAG_HOLLOW) + continue; + /* Degenerate figure. */ if (figure->vertex_count < 2) continue; @@ -2011,6 +2014,8 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) for (i = 0, vertex_count = 0; i < geometry->u.path.figure_count; ++i) { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; vertex_count += geometry->u.path.figures[i].vertex_count; } @@ -2025,6 +2030,8 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; memcpy(&vertices[j], geometry->u.path.figures[i].vertices, geometry->u.path.figures[i].vertex_count * sizeof(*vertices)); j += geometry->u.path.figures[i].vertex_count; @@ -2455,9 +2462,6 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i return; } - if (figure_begin != D2D1_FIGURE_BEGIN_FILLED) - FIXME("Ignoring figure_begin %#x.\n", figure_begin); - if (!d2d_path_geometry_add_figure(geometry)) { ERR("Failed to add figure.\n"); @@ -2620,7 +2624,7 @@ static BOOL d2d_geometry_get_bezier_segment_idx(struct d2d_geometry *geometry, s { struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; - if (!figure->bezier_control_count) + if (!figure->bezier_control_count || figure->flags & D2D_FIGURE_FLAG_HOLLOW) continue; for (; idx->vertex_idx < figure->vertex_count; ++idx->vertex_idx) @@ -2816,6 +2820,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) for (i = 0; i < geometry->u.path.figure_count; ++i) { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 52618858d2..b15ac4f25b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7480,13 +7480,13 @@ static void test_fill_geometry(void) ID2D1TransformedGeometry_Release(transformed_geometry[0]); match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, "gMgB"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 0, 320, 160, 0xff652e89, 0, "gJAD"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 160, 160, 320, 0xff652e89, 0, "gJAD"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 160, 320, 320, 0xff652e89, 0, "gKAG"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt);

1 0

Giovanni Mascellani : d2d1/tests: Check that hollow figures are not filled.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 7065819956a00e799764b29d24975b6759c7672f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7065819956a00e799764b29d… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:39 2020 +0330 d2d1/tests: Check that hollow figures are not filled. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d07c8a4eb9..52618858d2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7410,6 +7410,84 @@ static void test_fill_geometry(void) "sQIMswILtQIIhs4B"); ok(match, "Figure does not match.\n"); + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + + set_point(&point, -0.402914f, 0.915514f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); + quadratic_to(sink, -0.310379f, 0.882571f, -0.116057f, 0.824000f); + quadratic_to(sink, 0.008350f, 0.693614f, -0.052343f, 0.448886f); + quadratic_to(sink, -0.154236f, 0.246072f, -0.279229f, 0.025343f); + quadratic_to(sink, -0.370064f, -0.588586f, -0.383029f, -0.924114f); + quadratic_to(sink, -0.295479f, -0.958764f, -0.017086f, -0.988400f); + quadratic_to(sink, 0.208836f, -0.954157f, 0.272200f, -0.924114f); + quadratic_to(sink, 0.295614f, -0.569071f, 0.230143f, 0.022886f); + quadratic_to(sink, 0.101664f, 0.220643f, 0.012057f, 0.451571f); + quadratic_to(sink, -0.028764f, 0.709014f, 0.104029f, 0.833943f); + quadratic_to(sink, 0.319414f, 0.913057f, 0.403229f, 0.942628f); + quadratic_to(sink, 0.317721f, 1.023450f, -0.017086f, 1.021771f); + quadratic_to(sink, -0.310843f, 1.007472f, -0.402914f, 0.915514f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 160.0f); + scale_matrix(&matrix, 20.0f, 80.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, + (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 160.0f, 640.0f); + scale_matrix(&matrix, 40.0f, 160.0f); + rotate_matrix(&matrix, M_PI / -5.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, + (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.5f, 1.0f); + translate_matrix(&matrix, -80.0f, 0.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, + (ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_matrix_identity(&matrix); + rotate_matrix(&matrix, M_PI / 2.0f); + translate_matrix(&matrix, 80.0f, -320.0f); + scale_matrix(&matrix, 2.0f, 0.25f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, + (ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[0], (ID2D1Brush *)brush, NULL); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[1], (ID2D1Brush *)brush, NULL); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[2], (ID2D1Brush *)brush, NULL); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry[3], (ID2D1Brush *)brush, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ID2D1TransformedGeometry_Release(transformed_geometry[3]); + ID2D1TransformedGeometry_Release(transformed_geometry[2]); + ID2D1TransformedGeometry_Release(transformed_geometry[1]); + ID2D1TransformedGeometry_Release(transformed_geometry[0]); + + match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, "gMgB"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 160, 0, 320, 160, 0xff652e89, 0, "gJAD"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 0, 160, 160, 320, 0xff652e89, 0, "gJAD"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 160, 160, 320, 320, 0xff652e89, 0, "gKAG"); + todo_wine ok(match, "Figure does not match.\n"); + ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt); refcount = ID2D1Factory_Release(factory);

1 0

Giovanni Mascellani : d2d1/tests: Add geometry filling tests.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: cf94f774048a449d69720a035c425a3211ea405c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf94f774048a449d69720a03… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:38 2020 +0330 d2d1/tests: Add geometry filling tests. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 737 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 737 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf94f774048a449d6972…

1 0