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