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

Zebediah Figura : ddraw: Update the primary stateblock in d3d_device3_SetTransform() and d3d_device3_MultiplyTransform().
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: b41af695c3302962d6e53e8b87f62dcab055ffca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41af695c3302962d6e53e8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:24:45 2020 -0600 ddraw: Update the primary stateblock in d3d_device3_SetTransform() and d3d_device3_MultiplyTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f19d81ccea..69a2767f90 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3193,6 +3193,8 @@ static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface, wined3d_mutex_lock(); multiply_matrix(&projection, &device->legacy_clipspace, matrix); + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); device->legacy_projection = *matrix; @@ -3404,6 +3406,8 @@ static HRESULT WINAPI d3d_device3_MultiplyTransform(IDirect3DDevice3 *iface, wined3d_mutex_lock(); multiply_matrix(&tmp, &device->legacy_projection, matrix); multiply_matrix(&projection, &device->legacy_clipspace, &tmp); + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); device->legacy_projection = tmp;

1 0

Zebediah Figura : ddraw: Update the primary stateblock in d3d_device3_SetRenderState().
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 5d28b4224e3c1ed6b528c414e9e109378b34b91f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d28b4224e3c1ed6b528c414… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:24:47 2020 -0600 ddraw: Update the primary stateblock in d3d_device3_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 60 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 69a2767f90..725a935022 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2688,6 +2688,13 @@ static HRESULT WINAPI d3d_device7_SetRenderState_FPUPreserve(IDirect3DDevice7 *i return hr; } +static void d3d_device_set_texture_stage_state(struct d3d_device *device, + UINT stage, enum wined3d_texture_stage_state state, DWORD value) +{ + wined3d_stateblock_set_texture_stage_state(device->state, stage, state, value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, state, value); +} + static void fixup_texture_alpha_op(struct d3d_device *device) { /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. @@ -2711,7 +2718,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device) } /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, tex_alpha ? WINED3D_TOP_SELECT_ARG1 : WINED3D_TOP_SELECT_ARG2); } @@ -2757,6 +2764,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, if (value == 0) { + wined3d_stateblock_set_texture(device->state, 0, NULL); wined3d_device_set_texture(device->wined3d_device, 0, NULL); hr = D3D_OK; break; @@ -2793,69 +2801,69 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, { fixup_texture_alpha_op(device); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE); break; } case D3DTBLEND_ADD: - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_ADD); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); break; case D3DTBLEND_MODULATEALPHA: - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_MODULATE); break; case D3DTBLEND_COPY: case D3DTBLEND_DECAL: - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_SELECT_ARG1); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); break; case D3DTBLEND_DECALALPHA: - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_BLEND_TEXTURE_ALPHA); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); break;

1 0

Giovanni Mascellani : d2d1/tests: Add tests for rounded rectangle drawing.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 66290bdc30addab14bb6031c64fd8a5f35de92c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66290bdc30addab14bb6031c… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:37 2020 +0330 d2d1/tests: Add tests for rounded rectangle drawing. 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 | 189 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66290bdc30addab14bb6…

1 0

Giovanni Mascellani : d2d1/tests: Test that hollow figures do not impact geometry bounds.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: fdd7604d72577a482955a343e3b3422310b1bf40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdd7604d72577a482955a343… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:41 2020 +0330 d2d1/tests: Test that hollow figures do not impact geometry bounds. 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 | 107 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fdd7604d72577a482955…

1 0

Jacek Caban : jscript: Use internal jsdisp calls only within the same script context.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 614ea7e6243ead003bcfe4624895154972f3445f URL: https://source.winehq.org/git/wine.git/?a=commit;h=614ea7e6243ead003bcfe462… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:49:53 2020 +0100 jscript: Use internal jsdisp calls only within the same script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6f9a0eb7f3..cd610e4e88 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1951,7 +1951,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns HRESULT hres; jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { + if(jsdisp && jsdisp->ctx == ctx) { if(flags & DISPATCH_PROPERTYPUT) { FIXME("disp_call(propput) on builtin object\n"); return E_FAIL; @@ -2046,7 +2046,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { + if(jsdisp && jsdisp->ctx == ctx) { if(ctx != jsdisp->ctx) flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); @@ -2170,7 +2170,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) HRESULT hres; jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { + if(jsdisp && jsdisp->ctx == ctx) { dispex_prop_t *prop; prop = get_prop(jsdisp, id); @@ -2272,7 +2272,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val HRESULT hres; jsdisp = iface_to_jsdisp(disp); - if(jsdisp) { + if(jsdisp && jsdisp->ctx == ctx) { hres = jsdisp_propget(jsdisp, id, val); jsdisp_release(jsdisp); return hres;

1 0

Jacek Caban : jscript: Use separated jsexcept_t instance for each external call.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 63683b42f7bfee16c1609815fbe56f281c4c216c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63683b42f7bfee16c1609815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 15:50:15 2020 +0100 jscript: Use separated jsexcept_t instance for each external call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 17 ++++++----- dlls/jscript/engine.c | 24 +++++---------- dlls/jscript/engine.h | 9 ++++++ dlls/jscript/error.c | 5 ++-- dlls/jscript/jscript.c | 79 ++++++++++++++++++++++++++++++++++--------------- dlls/jscript/jscript.h | 9 ++---- dlls/jscript/jsregexp.c | 4 +-- dlls/jscript/jsutils.c | 5 +++- 8 files changed, 91 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63683b42f7bfee16c160…

1 0

Giovanni Mascellani : d2d1: Ensure that hollow figures do not impact geometry bounds.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 722469254daec2093f3dc8bacb6474a20dc10dfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=722469254daec2093f3dc8ba… Author: Giovanni Mascellani <gio(a)debian.org> Date: Thu Jan 30 17:54:42 2020 +0330 d2d1: Ensure that hollow figures do not impact geometry bounds. 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/geometry.c | 25 ++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 8 ++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 6e1c648707..e7bb809359 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3097,10 +3097,22 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * if (!transform) { - if (geometry->u.path.bounds.left > geometry->u.path.bounds.right) + if (geometry->u.path.bounds.left > geometry->u.path.bounds.right + && !isinf(geometry->u.path.bounds.left)) { for (i = 0; i < geometry->u.path.figure_count; ++i) + { + if (geometry->u.path.figures[i].flags & D2D_FIGURE_FLAG_HOLLOW) + continue; d2d_rect_union(&geometry->u.path.bounds, &geometry->u.path.figures[i].bounds); + } + if (geometry->u.path.bounds.left > geometry->u.path.bounds.right) + { + geometry->u.path.bounds.left = INFINITY; + geometry->u.path.bounds.right = FLT_MAX; + geometry->u.path.bounds.top = INFINITY; + geometry->u.path.bounds.bottom = FLT_MAX; + } } *bounds = geometry->u.path.bounds; @@ -3115,6 +3127,9 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * D2D1_POINT_2F p, p1, p2; size_t j, bezier_idx; + if (figure->flags & D2D_FIGURE_FLAG_HOLLOW) + continue; + /* Single vertex figures are reduced by CloseFigure(). */ if (figure->vertex_count == 0) { @@ -3181,6 +3196,14 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * } } + if (bounds->left > bounds->right) + { + bounds->left = INFINITY; + bounds->right = FLT_MAX; + bounds->top = INFINITY; + bounds->bottom = FLT_MAX; + } + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 65233c26df..319246a0bc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3114,7 +3114,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, 5.0f, 472.0f, 75.0f, 752.0f, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); set_matrix_identity(&matrix); @@ -3124,7 +3124,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, 90.0f, 876.0f, 230.0f, 1016.0f, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); ID2D1PathGeometry_Release(geometry); @@ -3143,7 +3143,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); set_matrix_identity(&matrix); @@ -3153,7 +3153,7 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetBounds(geometry, &matrix, &rect); ok(SUCCEEDED(hr), "Failed to get geometry bounds, hr %#x.\n", hr); match = compare_rect(&rect, INFINITY, INFINITY, FLT_MAX, FLT_MAX, 0); - todo_wine ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); ID2D1PathGeometry_Release(geometry);

1 0

Zebediah Figura : ddraw: Update the primary stateblock in update_clip_space().
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 1907d01fab8a37db70cb03fe9076d5f1380fbb8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1907d01fab8a37db70cb03fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:24:46 2020 -0600 ddraw: Update the primary stateblock in update_clip_space(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 0a06329a69..1b7f778699 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -38,6 +38,8 @@ static void update_clip_space(struct d3d_device *device, D3DMATRIX projection; multiply_matrix(&projection, &clip_space, &device->legacy_projection); + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); device->legacy_clipspace = clip_space;

1 0

Zebediah Figura : ddraw: Update the primary stateblock in d3d_device1_SetMatrix().
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 703a290fcfd5505b67643554820c77aa46d16f90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=703a290fcfd5505b67643554… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:24:44 2020 -0600 ddraw: Update the primary stateblock in d3d_device1_SetMatrix(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0999c01cb2..f19d81ccea 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1332,18 +1332,19 @@ static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIX * *****************************************************************************/ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface, - D3DMATRIXHANDLE D3DMatHandle, D3DMATRIX *D3DMatrix) + D3DMATRIXHANDLE matrix_handle, D3DMATRIX *matrix) { - struct d3d_device *This = impl_from_IDirect3DDevice(iface); + struct d3d_device *device = impl_from_IDirect3DDevice(iface); D3DMATRIX *m; - TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, D3DMatHandle, D3DMatrix); + TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, matrix_handle, matrix); - if (!D3DMatrix) return DDERR_INVALIDPARAMS; + if (!matrix) + return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - m = ddraw_get_object(&This->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX); + m = ddraw_get_object(&device->handle_table, matrix_handle - 1, DDRAW_HANDLE_MATRIX); if (!m) { WARN("Invalid matrix handle.\n"); @@ -1352,21 +1353,33 @@ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface, } if (TRACE_ON(ddraw)) - dump_D3DMATRIX(D3DMatrix); + dump_D3DMATRIX(matrix); - *m = *D3DMatrix; + *m = *matrix; - if (D3DMatHandle == This->world) - wined3d_device_set_transform(This->wined3d_device, - WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)D3DMatrix); + if (matrix_handle == device->world) + { + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)matrix); + wined3d_device_set_transform(device->wined3d_device, + WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)matrix); + } - if (D3DMatHandle == This->view) - wined3d_device_set_transform(This->wined3d_device, - WINED3D_TS_VIEW, (struct wined3d_matrix *)D3DMatrix); + if (matrix_handle == device->view) + { + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_VIEW, (struct wined3d_matrix *)matrix); + wined3d_device_set_transform(device->wined3d_device, + WINED3D_TS_VIEW, (struct wined3d_matrix *)matrix); + } - if (D3DMatHandle == This->proj) - wined3d_device_set_transform(This->wined3d_device, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)D3DMatrix); + if (matrix_handle == device->proj) + { + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)matrix); + wined3d_device_set_transform(device->wined3d_device, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)matrix); + } wined3d_mutex_unlock();

1 0

Alexandre Julliard : widl: Also search the include dir relative to the binary path.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 90a543d3d75032405db6e363beae9418fdcef441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a543d3d75032405db6e363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:33:13 2020 +0100 widl: Also search the include dir relative to the binary path. Suggested by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/Makefile.in | 4 +++- tools/widl/widl.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 80a12601de..6c74e88d25 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,9 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -widl_EXTRADEFS = -DINCLUDEDIR=\"${includedir}\" +widl_EXTRADEFS = \ + -DINCLUDEDIR="\"${includedir}\"" \ + -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" EXTRALIBS = -lwpp diff --git a/tools/widl/widl.c b/tools/widl/widl.c index aa6697135b..a99eed4e9d 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -150,6 +150,7 @@ static char *idfile_name; char *temp_name; const char *prefix_client = ""; const char *prefix_server = ""; +static const char *includedir; int line_number = 1; @@ -572,6 +573,27 @@ void write_id_data(const statement_list_t *stmts) fclose(idfile); } +static void init_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *p, *dir; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( argv0, NULL ); +#endif + if (!dir) return; + if (!(p = strrchr( dir, '/' ))) return; + if (p == dir) p++; + *p = 0; + includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + free( dir ); +#endif +} + int main(int argc,char *argv[]) { int i, optc; @@ -585,6 +607,7 @@ int main(int argc,char *argv[]) #ifdef SIGHUP signal( SIGHUP, exit_on_signal ); #endif + init_argv0_dir( argv[0] ); now = time(NULL); @@ -751,6 +774,11 @@ int main(int argc,char *argv[]) { static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + if (includedir) + { + wpp_add_include_path( strmake( "%s/wine/msvcrt", includedir )); + wpp_add_include_path( strmake( "%s/wine/windows", includedir )); + } for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) { if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue;

1 0

Zebediah Figura : quartz/filesource: Use a completion port to handle asynchronous requests.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: abac070387f908f853f38eddc67206ff7c657ae2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abac070387f908f853f38edd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:56:59 2020 -0600 quartz/filesource: Use a completion port to handle asynchronous requests. Thus simplifying the code and allowing us to handle more than 63 at once. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 376 ++++++++++++++++------------------------- dlls/quartz/tests/filesource.c | 26 ++- 2 files changed, 173 insertions(+), 229 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=abac070387f908f853f3…

1 0

Zebediah Figura : quartz/filesource: Store the media type directly in the AsyncReader structure.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 506b8a59ee0b1f3820f581c64e6bb49267ee46c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506b8a59ee0b1f3820f581c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:57:01 2020 -0600 quartz/filesource: Store the media type directly in the AsyncReader structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 54 +++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index ea0ae8361e..2b7e9d58b1 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -62,7 +62,7 @@ typedef struct AsyncReader IAsyncReader IAsyncReader_iface; LPOLESTR pszFileName; - AM_MEDIA_TYPE *pmt; + AM_MEDIA_TYPE mt; ALLOCATOR_PROPERTIES allocProps; HANDLE file, port, io_thread; CRITICAL_SECTION sample_cs; @@ -359,6 +359,9 @@ static void async_reader_destroy(struct strmbase_filter *iface) filter->sample_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->sample_cs); strmbase_source_cleanup(&filter->source); + + CoTaskMemFree(filter->pszFileName); + FreeMediaType(&filter->mt); } PostQueuedCompletionStatus(filter->port, 0, 1, NULL); @@ -366,9 +369,6 @@ static void async_reader_destroy(struct strmbase_filter *iface) CloseHandle(filter->io_thread); CloseHandle(filter->port); - CoTaskMemFree(filter->pszFileName); - if (filter->pmt) - DeleteMediaType(filter->pmt); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); } @@ -446,7 +446,6 @@ HRESULT AsyncReader_create(IUnknown *outer, void **out) pAsyncRead->IAsyncReader_iface.lpVtbl = &FileAsyncReader_Vtbl; pAsyncRead->pszFileName = NULL; - pAsyncRead->pmt = NULL; InitializeCriticalSection(&pAsyncRead->sample_cs); pAsyncRead->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); @@ -502,7 +501,12 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi return HRESULT_FROM_WIN32(GetLastError()); } - free(This->pszFileName); + if (This->pszFileName) + { + free(This->pszFileName); + FreeMediaType(&This->mt); + } + if (!(This->pszFileName = wcsdup(pszFileName))) { CloseHandle(hFile); @@ -516,30 +520,26 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->flushing = FALSE; This->requests = NULL; - if (This->pmt) - DeleteMediaType(This->pmt); - - This->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); if (!pmt) { - CopyMediaType(This->pmt, &default_mt); - if (get_media_type(pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL)) + CopyMediaType(&This->mt, &default_mt); + if (get_media_type(pszFileName, &This->mt.majortype, &This->mt.subtype, NULL)) { TRACE("Found major type %s, subtype %s.\n", - debugstr_guid(&This->pmt->majortype), debugstr_guid(&This->pmt->subtype)); + debugstr_guid(&This->mt.majortype), debugstr_guid(&This->mt.subtype)); } } else - CopyMediaType(This->pmt, pmt); + CopyMediaType(&This->mt, pmt); return S_OK; } -static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR * ppszFileName, AM_MEDIA_TYPE * pmt) +static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter *iface, LPOLESTR *ppszFileName, AM_MEDIA_TYPE *mt) { AsyncReader *This = impl_from_IFileSourceFilter(iface); - - TRACE("%p->(%p, %p)\n", This, ppszFileName, pmt); + + TRACE("filter %p, filename %p, mt %p.\n", This, ppszFileName, mt); if (!ppszFileName) return E_POINTER; @@ -549,16 +549,14 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR { *ppszFileName = CoTaskMemAlloc((wcslen(This->pszFileName) + 1) * sizeof(WCHAR)); wcscpy(*ppszFileName, This->pszFileName); + if (mt) + CopyMediaType(mt, &This->mt); } else - *ppszFileName = NULL; - - if (pmt) { - if (This->pmt) - CopyMediaType(pmt, This->pmt); - else - ZeroMemory(pmt, sizeof(*pmt)); + *ppszFileName = NULL; + if (mt) + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); } return S_OK; @@ -588,12 +586,12 @@ static inline AsyncReader *impl_from_IAsyncReader(IAsyncReader *iface) return CONTAINING_RECORD(iface, AsyncReader, IAsyncReader_iface); } -static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { AsyncReader *filter = impl_from_strmbase_pin(iface); - if (IsEqualGUID(&pmt->majortype, &filter->pmt->majortype) && - IsEqualGUID(&pmt->subtype, &filter->pmt->subtype)) + if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) + && IsEqualGUID(&mt->subtype, &filter->mt.subtype)) return S_OK; return S_FALSE; @@ -607,7 +605,7 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int in return VFW_S_NO_MORE_ITEMS; if (index == 0) - CopyMediaType(mt, filter->pmt); + CopyMediaType(mt, &filter->mt); else if (index == 1) CopyMediaType(mt, &default_mt); return S_OK;

1 0

Zebediah Figura : qcap/tests: Expand tests for smart tee aggregation.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: d01e30052e2e1525532699aecd579952f4354a34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01e30052e2e1525532699ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:57:02 2020 -0600 qcap/tests: Expand tests for smart tee aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 111 +++++++++++++++++++++++++++++++++------ 1 file changed, 95 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 014c6ee2d1..7a49150cc2 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -135,6 +135,100 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_AviDest, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_AviDest, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + static void test_enum_pins(void) { IBaseFilter *filter = create_smart_tee(); @@ -2211,21 +2305,6 @@ static void test_unconnected_filter_state(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_smart_tee_filter_aggregation(void) -{ - SourceFilter *sourceFilter = create_video_SourceFilter(); - if (sourceFilter) { - IUnknown *unknown = NULL; - HRESULT hr = CoCreateInstance(&CLSID_SmartTee, (IUnknown*)&sourceFilter->IBaseFilter_iface, - CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unknown); - ok(SUCCEEDED(hr), "SmartTee filter doesn't support aggregation, hr=0x%08x\n", hr); - if (unknown) - IUnknown_Release(unknown); - IBaseFilter_Release(&sourceFilter->IBaseFilter_iface); - } else - ok(0, "out of memory allocating SourceFilter for test\n"); -} - static HRESULT get_connected_filter_classid(IPin *pin, GUID *guid) { IPin *connectedPin = NULL; @@ -2434,13 +2513,13 @@ START_TEST(smartteefilter) event = CreateEventW(NULL, FALSE, FALSE, NULL); test_interfaces(); + test_aggregation(); test_enum_pins(); test_find_pin(); test_pin_info(); test_enum_media_types(); test_unconnected_filter_state(); - test_smart_tee_filter_aggregation(); test_smart_tee_filter(); test_audio_smart_tee_filter_auto_insertion(test_audio_preview);

1 0

Zebediah Figura : quartz/filesource: Clean up FileAsyncReader_RequestAllocator().
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 58b60edf53cc442528f7ad7e97ee7a7aab666b10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b60edf53cc442528f7ad7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:57:00 2020 -0600 quartz/filesource: Clean up FileAsyncReader_RequestAllocator(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 102 ++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 68 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 7ea67ccc12..ea0ae8361e 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -353,7 +353,7 @@ static void async_reader_destroy(struct strmbase_filter *iface) { for (i = 0; i < filter->max_requests; ++i) CloseHandle(filter->requests[i].ovl.hEvent); - CoTaskMemFree(filter->requests); + free(filter->requests); } CloseHandle(filter->file); filter->sample_cs.DebugInfo->Spare[0] = 0; @@ -702,88 +702,54 @@ static ULONG WINAPI FileAsyncReader_Release(IAsyncReader * iface) return IPin_Release(&filter->source.pin.IPin_iface); } -#define DEF_ALIGNMENT 1 - -static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMemAllocator * pPreferred, ALLOCATOR_PROPERTIES * pProps, IMemAllocator ** ppActual) +static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader *iface, + IMemAllocator *preferred, ALLOCATOR_PROPERTIES *props, IMemAllocator **ret_allocator) { - AsyncReader *This = impl_from_IAsyncReader(iface); - HRESULT hr = S_OK; - - TRACE("%p->(%p, %p, %p)\n", This, pPreferred, pProps, ppActual); + AsyncReader *filter = impl_from_IAsyncReader(iface); + IMemAllocator *allocator; + unsigned int i; + HRESULT hr; - if (!pProps->cbAlign || (pProps->cbAlign % DEF_ALIGNMENT) != 0) - pProps->cbAlign = DEF_ALIGNMENT; + TRACE("filter %p, preferred %p, props %p, ret_allocator %p.\n", filter, preferred, props, ret_allocator); - if (pPreferred) - { - hr = IMemAllocator_SetProperties(pPreferred, pProps, pProps); - /* FIXME: check we are still aligned */ - if (SUCCEEDED(hr)) - { - IMemAllocator_AddRef(pPreferred); - *ppActual = pPreferred; - TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr); - goto done; - } - } + if (!props->cbAlign) + props->cbAlign = 1; - pPreferred = NULL; + *ret_allocator = NULL; - hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC, &IID_IMemAllocator, (LPVOID *)&pPreferred); + if (preferred) + IMemAllocator_AddRef(allocator = preferred); + else if (FAILED(hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC, &IID_IMemAllocator, (void **)&allocator))) + return hr; - if (SUCCEEDED(hr)) + if (FAILED(hr = IMemAllocator_SetProperties(allocator, props, props))) { - hr = IMemAllocator_SetProperties(pPreferred, pProps, pProps); - /* FIXME: check we are still aligned */ - if (SUCCEEDED(hr)) - { - *ppActual = pPreferred; - TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr); - } + IMemAllocator_Release(allocator); + return hr; } -done: - if (SUCCEEDED(hr)) + if (filter->requests) { - if (This->requests) - { - unsigned int i; - - for (i = 0; i < This->max_requests; ++i) - CloseHandle(This->requests[i].ovl.hEvent); - CoTaskMemFree(This->requests); - } - - This->max_requests = pProps->cBuffers; - TRACE("Maximum request count: %u.\n", This->max_requests); - This->requests = CoTaskMemAlloc(sizeof(This->requests[0]) * pProps->cBuffers); - - if (This->requests) - { - int x; - ZeroMemory(This->requests, sizeof(This->requests[0]) * pProps->cBuffers); - for (x = 0; x < This->max_requests; ++x) - This->requests[x].ovl.hEvent = CreateEventW(NULL, 0, 0, NULL); - This->allocProps = *pProps; - } - else - { - hr = E_OUTOFMEMORY; - CoTaskMemFree(This->requests); - This->max_requests = 0; - This->requests = NULL; - } + for (i = 0; i < filter->max_requests; ++i) + CloseHandle(filter->requests[i].ovl.hEvent); + free(filter->requests); } - if (FAILED(hr)) + filter->max_requests = props->cBuffers; + TRACE("Maximum request count: %u.\n", filter->max_requests); + if (!(filter->requests = calloc(filter->max_requests, sizeof(filter->requests[0])))) { - *ppActual = NULL; - if (pPreferred) - IMemAllocator_Release(pPreferred); + IMemAllocator_Release(allocator); + return E_OUTOFMEMORY; } - TRACE("-- %x\n", hr); - return hr; + for (i = 0; i < filter->max_requests; ++i) + filter->requests[i].ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + filter->allocProps = *props; + + *ret_allocator = allocator; + return S_OK; } static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample *sample, DWORD_PTR cookie)

1 0

Zebediah Figura : quartz: Trace the requested properties in IMemAllocator::SetProperties().
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: f78975ba28c326c60e9d2a8834c35b446d0b1de0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f78975ba28c326c60e9d2a88… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:57:03 2020 -0600 quartz: Trace the requested properties in IMemAllocator::SetProperties(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 5ac8a72a81..2f5855e95b 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -166,6 +166,9 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO TRACE("(%p)->(%p, %p)\n", This, pRequest, pActual); + TRACE("Requested %d buffers, size %d, alignment %d, prefix %d.\n", + pRequest->cBuffers, pRequest->cbBuffer, pRequest->cbAlign, pRequest->cbPrefix); + EnterCriticalSection(This->pCritSect); { if (!list_empty(&This->used_list))

1 0

Alexandre Julliard : winegcc: Also search the include and lib dirs relative to the binary path.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 69a9c2be7295b2e79e428f604a35c4ccc7f809b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69a9c2be7295b2e79e428f60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:49:49 2020 +0100 winegcc: Also search the include and lib dirs relative to the binary path. Suggested by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/Makefile.in | 3 ++- tools/winegcc/winegcc.c | 54 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index daeb91be1e..0d94eed5ff 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -10,8 +10,9 @@ C_SRCS = \ winegcc_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ - -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ + -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" \ + -DBIN_TO_LIBDIR=\"`$(MAKEDEP) -R ${bindir} ${libdir}`\" \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a335332225..c6bd444fa3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -145,6 +145,10 @@ static strarray* tmp_files; static sigset_t signal_mask; #endif +static const char *bindir; +static const char *libdir; +static const char *includedir; + enum processor { proc_cc, proc_cxx, proc_cpp, proc_as }; static const struct @@ -532,7 +536,7 @@ static const char *get_multiarch_dir( enum target_cpu cpu ) static char *get_lib_dir( struct options *opts ) { - static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; + const char *stdlibpath[] = { libdir, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char libwine[] = "/libwine.so"; const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; const char *root = opts->sysroot ? opts->sysroot : ""; @@ -548,8 +552,12 @@ static char *get_lib_dir( struct options *opts ) for (i = 0; i < ARRAY_SIZE(stdlibpath); i++) { - char *p, *buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + - strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); + const char *root = (i && opts->sysroot) ? opts->sysroot : ""; + char *p, *buffer; + + if (!stdlibpath[i]) continue; + buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); @@ -621,6 +629,28 @@ static char *get_lib_dir( struct options *opts ) return strmake( "%s%s", root, LIBDIR ); } +static void init_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *p, *dir; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( argv0, NULL ); +#endif + if (!dir) return; + if (!(p = strrchr( dir, '/' ))) return; + if (p == dir) p++; + *p = 0; + bindir = dir; + includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + libdir = strmake( "%s/%s", dir, BIN_TO_LIBDIR ); +#endif +} + static void compile(struct options* opts, const char* lang) { strarray* comp_args = strarray_alloc(); @@ -772,23 +802,28 @@ no_compat_defines: { const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; + const char *isystem = gcc_defs ? "-isystem" : "-I"; if (opts->use_msvcrt) { + if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/msvcrt", isystem, includedir )); for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", - gcc_defs ? "-isystem" : "-I", root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", isystem, root, incl_dirs[j] )); } strarray_add(comp_args, "-D__MSVCRT__"); } + if (includedir) + { + strarray_add( comp_args, strmake( "-I%s", includedir )); + strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); + } for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; strarray_add(comp_args, strmake( "-I%s%s", root, incl_dirs[j] )); - strarray_add(comp_args, strmake( "%s%s%s/wine/windows", - gcc_defs ? "-isystem" : "-I", root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); } } else if (opts->wine_objdir) @@ -830,6 +865,8 @@ static strarray *get_winebuild_args(struct options *opts) binary = opts->winebuild; else if (opts->wine_objdir) binary = strmake( "%s/tools/winebuild/winebuild%s", opts->wine_objdir, EXEEXT ); + else if (bindir) + binary = strmake( "%s/winebuild%s", bindir, EXEEXT ); else binary = find_binary( opts->prefix, winebuild ? winebuild : "winebuild" ); strarray_add( spec_args, binary ); @@ -1427,11 +1464,12 @@ int main(int argc, char **argv) sigaddset( &signal_mask, SIGTERM ); sigaddset( &signal_mask, SIGINT ); #endif + init_argv0_dir( argv[0] ); /* setup tmp file removal at exit */ tmp_files = strarray_alloc(); atexit(clean_temp_files); - + /* initialize options */ memset(&opts, 0, sizeof(opts)); opts.target_cpu = build_cpu;

1 0

Alexandre Julliard : wrc: Also search the include dir relative to the binary path.
by Alexandre Julliard Jan. 30, 2020

Jan. 30, 2020

Module: wine Branch: master Commit: 5417826caa984f8eec3e85282f43235502bce3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5417826caa984f8eec3e8528… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:30:13 2020 +0100 wrc: Also search the include dir relative to the binary path. Suggested by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 4 +++- tools/wrc/wrc.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index d502e4b7da..c81276ebc6 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,7 +15,9 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" +wrc_EXTRADEFS = \ + -DINCLUDEDIR="\"${includedir}\"" \ + -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 014b177291..d171bfa2ef 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -154,6 +154,8 @@ static char *output_name; /* The name given by the -o option */ char *input_name = NULL; /* The name given on the command-line */ static char *temp_name = NULL; /* Temporary file for preprocess pipe */ +static const char *includedir; + int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ @@ -327,6 +329,27 @@ static void set_target( const char *target ) free( cpu ); } +static void init_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *p, *dir; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( argv0, NULL ); +#endif + if (!dir) return; + if (!(p = strrchr( dir, '/' ))) return; + if (p == dir) p++; + *p = 0; + includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + free( dir ); +#endif +} + int main(int argc,char *argv[]) { int optc; @@ -347,6 +370,7 @@ int main(int argc,char *argv[]) #ifdef SIGHUP signal( SIGHUP, exit_on_signal ); #endif + init_argv0_dir( argv[0] ); /* Set the default defined stuff */ set_version_defines(); @@ -508,6 +532,11 @@ int main(int argc,char *argv[]) { static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + if (includedir) + { + wpp_add_include_path( strmake( "%s/wine/msvcrt", includedir )); + wpp_add_include_path( strmake( "%s/wine/windows", includedir )); + } for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) { if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue;

1 0

Alistair Leslie-Hughes : include: Add xact3wb.h.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 1bb953c6766c9cc4372ca23a7c5b7de101324218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb953c6766c9cc4372ca23a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 29 04:24:58 2020 +0000 include: Add xact3wb.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/xact3wb.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 8284d6fdf3..b1e7d0084f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -772,6 +772,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3wb.h \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3wb.h b/include/xact3wb.h new file mode 100644 index 0000000000..b4c5a53d40 --- /dev/null +++ b/include/xact3wb.h @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __XACT3WB_H__ +#define __XACT3WB_H__ + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } DUMMYSTRUCTNAME; + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKENTRY +{ + union + { + struct + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } DUMMYSTRUCTNAME; + DWORD dwFlagsAndDuration; + } DUMMYUNIONNAME; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +#endif /* __XACT3WB_H__ */

1 0

Nikolay Sivov : ole32: Add a helper to create antimoniker of specific order.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 2a93a8ada88c4be0e8057b8a20e509aa9d3a9951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a93a8ada88c4be0e8057b8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 16:57:02 2020 +0300 ole32: Add a helper to create antimoniker of specific order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 77 ++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 48 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 5bce4fc5da..93d6ab9d56 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -30,6 +30,7 @@ #include "winerror.h" #include "objbase.h" #include "wine/debug.h" +#include "wine/heap.h" #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -38,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef struct AntiMonikerImpl{ IMoniker IMoniker_iface; IROTData IROTData_iface; - LONG ref; + LONG refcount; IUnknown *pMarshal; /* custom marshaler */ DWORD count; } AntiMonikerImpl; @@ -103,37 +104,33 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) /****************************************************************************** * AntiMoniker_AddRef ******************************************************************************/ -static ULONG WINAPI -AntiMonikerImpl_AddRef(IMoniker* iface) +static ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker *iface) { - AntiMonikerImpl *This = impl_from_IMoniker(iface); + AntiMonikerImpl *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; } /****************************************************************************** * AntiMoniker_Release ******************************************************************************/ -static ULONG WINAPI -AntiMonikerImpl_Release(IMoniker* iface) +static ULONG WINAPI AntiMonikerImpl_Release(IMoniker *iface) { - AntiMonikerImpl *This = impl_from_IMoniker(iface); - ULONG ref; - - TRACE("(%p)\n",This); + AntiMonikerImpl *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 to it */ - if (ref == 0) + if (!refcount) { - if (This->pMarshal) IUnknown_Release(This->pMarshal); - HeapFree(GetProcessHeap(),0,This); + if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); + heap_free(moniker); } - return ref; + return refcount; } /****************************************************************************** @@ -610,20 +607,20 @@ static const IROTDataVtbl VT_ROTDataImpl = AntiMonikerROTDataImpl_GetComparisonData }; -/****************************************************************************** - * AntiMoniker_Construct (local function) - *******************************************************************************/ -static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) +static HRESULT create_anti_moniker(DWORD order, IMoniker **ret) { + AntiMonikerImpl *moniker; + + moniker = heap_alloc_zero(sizeof(*moniker)); + if (!moniker) + return E_OUTOFMEMORY; - TRACE("(%p)\n",This); + moniker->IMoniker_iface.lpVtbl = &VT_AntiMonikerImpl; + moniker->IROTData_iface.lpVtbl = &VT_ROTDataImpl; + moniker->refcount = 1; + moniker->count = order; - /* Initialize the virtual function table. */ - This->IMoniker_iface.lpVtbl = &VT_AntiMonikerImpl; - This->IROTData_iface.lpVtbl = &VT_ROTDataImpl; - This->ref = 0; - This->pMarshal = NULL; - This->count = 1; + *ret = &moniker->IMoniker_iface; return S_OK; } @@ -631,27 +628,11 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) /****************************************************************************** * CreateAntiMoniker [OLE32.@] ******************************************************************************/ -HRESULT WINAPI CreateAntiMoniker(IMoniker **ppmk) +HRESULT WINAPI CreateAntiMoniker(IMoniker **moniker) { - AntiMonikerImpl* newAntiMoniker; - HRESULT hr; - - TRACE("(%p)\n",ppmk); - - newAntiMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(AntiMonikerImpl)); - - if (newAntiMoniker == 0) - return STG_E_INSUFFICIENTMEMORY; - - hr = AntiMonikerImpl_Construct(newAntiMoniker); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(),0,newAntiMoniker); - return hr; - } + TRACE("%p.\n", moniker); - return AntiMonikerImpl_QueryInterface(&newAntiMoniker->IMoniker_iface, &IID_IMoniker, - (void**)ppmk); + return create_anti_moniker(1, moniker); } HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface,

1 0

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

Jan. 29, 2020

Module: wine Branch: master Commit: c94b31ee91804c90eba3fc83194a42265b24e695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94b31ee91804c90eba3fc83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 16:57:03 2020 +0300 ole32: Fix (pointer moniker + antimoniker) composing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 17 ++++++++++++++++- dlls/ole32/moniker.h | 2 ++ dlls/ole32/pointermoniker.c | 15 ++++++++------- dlls/ole32/tests/moniker.c | 6 +----- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 93d6ab9d56..6efd4ae853 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -56,6 +56,21 @@ static inline AntiMonikerImpl *impl_from_IROTData(IROTData *iface) static AntiMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); +BOOL is_anti_moniker(IMoniker *iface, DWORD *order) +{ + AntiMonikerImpl *moniker = unsafe_impl_from_IMoniker(iface); + + if (!moniker) + { + *order = 0; + return FALSE; + } + + *order = moniker->count; + + return TRUE; +} + /******************************************************************************* * AntiMoniker_QueryInterface *******************************************************************************/ @@ -607,7 +622,7 @@ static const IROTDataVtbl VT_ROTDataImpl = AntiMonikerROTDataImpl_GetComparisonData }; -static HRESULT create_anti_moniker(DWORD order, IMoniker **ret) +HRESULT create_anti_moniker(DWORD order, IMoniker **ret) { AntiMonikerImpl *moniker; diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index eaeed54a4e..995e0459e5 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -48,5 +48,7 @@ HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer) DECLSPEC_HIDDEN; +BOOL is_anti_moniker(IMoniker *iface, DWORD *order) DECLSPEC_HIDDEN; +HRESULT create_anti_moniker(DWORD order, IMoniker **ret) DECLSPEC_HIDDEN; #endif /* __WINE_MONIKER_H__ */ diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 2cb0600336..a16a56a098 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -262,7 +262,7 @@ PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, { HRESULT res=S_OK; - DWORD mkSys,mkSys2; + DWORD mkSys,mkSys2, order; IEnumMoniker* penumMk=0; IMoniker *pmostLeftMk=0; IMoniker* tempMkComposite=0; @@ -274,15 +274,15 @@ PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, *ppmkComposite=0; - IMoniker_IsSystemMoniker(pmkRight,&mkSys); - - /* If pmkRight is an anti-moniker, the returned moniker is NULL */ - if(mkSys==MKSYS_ANTIMONIKER) - return res; - + if (is_anti_moniker(pmkRight, &order)) + { + return order > 1 ? create_anti_moniker(order - 1, ppmkComposite) : S_OK; + } else + { /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ + IMoniker_IsSystemMoniker(pmkRight,&mkSys); if(mkSys==MKSYS_GENERICCOMPOSITE){ @@ -326,6 +326,7 @@ PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, else return MK_E_NEEDGENERIC; + } } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index f5f69870bf..61aa0b4a96 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3072,13 +3072,9 @@ todo_wine anti = create_antimoniker(2); hr = IMoniker_ComposeWith(moniker, 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); IMoniker_Release(moniker2); -} + IMoniker_Release(anti); IMoniker_Release(moniker);

1 0

Nikolay Sivov : ole32: Implement custom marshalling for pointer monikers.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: a3909647b23ad8227b71e30cff18dc43a048528b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3909647b23ad8227b71e30c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 16:57:00 2020 +0300 ole32: Implement custom marshalling 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 | 129 ++++++++++++++++++++++++++++++++++++++++++-- dlls/ole32/tests/moniker.c | 38 +++++++++++-- 2 files changed, 160 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index c1a0e2ae1c..2cb0600336 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -37,13 +37,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* PointerMoniker data structure */ -typedef struct PointerMonikerImpl{ - +typedef struct PointerMonikerImpl +{ IMoniker IMoniker_iface; + IMarshal IMarshal_iface; LONG ref; /* reference counter for this object */ - IUnknown *pObject; /* custom marshaler */ + IUnknown *pObject; } PointerMonikerImpl; static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) @@ -51,6 +52,11 @@ static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); } +static PointerMonikerImpl *impl_from_IMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMarshal_iface); +} + static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) @@ -70,7 +76,11 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || IsEqualIID(&IID_IMoniker, riid)) + { *ppvObject = iface; + } + else if (IsEqualIID(&IID_IMarshal, riid)) + *ppvObject = &This->IMarshal_iface; /* Check that we obtained an interface.*/ if ((*ppvObject)==0) @@ -542,6 +552,117 @@ static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); } +static HRESULT WINAPI pointer_moniker_marshal_QueryInterface(IMarshal *iface, REFIID riid, LPVOID *ppv) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); + + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppv); +} + +static ULONG WINAPI pointer_moniker_marshal_AddRef(IMarshal *iface) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p.\n",iface); + + return IMoniker_AddRef(&moniker->IMoniker_iface); +} + +static ULONG WINAPI pointer_moniker_marshal_Release(IMarshal *iface) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p.\n",iface); + + return IMoniker_Release(&moniker->IMoniker_iface); +} + +static HRESULT WINAPI pointer_moniker_marshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %x, %p, %x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + mshlflags, clsid); + + return IMoniker_GetClassID(&moniker->IMoniker_iface, clsid); +} + +static HRESULT WINAPI pointer_moniker_marshal_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *size) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %d, %p, %#x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + mshlflags, size); + + return CoGetMarshalSizeMax(size, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags); +} + +static HRESULT WINAPI pointer_moniker_marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, + void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %x, %p, %x.\n", stream, debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags); + + return CoMarshalInterface(stream, &IID_IUnknown, moniker->pObject, dwDestContext, + pvDestContext, mshlflags); +} + +static HRESULT WINAPI pointer_moniker_marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, + REFIID riid, void **ppv) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", iface, stream, debugstr_guid(riid), ppv); + + hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void **)&object); + if (FAILED(hr)) + { + ERR("Couldn't unmarshal moniker, hr = %#x.\n", hr); + return hr; + } + + if (moniker->pObject) + IUnknown_Release(moniker->pObject); + moniker->pObject = object; + + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppv); +} + +static HRESULT WINAPI pointer_moniker_marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + TRACE("%p, %p.\n", iface, stream); + + return S_OK; +} + +static HRESULT WINAPI pointer_moniker_marshal_DisconnectObject(IMarshal *iface, DWORD reserved) +{ + TRACE("%p, %#x.\n", iface, reserved); + + return S_OK; +} + +static const IMarshalVtbl pointer_moniker_marshal_vtbl = +{ + pointer_moniker_marshal_QueryInterface, + pointer_moniker_marshal_AddRef, + pointer_moniker_marshal_Release, + pointer_moniker_marshal_GetUnmarshalClass, + pointer_moniker_marshal_GetMarshalSizeMax, + pointer_moniker_marshal_MarshalInterface, + pointer_moniker_marshal_UnmarshalInterface, + pointer_moniker_marshal_ReleaseMarshalData, + pointer_moniker_marshal_DisconnectObject +}; + /****************************************************************************** * PointerMoniker_Construct (local function) *******************************************************************************/ @@ -549,8 +670,8 @@ static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *pun { TRACE("(%p)\n",This); - /* Initialize the virtual function table. */ This->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl; + This->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl; This->ref = 1; if (punk) IUnknown_AddRef(punk); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 231551b244..0e6f2677c5 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2722,16 +2722,18 @@ todo_wine static void test_pointer_moniker(void) { IMoniker *moniker, *moniker2, *prefix, *inverse; + DWORD moniker_type, hash, size; IEnumMoniker *enummoniker; HRESULT hr; - DWORD moniker_type; - DWORD hash; IBindCtx *bindctx; FILETIME filetime; IUnknown *unknown; IStream *stream; IROTData *rotdata; LPOLESTR display_name; + IMarshal *marshal; + LARGE_INTEGER pos; + CLSID clsid; cLocks = 0; @@ -2750,6 +2752,35 @@ todo_wine IUnknown_Release(unknown); } + hr = IMoniker_QueryInterface(moniker, &IID_IMarshal, (void **)&marshal); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); + ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class.\n"); + + hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); + ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); + ok(size > 0, "Unexpected size %d.\n", size); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "Failed to marshal moniker, hr %#x.\n", hr); + + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker2); + ok(hr == S_OK, "Failed to unmarshal, hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Expected equal moniker, hr %#x.\n", hr); + IMoniker_Release(moniker2); + + IStream_Release(stream); + + IMarshal_Release(marshal); + ok_more_than_one_lock(); /* Display Name */ @@ -2821,7 +2852,8 @@ todo_wine IMoniker_Release(moniker); - ok_no_locks(); +todo_wine + ok(cLocks == 0, "Number of locks should be 0, but actually is %d.\n", cLocks); hr = CreatePointerMoniker(NULL, &moniker); ok_ole_success(hr, CreatePointerMoniker);

1 0

Nikolay Sivov : ole32/tests: Add some ComposeWith() tests with antimoniker at the right side.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 292774d95c294fa76cfe3959c94e57ec15cbb320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=292774d95c294fa76cfe3959… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 16:57:01 2020 +0300 ole32/tests: Add some ComposeWith() tests with antimoniker at the right side. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 329 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 248 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=292774d95c294fa76cfe…

1 0

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

Jan. 29, 2020

Module: wine Branch: master Commit: 3f10a59ff145967429c4384e0313213296ef6523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f10a59ff145967429c4384e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 16:57:04 2020 +0300 ole32: Fix (item moniker + antimoniker) composing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 14 ++++++-------- dlls/ole32/tests/moniker.c | 6 +----- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 19876aa363..78b23ae633 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -518,7 +518,7 @@ static HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface, IMoniker** ppmkComposite) { HRESULT res=S_OK; - DWORD mkSys,mkSys2; + DWORD mkSys,mkSys2, order; IEnumMoniker* penumMk=0; IMoniker *pmostLeftMk=0; IMoniker* tempMkComposite=0; @@ -530,16 +530,14 @@ static HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface, *ppmkComposite=0; - IMoniker_IsSystemMoniker(pmkRight,&mkSys); - - /* If pmkRight is an anti-moniker, the returned moniker is NULL */ - if(mkSys==MKSYS_ANTIMONIKER) - return res; - + if (is_anti_moniker(pmkRight, &order)) + { + return order > 1 ? create_anti_moniker(order - 1, ppmkComposite) : S_OK; + } else /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ - + IMoniker_IsSystemMoniker(pmkRight,&mkSys); if(mkSys==MKSYS_GENERICCOMPOSITE){ res=IMoniker_Enum(pmkRight,TRUE,&penumMk); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 61aa0b4a96..ea1e5b1933 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2414,16 +2414,12 @@ todo_wine anti = create_antimoniker(2); hr = IMoniker_ComposeWith(moniker, 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(moniker);

1 0

Rémi Bernon : include: Add DBG_REPLY_LATER NTSTATUS code.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: e9ec889dbfe3f8398ef5955766b72c16d9681d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ec889dbfe3f8398ef59557… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 29 19:39:31 2020 +0100 include: Add DBG_REPLY_LATER NTSTATUS code. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntstatus.h | 1 + include/winnt.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index 682db7a566..1e46529262 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1408,6 +1408,7 @@ #define DBG_EXCEPTION_HANDLED ((NTSTATUS) 0x00010001) #define DBG_CONTINUE ((NTSTATUS) 0x00010002) +#define DBG_REPLY_LATER ((NTSTATUS) 0x40010001) #define DBG_TERMINATE_THREAD ((NTSTATUS) 0x40010003) #define DBG_TERMINATE_PROCESS ((NTSTATUS) 0x40010004) #define DBG_CONTROL_C ((NTSTATUS) 0x40010005) diff --git a/include/winnt.h b/include/winnt.h index 41fb6a8289..adc5d3d686 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -651,6 +651,7 @@ typedef DWORD FLONG; /* status values for ContinueDebugEvent */ #define DBG_EXCEPTION_HANDLED ((DWORD) 0x00010001) #define DBG_CONTINUE ((DWORD) 0x00010002) +#define DBG_REPLY_LATER ((DWORD) 0x40010001) #define DBG_TERMINATE_THREAD ((DWORD) 0x40010003) #define DBG_TERMINATE_PROCESS ((DWORD) 0x40010004) #define DBG_CONTROL_C ((DWORD) 0x40010005)

1 0

Francois Gouget : advapi32/tests: Avoid failure when GetServiceKeyName() gets a smart quote.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 82aa066fccc63c8edcb6d9832f4fb48eb0483f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82aa066fccc63c8edcb6d983… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 27 14:22:51 2020 +0100 advapi32/tests: Avoid failure when GetServiceKeyName() gets a smart quote. For non-English languages the Spooler display name may contain non-ASCII characters, typically a smart quote. On Windows 7 GetServiceKeyName() fails when it gets such characters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 3872666085..484167656f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -720,6 +720,17 @@ static void test_get_displayname(void) CloseServiceHandle(scm_handle); } +static int is_printable_ascii_str(const char *s) +{ + while (*s) + { + if (*s < 32 || *s >= 127) + return 0; + s++; + } + return 1; +} + static void test_get_servicekeyname(void) { SC_HANDLE scm_handle, svc_handle; @@ -861,6 +872,14 @@ static void test_get_servicekeyname(void) servicesize = 0; ret = GetServiceKeyNameA(scm_handle, displayname, NULL, &servicesize); ok(!ret, "Expected failure\n"); + if (!is_printable_ascii_str(displayname) && + GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) + { + win_skip("GetServiceKeyName() does not support non-ASCII display names: %s\n", displayname); /* Windows 7 */ + CloseServiceHandle(scm_handle); + return; /* All the tests that follow will fail too */ + } + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());

1 0

Rémi Bernon : ntdll: Don't change RtlWaitOnAddress size after user invoke_apc.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: d03420da127569f331347d8ea0b1fb8d691df740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d03420da127569f331347d8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 29 10:27:27 2020 +0100 ntdll: Don't change RtlWaitOnAddress size after user invoke_apc. This makes the next iteration to immediately return STATUS_SUCCESS because of compare_addr returning FALSE with size == 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0dc6fc3390..c4885973b6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2504,7 +2504,6 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size * but we don't want to wait */ abs_timeout = 0; user_apc = TRUE; - size = 0; } }

1 0

Henri Verbeet : d2d1: Rename d2d_ellipse_geometry_GetRoundedRect() to d2d_ellipse_geometry_GetEllipse().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 763da3f7cc782eced124e981acbdb680012ea760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=763da3f7cc782eced124e981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 14:15:32 2020 +0330 d2d1: Rename d2d_ellipse_geometry_GetRoundedRect() to d2d_ellipse_geometry_GetEllipse(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a61ce692b9..2a1fbf5f7c 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3707,7 +3707,7 @@ static HRESULT STDMETHODCALLTYPE d2d_ellipse_geometry_Widen(ID2D1EllipseGeometry return E_NOTIMPL; } -static void STDMETHODCALLTYPE d2d_ellipse_geometry_GetRoundedRect(ID2D1EllipseGeometry *iface, D2D1_ELLIPSE *ellipse) +static void STDMETHODCALLTYPE d2d_ellipse_geometry_GetEllipse(ID2D1EllipseGeometry *iface, D2D1_ELLIPSE *ellipse) { struct d2d_geometry *geometry = impl_from_ID2D1EllipseGeometry(iface); @@ -3735,7 +3735,7 @@ static const struct ID2D1EllipseGeometryVtbl d2d_ellipse_geometry_vtbl = d2d_ellipse_geometry_ComputeLength, d2d_ellipse_geometry_ComputePointAtLength, d2d_ellipse_geometry_Widen, - d2d_ellipse_geometry_GetRoundedRect, + d2d_ellipse_geometry_GetEllipse, }; HRESULT d2d_ellipse_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_ELLIPSE *ellipse)

1 0

Sven Baars : d3dx9/tests: Add some more ID3DXFont tests.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: ef889fe654e8bef81c009b93501b6c0411cd8354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef889fe654e8bef81c009b93… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jan 29 14:38:48 2020 +0100 d3dx9/tests: Add some more ID3DXFont tests. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 146 +++++++++++++++++++++++++++++++++------------ 1 file changed, 108 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef889fe654e8bef81c00…

1 0

Piotr Caban : msvcrt: Use _callnewh in operator new implementation.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 7e9cba139d30d3b48567baaf6a8b901143c738e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e9cba139d30d3b48567baaf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 14:27:29 2020 +0100 msvcrt: Use _callnewh in operator new implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 512adc1e74..52f800e824 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -125,14 +125,24 @@ static MSVCRT_size_t msvcrt_heap_size(void *ptr) return HeapSize(heap, 0, ptr); } +/********************************************************************* + * _callnewh (MSVCRT.@) + */ +int CDECL _callnewh(MSVCRT_size_t size) +{ + int ret = 0; + MSVCRT_new_handler_func handler = MSVCRT_new_handler; + if(handler) + ret = (*handler)(size) ? 1 : 0; + return ret; +} + /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) */ void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; - int freed; - MSVCRT_new_handler_func handler; do { @@ -142,13 +152,7 @@ void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) TRACE("(%ld) returning %p\n", size, retval); return retval; } - - handler = MSVCRT_new_handler; - if(handler) - freed = (*handler)(size); - else - freed = 0; - } while(freed); + } while(_callnewh(size)); TRACE("(%ld) out of memory\n", size); #if _MSVCR_VER >= 80 @@ -230,18 +234,6 @@ int CDECL MSVCRT__set_new_mode(int mode) return old_mode; } -/********************************************************************* - * _callnewh (MSVCRT.@) - */ -int CDECL _callnewh(MSVCRT_size_t size) -{ - int ret = 0; - MSVCRT_new_handler_func handler = MSVCRT_new_handler; - if(handler) - ret = (*handler)(size) ? 1 : 0; - return ret; -} - /********************************************************************* * _expand (MSVCRT.@) */

1 0

Alistair Leslie-Hughes : d3dx9/tests: Add some tests for ID3DXFont_DrawText().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: db7539f9f3ead16cb94ff03c2b8f9ca11b44a253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db7539f9f3ead16cb94ff03c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 29 14:38:47 2020 +0100 d3dx9/tests: Add some tests for ID3DXFont_DrawText(). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 79b69ccc5f..bc80b2e397 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -646,6 +646,63 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ID3DXFont_Release(font); } + + + /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */ + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, + DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + todo_wine { + SetRect(&rect, 10, 10, 200, 200); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -2, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 0, &rect, 0, 0xFF00FF); + ok(height == 0, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 1, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 2, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF); + ok(height == 0, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "Got unexpected height %d.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "Got unexpected height %d.\n", height); + } + + ID3DXFont_Release(font); } static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)

1 0

Piotr Caban : msvcrt: Don't duplicate _searchenv_s code in _searchenv.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 98c554ac0617c642bc4481e6f56e0d66adec660a URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c554ac0617c642bc4481e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:15 2020 +0100 msvcrt: Don't duplicate _searchenv_s code in _searchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 90 +++++-------------------------------------------------- 1 file changed, 8 insertions(+), 82 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 806a2b0c85..83aff8bcb5 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1640,88 +1640,6 @@ range: return MSVCRT_ERANGE; } -/********************************************************************* - * _searchenv (MSVCRT.@) - * - * Search for a file in a list of paths from an environment variable. - * - * PARAMS - * file [I] Name of the file to search for. - * env [I] Name of the environment variable containing a list of paths. - * buf [O] Destination for the found file path. - * - * RETURNS - * Nothing. If the file is not found, buf will contain an empty string - * and errno is set. - */ -void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) -{ - char*envVal, *penv, *end; - char path[MAX_PATH]; - MSVCRT_size_t path_len, fname_len = strlen(file); - - *buf = '\0'; - - /* Try CWD first */ - if (GetFileAttributesA( file ) != INVALID_FILE_ATTRIBUTES) - { - GetFullPathNameA( file, MAX_PATH, buf, NULL ); - return; - } - - /* Search given environment variable */ - envVal = MSVCRT_getenv(env); - if (!envVal) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - - penv = envVal; - TRACE(":searching for %s in paths %s\n", file, envVal); - - for(; *penv; penv = (*end ? end + 1 : end)) - { - end = penv; - path_len = 0; - while(*end && *end != ';' && path_len < MAX_PATH) - { - if (*end == '"') - { - end++; - while(*end && *end != '"' && path_len < MAX_PATH) - { - path[path_len++] = *end; - end++; - } - if (*end == '"') end++; - continue; - } - - path[path_len++] = *end; - end++; - } - if (!path_len || path_len >= MAX_PATH) - continue; - - if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') - path[path_len++] = '\\'; - if (path_len + fname_len >= MAX_PATH) - continue; - - memcpy(path + path_len, file, fname_len + 1); - TRACE("Checking for file %s\n", path); - if (GetFileAttributesA( path ) != INVALID_FILE_ATTRIBUTES) - { - memcpy(buf, path, path_len + fname_len + 1); - return; - } - } - - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; -} - /********************************************************************* * _searchenv_s (MSVCRT.@) */ @@ -1807,6 +1725,14 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC return MSVCRT_ENOENT; } +/********************************************************************* + * _searchenv (MSVCRT.@) + */ +void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) +{ + MSVCRT__searchenv_s(file, env, buf, MAX_PATH); +} + /********************************************************************* * _wsearchenv (MSVCRT.@) *

1 0

Jacek Caban : msvcrt/tests: Avoid using msvcrt.h header.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 3dcedeef2d4f1aedfc6b30ebcfa5546cc986b1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcedeef2d4f1aedfc6b30eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 13:39:12 2020 +0100 msvcrt/tests: Avoid using msvcrt.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 7e2a7e4069..afc3a9de21 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -22,7 +22,6 @@ #include <errno.h> #include <stdio.h> #include <math.h> -#include "msvcrt.h" #include <process.h> static inline BOOL almost_equal(double d1, double d2) { @@ -33,14 +32,14 @@ static inline BOOL almost_equal(double d1, double d2) { static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); -static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); +static int (__cdecl *pstrerror_s)(char *, size_t, int); static int (__cdecl *p_get_doserrno)(int *); static int (__cdecl *p_get_errno)(int *); static int (__cdecl *p_set_doserrno)(int); static int (__cdecl *p_set_errno)(int); static void (__cdecl *p__invalid_parameter)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); -static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, +static void (__cdecl *p_qsort_s)(void*, size_t, size_t, int (__cdecl*)(void*, const void*, const void*), void*); static double (__cdecl *p_atan)(double); static double (__cdecl *p_exp)(double);

1 0

Sven Baars : d3dx9/tests: Use Tahoma in all font tests.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 2465220a0c93f8e55948061772c2a39fb5753bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2465220a0c93f8e559480617… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jan 29 14:38:45 2020 +0100 d3dx9/tests: Use Tahoma in all font tests. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index fa874a5ef5..75146575be 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -330,13 +330,13 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* D3DXCreateFont */ ref = get_ref((IUnknown*)device); - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); check_ref((IUnknown*)device, ref + 1); check_release((IUnknown*)font, 0); check_ref((IUnknown*)device, ref); - hr = D3DXCreateFontA(device, 0, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 0, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); @@ -348,13 +348,13 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); - hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", NULL); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", NULL); + hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -368,7 +368,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) desc.OutputPrecision = OUT_DEFAULT_PRECIS; desc.Quality = DEFAULT_QUALITY; desc.PitchAndFamily = DEFAULT_PITCH; - strcpy(desc.FaceName, "Arial"); + strcpy(desc.FaceName, "Tahoma"); hr = D3DXCreateFontIndirectA(device, &desc, &font); ok(hr == D3D_OK, "D3DXCreateFontIndirect returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); @@ -384,7 +384,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetDevice */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { IDirect3DDevice9 *bufdev; @@ -401,7 +401,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetDesc */ - hr = D3DXCreateFontA(device, 12, 8, FW_BOLD, 2, TRUE, ANSI_CHARSET, OUT_RASTER_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 8, FW_BOLD, 2, TRUE, ANSI_CHARSET, OUT_RASTER_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { hr = ID3DXFont_GetDescA(font, NULL); ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_GetDevice returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -418,14 +418,14 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(desc.OutputPrecision == OUT_RASTER_PRECIS, "ID3DXFont_GetDesc returned an output precision of %d, expected %d\n", desc.OutputPrecision, OUT_RASTER_PRECIS); ok(desc.Quality == ANTIALIASED_QUALITY, "ID3DXFont_GetDesc returned font quality %d, expected %d\n", desc.Quality, ANTIALIASED_QUALITY); ok(desc.PitchAndFamily == VARIABLE_PITCH, "ID3DXFont_GetDesc returned pitch and family %d, expected %d\n", desc.PitchAndFamily, VARIABLE_PITCH); - ok(strcmp(desc.FaceName, "Arial") == 0, "ID3DXFont_GetDesc returned facename \"%s\", expected \"%s\"\n", desc.FaceName, "Arial"); + ok(strcmp(desc.FaceName, "Tahoma") == 0, "ID3DXFont_GetDesc returned facename \"%s\", expected \"%s\"\n", desc.FaceName, "Tahoma"); ID3DXFont_Release(font); } else skip("Failed to create a ID3DXFont object\n"); /* ID3DXFont_GetDC + ID3DXFont_GetTextMetrics */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { HDC hdc; @@ -466,7 +466,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_PreloadText */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); @@ -493,7 +493,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetGlyphData, ID3DXFont_PreloadGlyphs, ID3DXFont_PreloadCharacters */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { char c; HDC hdc; @@ -565,7 +565,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) IDirect3DTexture9 *texture; hr = D3DXCreateFontA(device, tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(FAILED(hr)) { skip("Failed to create a ID3DXFont object\n"); continue;

1 0

Piotr Caban : msvcrt: Respect allocation mode in malloc.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 70ac780e6ed26380fd2fcdfbb96352ca8548bc79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ac780e6ed26380fd2fcdfb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 14:27:25 2020 +0100 msvcrt: Respect allocation mode in malloc. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 0d6aee07f3..512adc1e74 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -441,10 +441,18 @@ void CDECL _free_base(void* ptr) */ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) { - void *ret = msvcrt_heap_alloc(0, size); - if (!ret) - *MSVCRT__errno() = MSVCRT_ENOMEM; - return ret; + void *ret; + + do + { + ret = msvcrt_heap_alloc(0, size); + if (ret || !MSVCRT_new_mode) + break; + } while(_callnewh(size)); + + if (!ret) + *MSVCRT__errno() = MSVCRT_ENOMEM; + return ret; } #if _MSVCR_VER>=140

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _searchenv_s.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 2e7ad72a8dae21aa5a16396c408007d48e43f5ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e7ad72a8dae21aa5a16396c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:11 2020 +0100 msvcrt: Add support for quoted paths in _searchenv_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index d07fcd6c7d..806a2b0c85 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1763,12 +1763,27 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH)

1 0

Nikolay Sivov : mfplat: Add support for local MFT registration.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 97f646edabea52e136713830612eb737df3689dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=97f646edabea52e136713830… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 15:36:21 2020 +0300 mfplat: Add support for local MFT registration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 214 ++++++++++++++++++++++++++++++++++++++------- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 104 ++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 288 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97f646edabea52e13671…

1 0

Sven Baars : d3dx9/tests: Get rid of redundant handling for D3DXCreateFontA() failures.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: da62db437aca4a434ab88297ac78cbcd83f6152e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da62db437aca4a434ab88297… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jan 29 14:38:46 2020 +0100 d3dx9/tests: Get rid of redundant handling for D3DXCreateFontA() failures. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 337 +++++++++++++++++++++++---------------------- 1 file changed, 173 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da62db437aca4a434ab8…

1 0

Piotr Caban : msvcrt: Reimplement _set_new_mode function.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 6113a251ef3955f2ac3436d90a523faf4c03bc0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6113a251ef3955f2ac3436d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 14:27:35 2020 +0100 msvcrt: Reimplement _set_new_mode function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 52f800e824..31153fa5b1 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -226,12 +226,8 @@ MSVCRT_new_handler_func CDECL MSVCRT_set_new_handler(void *func) */ int CDECL MSVCRT__set_new_mode(int mode) { - int old_mode; - LOCK_HEAP; - old_mode = MSVCRT_new_mode; - MSVCRT_new_mode = mode; - UNLOCK_HEAP; - return old_mode; + if(!MSVCRT_CHECK_PMT(mode == 0 || mode == 1)) return -1; + return InterlockedExchange(&MSVCRT_new_mode, mode); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 1b5a551324e113afefd247e703cc59c03ad80a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5a551324e113afefd247e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:23 2020 +0100 msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 66 +++++++------------------------------------------------ 1 file changed, 8 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5bd8fb1b15..5e84e38a00 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1733,64 +1733,6 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) MSVCRT__searchenv_s(file, env, buf, MAX_PATH); } -/********************************************************************* - * _wsearchenv (MSVCRT.@) - * - * Unicode version of _searchenv - */ -void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) -{ - MSVCRT_wchar_t *envVal, *penv, *end; - MSVCRT_wchar_t path[MAX_PATH]; - MSVCRT_size_t path_len, fname_len = strlenW(file); - - *buf = '\0'; - - /* Try CWD first */ - if (GetFileAttributesW( file ) != INVALID_FILE_ATTRIBUTES) - { - GetFullPathNameW( file, MAX_PATH, buf, NULL ); - return; - } - - /* Search given environment variable */ - envVal = MSVCRT__wgetenv(env); - if (!envVal) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - - penv = envVal; - TRACE(":searching for %s in paths %s\n", debugstr_w(file), debugstr_w(envVal)); - - for(; *penv; penv = (*end ? end + 1 : end)) - { - end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; - if (!path_len || path_len >= MAX_PATH) - continue; - - memcpy(path, penv, path_len * sizeof(MSVCRT_wchar_t)); - if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') - path[path_len++] = '\\'; - if (path_len + fname_len >= MAX_PATH) - continue; - - memcpy(path + path_len, file, (fname_len + 1) * sizeof(MSVCRT_wchar_t)); - TRACE("Checking for file %s\n", debugstr_w(path)); - if (GetFileAttributesW( path ) != INVALID_FILE_ATTRIBUTES) - { - memcpy(buf, path, (path_len + fname_len + 1) * sizeof(MSVCRT_wchar_t)); - return; - } - } - - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; -} - /********************************************************************* * _wsearchenv_s (MSVCRT.@) */ @@ -1876,3 +1818,11 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* *MSVCRT__errno() = MSVCRT_ENOENT; return MSVCRT_ENOENT; } + +/********************************************************************* + * _wsearchenv (MSVCRT.@) + */ +void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) +{ + MSVCRT__wsearchenv_s(file, env, buf, MAX_PATH); +}

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _wsearchenv_s.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: f05549b7f71740362ae5ef6dc8d5e846f8c41f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f05549b7f71740362ae5ef6d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:19 2020 +0100 msvcrt: Add support for quoted paths in _wsearchenv_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 83aff8bcb5..5bd8fb1b15 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1833,12 +1833,27 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len * sizeof(MSVCRT_wchar_t)); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH)

1 0

Nikolay Sivov : mfplat: Add MFCreateTransformActivate().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: be45be2de750c4a97c8180490fba8a8832e50b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be45be2de750c4a97c818049… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 15:36:20 2020 +0300 mfplat: Add MFCreateTransformActivate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 416 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 25 +++ include/mftransform.idl | 2 + 4 files changed, 444 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be45be2de750c4a97c81…

1 0

Jacek Caban : include: Use dllimport attribute for string.h functions.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 3a67291af47bf5b3727d7d1a6cd3f3ddc81c8282 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a67291af47bf5b3727d7d1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 13:40:04 2020 +0100 include: Use dllimport attribute for string.h functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 12 ++++ include/msvcrt/string.h | 180 +++++++++++++++++++++++------------------------ 2 files changed, 102 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a67291af47bf5b3727d…

1 0

Chip Davis : gdi32: Add D3DKMTSetQueuedLimit() stub.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 012d996b83251e005cc70be809dc5ac60e459cd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=012d996b83251e005cc70be8… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jan 29 01:34:01 2020 -0600 gdi32: Add D3DKMTSetQueuedLimit() stub. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- .../ext-ms-win-gdi-font-l1-1-1.spec | 6 +++--- dlls/gdi32/driver.c | 9 ++++++++ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 24 +++++++++++++++++++++- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index d2fcc8fe45..609f24fcfd 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -80,7 +80,7 @@ @ stub D3DKMTSetDisplayPrivateDriverFormat @ stub D3DKMTSetGammaRamp @ stub D3DKMTSetProcessSchedulingPriorityClass -@ stub D3DKMTSetQueuedLimit +@ stdcall D3DKMTSetQueuedLimit(ptr) gdi32.D3DKMTSetQueuedLimit @ stub D3DKMTSetStereoEnabled @ stdcall D3DKMTSetVidPnSourceOwner(ptr) gdi32.D3DKMTSetVidPnSourceOwner @ stub D3DKMTShareObjects diff --git a/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec index c1b0679883..3d67056c84 100644 --- a/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec +++ b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec @@ -6,9 +6,9 @@ @ stdcall ExtTextOutA(long long long long ptr str long ptr) gdi32.ExtTextOutA @ stdcall ExtTextOutW(long long long long ptr wstr long ptr) gdi32.ExtTextOutW @ stdcall GetCharABCWidthsW(long long long ptr) gdi32.GetCharABCWidthsW -@ stdcall GetCharWidth32A(long long long long) gdi32.GetCharWidth32A -@ stdcall GetCharWidthA(long long long long) gdi32.GetCharWidthA -@ stdcall GetCharWidthW(long long long long) gdi32.GetCharWidthW +@ stdcall GetCharWidth32A(long long long ptr) gdi32.GetCharWidth32A +@ stdcall GetCharWidthA(long long long ptr) gdi32.GetCharWidthA +@ stdcall GetCharWidthW(long long long ptr) gdi32.GetCharWidthW @ stdcall GetFontData(long long long ptr long) gdi32.GetFontData @ stdcall GetFontFileData(long long int64 ptr long) gdi32.GetFontFileData @ stdcall GetFontFileInfo(long long ptr long ptr) gdi32.GetFontFileInfo diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d84584da86..90977383a5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1470,6 +1470,15 @@ NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) return STATUS_SUCCESS; } +/****************************************************************************** + * D3DKMTSetQueuedLimit [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTSetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) +{ + FIXME( "(%p): stub\n", desc ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************************** * D3DKMTSetVidPnSourceOwner [GDI32.@] */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8faa2978f4..725afebb8e 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -90,6 +90,7 @@ @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall D3DKMTQueryStatistics(ptr) +@ stdcall D3DKMTSetQueuedLimit(ptr) @ stdcall D3DKMTSetVidPnSourceOwner(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 6d6a1d68cd..dc53ea343c 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -594,9 +594,30 @@ typedef struct _D3DKMT_QUERYSTATISTICS D3DKMT_QUERYSTATISTICS_QUERY_NODE QueryProcessNode; D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE QueryVidPnSource; D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE QueryProcessVidPnSource; - }; + } DUMMYUNIONNAME; } D3DKMT_QUERYSTATISTICS; +typedef enum _D3DKMT_QUEUEDLIMIT_TYPE +{ + D3DKMT_SET_QUEUEDLIMIT_PRESENT = 1, + D3DKMT_GET_QUEUEDLIMIT_PRESENT +} D3DKMT_QUEUEDLIMIT_TYPE; + +typedef struct _D3DKMT_SETQUEUEDLIMIT +{ + D3DKMT_HANDLE hDevice; + D3DKMT_QUEUEDLIMIT_TYPE Type; + union + { + UINT QueuedPresentLimit; + struct + { + D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; + UINT QueuedPendingFlipLimit; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +} D3DKMT_SETQUEUEDLIMIT; + #ifdef __cplusplus extern "C" { @@ -610,6 +631,7 @@ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); +NTSTATUS WINAPI D3DKMTSetQueuedLimit(D3DKMT_SETQUEUEDLIMIT *desc); NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner(const D3DKMT_SETVIDPNSOURCEOWNER *desc); #ifdef __cplusplus

1 0

Zebediah Figura : d3d8: Handle multisample depth resolve in d3d8_device_SetRenderState().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 18c863e0ae4279403f14757e257936f6114f65b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c863e0ae4279403f14757e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:11 2020 -0600 d3d8: Handle multisample depth resolve in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/device.c | 30 ++++++++++++++++++++++++++++++ dlls/d3d8/directx.c | 13 +++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f262d12fc7..26451255c0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -42,6 +42,9 @@ #define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D8_MAX_STREAMS 16 +#define D3DFMT_RESZ MAKEFOURCC('R','E','S','Z') +#define D3D8_RESZ_CODE 0x7fa05000 + /* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000 diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0721d2a501..4c2c350ec2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1846,6 +1846,34 @@ static HRESULT WINAPI d3d8_device_GetClipPlane(IDirect3DDevice8 *iface, DWORD in return hr; } +static void resolve_depth_buffer(struct d3d8_device *device) +{ + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + struct wined3d_rendertarget_view *wined3d_dsv; + struct wined3d_resource *dst_resource; + struct wined3d_texture *dst_texture; + struct wined3d_resource_desc desc; + struct d3d8_surface *d3d8_dsv; + + if (!(dst_texture = state->textures[0])) + return; + dst_resource = wined3d_texture_get_resource(dst_texture); + wined3d_resource_get_desc(dst_resource, &desc); + if (desc.format != WINED3DFMT_D24_UNORM_S8_UINT + && desc.format != WINED3DFMT_X8D24_UNORM + && desc.format != WINED3DFMT_DF16 + && desc.format != WINED3DFMT_DF24 + && desc.format != WINED3DFMT_INTZ) + return; + + if (!(wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + return; + d3d8_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); + + wined3d_device_resolve_sub_resource(device->wined3d_device, dst_resource, 0, + wined3d_rendertarget_view_get_resource(wined3d_dsv), d3d8_dsv->sub_resource_idx, desc.format); +} + static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD value) { @@ -1859,6 +1887,8 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, wined3d_stateblock_set_render_state(device->update_state, state, value); if (!device->recording) wined3d_device_set_render_state(device->wined3d_device, state, value); + if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) + resolve_depth_buffer(device); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 9a9abeccca..d1f8872d12 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -266,8 +266,17 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 } wined3d_mutex_lock(); - hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); + if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) + { + DWORD levels; + hr = wined3d_check_device_multisample_type(d3d8->wined3d, adapter, device_type, + WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); + if (SUCCEEDED(hr) && !levels) + hr = D3DERR_NOTAVAILABLE; + } + else + hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), + usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetRenderState().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 5e9c139c5fd1a8eb7fdda12db86113241ee854c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e9c139c5fd1a8eb7fdda12d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:12 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4c2c350ec2..b0a0491890 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1885,8 +1885,6 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, if (state == D3DRS_ZBIAS) state = WINED3D_RS_DEPTHBIAS; wined3d_stateblock_set_render_state(device->update_state, state, value); - if (!device->recording) - wined3d_device_set_render_state(device->wined3d_device, state, value); if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock();

1 0

Alexandre Julliard : libwine: Make some functions obsolete.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 39138478fdd93cc0dfc1e83b85784bc468e8d237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39138478fdd93cc0dfc1e83b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:48:39 2020 +0100 libwine: Make some functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_powerpc.c | 16 +++++++- include/wine/asm.h | 6 +++ include/wine/library.h | 5 --- libs/wine/port.c | 70 +++++++++++++++------------------- libs/wine/wine.map | 91 +++++++++++++++++++++++---------------------- 5 files changed, 96 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39138478fdd93cc0dfc1…

1 0

Zebediah Figura : strmbase: Remove some no longer used callbacks.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 38291846f306dd5c6bd8bc5ed6a1634022d1dd2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=38291846f306dd5c6bd8bc5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:52 2020 -0600 strmbase: Remove some no longer used callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 28 ++++++---------------------- include/wine/strmbase.h | 4 ---- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 74be6b107e..2c75156c1b 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -38,14 +38,6 @@ static inline TransformFilter *impl_from_sink_IPin(IPin *iface) static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) { - TransformFilter *pTransform = impl_from_sink_IPin(&iface->IPin_iface); - - TRACE("%p\n", iface); - - if (pTransform->pFuncsTable->pfnCheckInputType) - return pTransform->pFuncsTable->pfnCheckInputType(pTransform, pmt); - /* Assume OK if there's no query method (the connection will fail if - needed) */ return S_OK; } @@ -239,13 +231,9 @@ static HRESULT sink_eos(struct strmbase_sink *iface) static HRESULT sink_begin_flush(struct strmbase_sink *iface) { TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; - - if (filter->pFuncsTable->pfnBeginFlush) - hr = filter->pFuncsTable->pfnBeginFlush(filter); - if (SUCCEEDED(hr) && filter->source.pin.peer) - hr = IPin_BeginFlush(filter->source.pin.peer); - return hr; + if (filter->source.pin.peer) + return IPin_BeginFlush(filter->source.pin.peer); + return S_OK; } static HRESULT sink_end_flush(struct strmbase_sink *iface) @@ -264,13 +252,9 @@ static HRESULT sink_new_segment(struct strmbase_sink *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; - - if (filter->pFuncsTable->pfnNewSegment) - hr = filter->pFuncsTable->pfnNewSegment(filter, start, stop, rate); - if (SUCCEEDED(hr) && filter->source.pin.peer) - hr = IPin_NewSegment(filter->source.pin.peer, start, stop, rate); - return hr; + if (filter->source.pin.peer) + return IPin_NewSegment(filter->source.pin.peer, start, stop, rate); + return S_OK; } static const struct strmbase_sink_ops sink_ops = diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 48d7638ae1..abb04a8384 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -195,13 +195,9 @@ typedef struct TransformFilterFuncTable { TransformFilter_StartStreaming pfnStartStreaming; TransformFilter_Receive pfnReceive; TransformFilter_StopStreaming pfnStopStreaming; - TransformFilter_CheckInputType pfnCheckInputType; HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt); TransformFilter_BreakConnect pfnBreakConnect; - TransformFilter_EndOfStream pfnEndOfStream; - TransformFilter_BeginFlush pfnBeginFlush; TransformFilter_EndFlush pfnEndFlush; - TransformFilter_NewSegment pfnNewSegment; TransformFilter_Notify pfnNotify; } TransformFilterFuncTable;

1 0

Zebediah Figura : strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 0820b125e29b5bfde9a6615e96cbd93efa56932f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0820b125e29b5bfde9a6615e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:54 2020 -0600 strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 1 - dlls/quartz/tests/filesource.c | 1 - dlls/quartz/tests/mpegsplit.c | 1 - dlls/quartz/tests/waveparser.c | 1 - dlls/strmbase/filter.c | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 31cb767b60..4af101767d 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -353,7 +353,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 3e571fa0e3..918605da6d 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -526,7 +526,6 @@ static void test_enum_pins(void) load_file(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c45f982a02..67dd6d312d 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -347,7 +347,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index 61ba2018e4..e9540bc0f5 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -351,7 +351,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index a7e5fcd3f0..43da4b3fb9 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -122,7 +122,7 @@ static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, *ret_count = 0; if (enum_pins->version != enum_pins->filter->pin_version) - return VFW_E_ENUM_OUT_OF_SYNC; + return S_FALSE; for (i = 0; i < count; ++i) {

1 0

Zebediah Figura : strmbase: Move the IEnumMediaTypes implementation to pin.c.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 85d411aa24a58647341a6c14a75bd2a61dd6a877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d411aa24a58647341a6c14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:55 2020 -0600 strmbase: Move the IEnumMediaTypes implementation to pin.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 170 ------------------------------------- dlls/strmbase/pin.c | 176 +++++++++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 2 - 3 files changed, 176 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85d411aa24a58647341a…

1 0

Zebediah Figura : winegstreamer: Get rid of the mp3 decoder.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: d263c4a366fbdb9bc05ef5ae77cd0677d76f5624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d263c4a366fbdb9bc05ef5ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:51 2020 -0600 winegstreamer: Get rid of the mp3 decoder. In the unlikely event that we are hotplugging not from an IAsyncReader, we already have the ACM wrapper and l3codeca.acm available to do the same thing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 4 +- dlls/winegstreamer/gst_cbs.c | 24 -- dlls/winegstreamer/gst_cbs.h | 13 - dlls/winegstreamer/gst_guids.h | 1 - dlls/winegstreamer/gst_private.h | 7 - dlls/winegstreamer/gstdemux.c | 14 +- dlls/winegstreamer/gsttffilter.c | 628 --------------------------------------- dlls/winegstreamer/main.c | 35 --- 8 files changed, 2 insertions(+), 724 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d263c4a366fbdb9bc05e…

1 0

Zebediah Figura : d3d8: Apply the device state before executing a draw call.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 2ff6b5ec6f7c9f6f25b419f679f00bd4a56db153 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff6b5ec6f7c9f6f25b419f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:10 2020 -0600 d3d8: Apply the device state before executing a draw call. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index bcd25e9245..0721d2a501 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1606,6 +1606,7 @@ static HRESULT WINAPI d3d8_device_Clear(IDirect3DDevice8 *iface, DWORD rect_coun } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); @@ -2287,6 +2288,7 @@ static HRESULT WINAPI d3d8_device_ValidateDevice(IDirect3DDevice8 *iface, DWORD TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -2417,6 +2419,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); @@ -2439,6 +2442,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); @@ -2509,6 +2513,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d8_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -2610,6 +2615,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d8_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -2689,6 +2695,8 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we * do for draws. In some regards that would be easier, but it seems less

1 0

Gerald Pfeifer : msi: Properly declare variables in msi/tests/utils.h as extern.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: ea032bb7f8daddfe308f86f52c54db5f657b658a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea032bb7f8daddfe308f86f5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 28 22:40:25 2020 +0100 msi: Properly declare variables in msi/tests/utils.h as extern. Omitting the extern storage qualifier when declaring a global variable in a header file is mistake. If that header is included by several files it results in multiple definitions of the same variable (unless -fcommon is specified or assumed, the latter being the case for GCC 9.x and earlier). This fixes building with GCC 10. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h index f16e2d5ff5..0880553863 100644 --- a/dlls/msi/tests/utils.h +++ b/dlls/msi/tests/utils.h @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -char PROG_FILES_DIR[MAX_PATH]; -char PROG_FILES_DIR_NATIVE[MAX_PATH]; -char COMMON_FILES_DIR[MAX_PATH]; -char APP_DATA_DIR[MAX_PATH]; -char WINDOWS_DIR[MAX_PATH]; -char CURR_DIR[MAX_PATH]; +extern char PROG_FILES_DIR[MAX_PATH]; +extern char PROG_FILES_DIR_NATIVE[MAX_PATH]; +extern char COMMON_FILES_DIR[MAX_PATH]; +extern char APP_DATA_DIR[MAX_PATH]; +extern char WINDOWS_DIR[MAX_PATH]; +extern char CURR_DIR[MAX_PATH]; BOOL get_system_dirs(void); BOOL get_user_dirs(void);

1 0

Zebediah Figura : d3d8: Stop setting the device state when setting the default ZENABLE and POINTSIZE_MIN states.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 23de061d2f8347d8131909bc137c9b4a536d58e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23de061d2f8347d8131909bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:13 2020 -0600 d3d8: Stop setting the device state when setting the default ZENABLE and POINTSIZE_MIN states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b0a0491890..71717852bb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -927,9 +927,6 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, - !!swapchain_desc.enable_auto_depth_stencil); device_reset_viewport_state(device); device->device_state = D3D8_DEVICE_STATE_OK; } @@ -3769,9 +3766,6 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device_reset_viewport_state(device); wined3d_mutex_unlock();

1 0

Alexandre Julliard : libwine: Make the debug functions obsolete.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: c1dadbcfb1776b9ed33dcbf849d6c0aa43ab9913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1dadbcfb1776b9ed33dcbf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:49:04 2020 +0100 libwine: Make the debug functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/debug.c | 52 +++++++++++++++++++++++++++------------------------- libs/wine/wine.map | 16 ++++++++-------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 0e710223a2..f2b03b76e8 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -20,6 +20,9 @@ #include "config.h" #include "wine/port.h" +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE #include <stdlib.h> #include <stdio.h> @@ -30,12 +33,6 @@ # include <sys/stat.h> #endif -#define __wine_dbg_get_channel_flags __wine_dbg_get_channel_flags_inline -#define wine_dbg_sprintf wine_dbg_sprintf_inline -#define wine_dbg_printf wine_dbg_printf_inline -#define wine_dbg_log wine_dbg_log_inline -#define wine_dbgstr_an wine_dbgstr_an_inline -#define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" #include "wine/library.h" @@ -70,8 +67,7 @@ static int cmp_name( const void *p1, const void *p2 ) } /* get the flags to use for a given channel, possibly setting them too in case of lazy init */ -#undef __wine_dbg_get_channel_flags -unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +unsigned char __wine_dbg_get_channel_flags_obsolete( struct __wine_debug_channel *channel ) { if (nb_debug_options == -1) debug_init(); @@ -87,8 +83,8 @@ unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel } /* set the flags to use for a given channel; return 0 if the channel is not available to set */ -int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, - unsigned char set, unsigned char clear ) +int __wine_dbg_set_channel_flags_obsolete( struct __wine_debug_channel *channel, + unsigned char set, unsigned char clear ) { if (nb_debug_options == -1) debug_init(); @@ -228,8 +224,7 @@ static void debug_init(void) } /* varargs wrapper for funcs.dbg_vprintf */ -#undef wine_dbg_printf -int wine_dbg_printf( const char *format, ... ) +int wine_dbg_printf_obsolete( const char *format, ... ) { int ret; va_list valist; @@ -241,8 +236,7 @@ int wine_dbg_printf( const char *format, ... ) } /* printf with temp buffer allocation */ -#undef wine_dbg_sprintf -const char *wine_dbg_sprintf( const char *format, ... ) +const char *wine_dbg_sprintf_obsolete( const char *format, ... ) { static const int max_size = 200; char *ret; @@ -260,14 +254,13 @@ const char *wine_dbg_sprintf( const char *format, ... ) /* varargs wrapper for funcs.dbg_vlog */ -#undef wine_dbg_log -int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *func, const char *format, ... ) +int wine_dbg_log_obsolete( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *func, const char *format, ... ) { int ret; va_list valist; - if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + if (!(__wine_dbg_get_channel_flags_obsolete( channel ) & (1 << cls))) return -1; va_start(valist, format); ret = funcs.dbg_vlog( cls, channel, func, format, valist ); @@ -424,7 +417,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch int ret = 0; if (cls < ARRAY_SIZE(debug_classes)) - ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); + ret += wine_dbg_printf_obsolete( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format) ret += funcs.dbg_vprintf( format, args ); return ret; @@ -432,20 +425,18 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch /* wrappers to use the function pointers */ -#undef wine_dbgstr_an -const char *wine_dbgstr_an( const char * s, int n ) +const char *wine_dbgstr_an_obsolete( const char * s, int n ) { return funcs.dbgstr_an(s, n); } -#undef wine_dbgstr_wn -const char *wine_dbgstr_wn( const WCHAR *s, int n ) +const char *wine_dbgstr_wn_obsolete( const WCHAR *s, int n ) { return funcs.dbgstr_wn(s, n); } -void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, - struct __wine_debug_functions *old_funcs, size_t size ) +void __wine_dbg_set_functions_obsolete( const struct __wine_debug_functions *new_funcs, + struct __wine_debug_functions *old_funcs, size_t size ) { if (old_funcs) memcpy( old_funcs, &funcs, min(sizeof(funcs),size) ); if (new_funcs) memcpy( &funcs, new_funcs, min(sizeof(funcs),size) ); @@ -460,3 +451,14 @@ static struct __wine_debug_functions funcs = default_dbg_vprintf, default_dbg_vlog }; + +__ASM_OBSOLETE(__wine_dbg_get_channel_flags); +__ASM_OBSOLETE(__wine_dbg_set_channel_flags); +__ASM_OBSOLETE(__wine_dbg_set_functions); +__ASM_OBSOLETE(wine_dbg_log); +__ASM_OBSOLETE(wine_dbg_printf); +__ASM_OBSOLETE(wine_dbg_sprintf); +__ASM_OBSOLETE(wine_dbgstr_an); +__ASM_OBSOLETE(wine_dbgstr_wn); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 83ef3a0f60..50ae479788 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -1,9 +1,6 @@ WINE_1.0 { global: - __wine_dbg_get_channel_flags; - __wine_dbg_set_channel_flags; - __wine_dbg_set_functions; __wine_dll_register; __wine_main_argc; __wine_main_argv; @@ -19,11 +16,6 @@ WINE_1.0 wine_cp_wcstombs; wine_cpsymbol_mbstowcs; wine_cpsymbol_wcstombs; - wine_dbg_log; - wine_dbg_printf; - wine_dbg_sprintf; - wine_dbgstr_an; - wine_dbgstr_wn; wine_dlclose; wine_dll_enum_load_path; wine_dll_get_owner; @@ -76,6 +68,9 @@ WINE_1.0 /* the following functions are obsolete and only exported for backwards compatibility */ + __wine_dbg_get_channel_flags; + __wine_dbg_set_channel_flags; + __wine_dbg_set_functions; atoiW; atolW; get_char_typeW; @@ -117,6 +112,11 @@ WINE_1.0 vsnprintfW; vsprintfW; wine_call_on_stack; + wine_dbg_log; + wine_dbg_printf; + wine_dbg_sprintf; + wine_dbgstr_an; + wine_dbgstr_wn; wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack;

1 0

Alexandre Julliard : libwine: Make some loader functions obsolete.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: c599ec149431a447084a347d381e7897b2102b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c599ec149431a447084a347d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:49:40 2020 +0100 libwine: Make some loader functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- include/wine/library.h | 5 -- libs/wine/loader.c | 183 ++++++++++++++++++++++++++----------------------- libs/wine/wine.map | 8 +-- 4 files changed, 101 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c599ec149431a447084a…

1 0

Chip Davis : msvcrt: Fix the btowc() function.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 0216290675db25da4266497ef14a623d237ac3c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0216290675db25da4266497e… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jan 28 16:08:13 2020 -0600 msvcrt: Fix the btowc() function. This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 10 ++++-- dlls/msvcrt/tests/string.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ae9f7c9c21..72a52a20a9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -786,9 +786,13 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(c == MSVCRT_EOF) + return MSVCRT_WEOF; + if(!get_locinfo()->lc_codepage) + return c & 255; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index da0400fa83..8f97d8959e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -90,6 +90,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2880,6 +2881,82 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(EOF); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + if(!setlocale(LC_CTYPE, ".1250")) { + win_skip("No codepage 1250 support\n"); + setlocale(LC_ALL, "C"); + _setmbcp(cp); + return; + } + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0x155, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0x155, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4127,6 +4204,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4204,6 +4282,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp();

1 0

Zebediah Figura : strmbase: Merge enumpins.c into filter.c.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: c36641536070e943f5b0eb4281f4f767f696ebf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36641536070e943f5b0eb42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:53 2020 -0600 strmbase: Merge enumpins.c into filter.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 - dlls/strmbase/Makefile.in | 1 - dlls/strmbase/enumpins.c | 212 --------------------------------------- dlls/strmbase/filter.c | 176 ++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 1 - dlls/winegstreamer/Makefile.in | 1 - dlls/wineqtdecoder/Makefile.in | 1 - 7 files changed, 176 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c36641536070e943f5b0…

1 0

Francois Gouget : testbot: Lower the priority of long running mailing list jobs.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: tools Branch: master Commit: 98990095c322bda80a416744f76bc14f0bfdc31f URL: https://source.winehq.org/git/tools.git/?a=commit;h=98990095c322bda80a41674… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 12:54:23 2020 +0100 testbot: Lower the priority of long running mailing list jobs. This helps get as many patches tested as possible when a patch (series) requires full rebuilds and keeps the TestBot busy for a long time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 11 ++++++++--- testbot/web/Submit.pl | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d021f9c..ca8d57f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -152,7 +152,8 @@ sub Submit($$$) # Create a new job for this patch my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->Priority(6); + my $Priority = 5; + $NewJob->Priority($Priority); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); my $Subject = $self->Subject; $Subject =~ s/\[PATCH[^\]]*]//i; @@ -282,8 +283,11 @@ sub Submit($$$) my $Task = $Tasks->Add(); $Task->VM($VM); - $Task->Timeout(GetBuildTimeout($Impacts, $TaskMissions) + - GetTestTimeout($Impacts, $TaskMissions)); + my $Timeout = GetBuildTimeout($Impacts, $TaskMissions) + + GetTestTimeout($Impacts, $TaskMissions); + # Let short-running jobs run first + $Priority = 6 if ($Timeout >= $WineBuildTimeout); + $Task->Timeout($Timeout); $Task->Missions($TaskMissions->{Statement}); } } @@ -320,6 +324,7 @@ sub Submit($$$) # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); + $NewJob->Priority($Priority); ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 1943b42..f76ca6e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1088,7 +1088,7 @@ sub _SubmitJob($$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User($self->GetCurrentSession()->User); - $NewJob->Priority(5); + $NewJob->Priority(4); $NewJob->Remarks($self->{Remarks} || $self->{CmdLineArg} || ""); my $Branch = CreateBranches()->GetItem($self->{Branch}); $NewJob->Branch($Branch) if (defined $Branch);

1 0

Francois Gouget : testbot: Share code to access the latest reference WineTest reports.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: tools Branch: master Commit: e8596e5b7a7d9710e367dfa3952cfca99992cd77 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e8596e5b7a7d9710e367dfa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 04:00:13 2020 +0100 testbot: Share code to access the latest reference WineTest reports. Also take the latest WineTest reports snapshot when the corresponding task completes rather than when the build task they depend on completes. This way the snapshot is taken closest to when the reference reports are needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 12 ++--- testbot/bin/WineRunBuild.pl | 31 ----------- testbot/bin/WineRunTask.pl | 34 +++++------- testbot/bin/WineRunWineTest.pl | 65 ++++------------------ testbot/lib/WineTestBot/LogUtils.pm | 104 +++++++++++++++++++++++++++++++++++- testbot/lib/WineTestBot/Tasks.pm | 30 +++++++++++ 6 files changed, 160 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=e8596e5b7a7d9710e36…

1 0

Francois Gouget : testbot/UpdateTaskLogs: Delete reference reports that are not supposed to exist.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: tools Branch: master Commit: f8b184aac20305cab757b7b4682e2b39c4867761 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8b184aac20305cab757b7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 04:01:47 2020 +0100 testbot/UpdateTaskLogs: Delete reference reports that are not supposed to exist. WineRunBuild used to take a snapshot of the reference logs for all the other tasks even if the build failed. Thus there could be reference logs even when the matching log does not exist. This patch ensures that 'UpdateTaskLogs --delete' still finds and deletes those. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 5f858de..93b6504 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -256,11 +256,16 @@ sub ProcessTaskLogs($$$) if (($OptDelete or $OptRebuild) and !$CollectOnly) { - # Save / delete the task's reference reports - foreach my $ReportName (@{GetLogFileNames($TaskDir)}) + # Save / delete the task's reference reports... all of them, + # even if they were not supposed to exist (e.g. failed builds). + my ($ErrMessage, $ReportNames, $_TaskMissions) = $Task->GetReportNames(); + if ($ErrMessage) + { + Error "$ErrMessage\n"; + $Rc = 1; + } + foreach my $ReportName (@$ReportNames) { - next if ($ReportName !~ /\.report$/); - my $RefReportName = $Task->GetRefReportName($ReportName); my $RefReportPath = "$StepDir/$RefReportName";

1 0

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

Jan. 28, 2020

Module: wine Branch: master Commit: d5bd667390adfede12ad93979f94eb641496cbf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5bd667390adfede12ad9397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 16:41:37 2020 +0100 mshtml/tests: Get rid of strstr_wa. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 37a1426270..ac898dffca 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -81,22 +81,6 @@ static BSTR a2bstr(const char *str) return ret; } -static const WCHAR *strstr_wa(const WCHAR *str, const char *suba) -{ - BSTR sub; - const WCHAR *ret = NULL; - sub = a2bstr(suba); - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } - if (!*p2) {ret = str; break;} - str++; - } - SysFreeString(sub); - return ret; -} - #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) { @@ -2920,14 +2904,13 @@ static void test_body_style(IHTMLStyle *style) if (hres != E_INVALIDARG) { hres = IHTMLStyle_get_listStyle(style, &str); ok(hres == S_OK, "get_listStyle failed: %08x\n", hres); - ok(strstr_wa(str, "decimal-leading-zero") && - strstr_wa(str, "inside") != NULL, + ok(wcsstr(str, L"decimal-leading-zero") && wcsstr(str, L"inside"), "listStyle = %s\n", wine_dbgstr_w(str)); if(compat_mode < COMPAT_IE9) - ok(strstr_wa(str, "none") != NULL, "listStyle = %s\n", wine_dbgstr_w(str)); + ok(wcsstr(str, L"none") != NULL, "listStyle = %s\n", wine_dbgstr_w(str)); else todo_wine - ok(!strstr_wa(str, "none"), "listStyle = %s\n", wine_dbgstr_w(str)); + ok(!wcsstr(str, L"none"), "listStyle = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else {

1 0

Alexandre Julliard : unicode: Try harder to reuse subsequences when compressing data arrays.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: f17a228d450beb666470840ae503d4bd9d9e34e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17a228d450beb666470840a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 27 20:23:54 2020 +0100 unicode: Try harder to reuse subsequences when compressing data arrays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 142 ++- dlls/dwrite/direction.c | 779 ++++++-------- dlls/dwrite/linebreak.c | 1282 ++++++++++------------- dlls/dwrite/mirror.c | 346 +++---- dlls/dwrite/scripts.c | 1113 +++++++++----------- dlls/gdi32/direction.c | 779 ++++++-------- dlls/gdi32/vertical.c | 305 +++--- dlls/kernel32/nameprep.c | 771 ++++++-------- dlls/kernelbase/collation.c | 2349 +++++++++++++++++++++---------------------- dlls/kernelbase/digitmap.c | 165 ++- dlls/kernelbase/wctype.c | 1369 +++++++++++-------------- dlls/usp10/bracket.c | 142 ++- dlls/usp10/direction.c | 779 ++++++-------- dlls/usp10/indicsyllable.c | 640 ++++++------ dlls/usp10/linebreak.c | 1282 ++++++++++------------- dlls/usp10/mirror.c | 346 +++---- dlls/usp10/shaping.c | 532 ++++------ dlls/wineps.drv/vertical.c | 305 +++--- libs/port/collation.c | 2349 +++++++++++++++++++++---------------------- libs/port/combclass.c | 359 +++---- libs/port/digitmap.c | 167 ++- libs/port/wctype.c | 1159 ++++++++++----------- loader/l_intl.nls | Bin 6566 -> 5432 bytes tools/make_unicode | 34 +- 24 files changed, 7796 insertions(+), 9698 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f17a228d450beb666470…

1 0

Henri Verbeet : d2d1: Pass previous and next vectors to d2d_geometry_outline_add_join().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 1fe3f60f68ae5bd47cf22914d15566a77d2e64a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fe3f60f68ae5bd47cf22914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 15:55:27 2020 +0330 d2d1: Pass previous and next vectors to d2d_geometry_outline_add_join(). Instead of the points. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 90 +++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index e2a44c30b6..a61ce692b9 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2090,7 +2090,7 @@ static BOOL d2d_path_geometry_add_figure(struct d2d_geometry *geometry) static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, const D2D1_POINT_2F *prev, const D2D1_POINT_2F *p0, const D2D1_POINT_2F *next) { - D2D1_POINT_2F q_prev, q_next; + static const D2D1_POINT_2F origin = {0.0f, 0.0f}; struct d2d_outline_vertex *v; struct d2d_face *f; size_t base_idx; @@ -2113,35 +2113,29 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, } f = &geometry->outline.faces[geometry->outline.face_count]; - d2d_point_subtract(&q_prev, p0, prev); - d2d_point_subtract(&q_next, next, p0); - - d2d_point_normalise(&q_prev); - d2d_point_normalise(&q_next); - - ccw = d2d_point_ccw(p0, prev, next); + ccw = d2d_point_ccw(&origin, prev, next); if (ccw == 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[2], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, - -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[3], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, - q_prev.x, q_prev.y, q_prev.x, q_prev.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, -prev->x, -prev->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, prev->x, prev->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[2], p0->x + 25.0f * -prev->x, p0->y + 25.0f * -prev->y, + prev->x, prev->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[3], p0->x + 25.0f * -prev->x, p0->y + 25.0f * -prev->y, + -prev->x, -prev->y, -prev->x, -prev->y); } else if (ccw < 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_next.x, q_next.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_next.x, -q_next.y, -q_next.x, -q_next.y); - d2d_outline_vertex_set(&v[2], p0->x, p0->y, -q_next.x, -q_next.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[3], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, next->x, next->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -next->x, -next->y, -next->x, -next->y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -next->x, -next->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, prev->x, prev->y, prev->x, prev->y); } else { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_next.x, -q_next.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[2], p0->x, p0->y, q_prev.x, q_prev.y, q_next.x, q_next.y); - d2d_outline_vertex_set(&v[3], p0->x, p0->y, q_next.x, q_next.y, q_next.x, q_next.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, prev->x, prev->y, -next->x, -next->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -prev->x, -prev->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -prev->x, -prev->y, next->x, next->y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, next->x, next->y, next->x, next->y); } geometry->outline.vertex_count += 4; @@ -2304,11 +2298,21 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, else next = &figure->vertices[i + 1]; - if ((figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) - && !d2d_geometry_outline_add_join(geometry, prev, p0, next)) + if (figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) { - ERR("Failed to add join.\n"); - return FALSE; + D2D1_POINT_2F q_next, q_prev; + + d2d_point_subtract(&q_prev, prev, p0); + d2d_point_subtract(&q_next, next, p0); + + d2d_point_normalise(&q_prev); + d2d_point_normalise(&q_next); + + if (!d2d_geometry_outline_add_join(geometry, &q_prev, p0, &q_next)) + { + ERR("Failed to add join.\n"); + return FALSE; + } } if (type == D2D_VERTEX_TYPE_LINE && (figure_end == D2D1_FIGURE_END_CLOSED || i < figure->vertex_count - 1) @@ -4077,9 +4081,24 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl = HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect) { struct d2d_face *f; - D2D1_POINT_2F *v, v0p, v0n, v1p, v1n, v2p, v2n, v3p, v3n; + D2D1_POINT_2F *v; float l, r, t, b; + static const D2D1_POINT_2F prev[] = + { + { 1.0f, 0.0f}, + { 0.0f, -1.0f}, + {-1.0f, 0.0f}, + { 0.0f, 1.0f}, + }; + static const D2D1_POINT_2F next[] = + { + { 0.0f, 1.0f}, + { 1.0f, 0.0f}, + { 0.0f, -1.0f}, + {-1.0f, 0.0f}, + }; + d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; @@ -4106,15 +4125,6 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory d2d_face_set(&f[1], 0, 2, 3); geometry->fill.face_count = 2; - d2d_point_set(&v0p, l+1.0f, t); - d2d_point_set(&v0n, l, t+1.0f); - d2d_point_set(&v1p, l, b-1.0f); - d2d_point_set(&v1n, l+1.0f, b); - d2d_point_set(&v2p, r-1.0f, b); - d2d_point_set(&v2n, r, b-1.0f); - d2d_point_set(&v3p, r, t+1.0f); - d2d_point_set(&v3n, r-1.0f, t); - if (!d2d_geometry_outline_add_line_segment(geometry, &v[0], &v[1])) goto fail; if (!d2d_geometry_outline_add_line_segment(geometry, &v[1], &v[2])) @@ -4124,13 +4134,13 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory if (!d2d_geometry_outline_add_line_segment(geometry, &v[3], &v[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v0p, &v[0], &v0n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[0], &v[0], &next[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v1p, &v[1], &v1n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[1], &v[1], &next[1])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v2p, &v[2], &v2n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[2], &v[2], &next[2])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v3p, &v[3], &v3n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[3], &v[3], &next[3])) goto fail; return S_OK;

1 0

Zebediah Figura : rpcrt4: Use a critical section for the context handle lock.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 76238898fc4ef41b6eb57c5e2589a7579ee6e3c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76238898fc4ef41b6eb57c5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 17:04:11 2020 -0600 rpcrt4: Use a critical section for the context handle lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_assoc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 504f4d66c8..ab865c2de1 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -24,7 +24,6 @@ #include "rpc.h" #include "rpcndr.h" -#include "winternl.h" #include "wine/debug.h" @@ -55,7 +54,7 @@ typedef struct _RpcContextHandle NDR_RUNDOWN rundown_routine; void *ctx_guard; UUID uuid; - RTL_RWLOCK rw_lock; + CRITICAL_SECTION lock; unsigned int refs; } RpcContextHandle; @@ -463,12 +462,13 @@ RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, return RPC_S_OUT_OF_MEMORY; context_handle->ctx_guard = CtxGuard; - RtlInitializeResource(&context_handle->rw_lock); + InitializeCriticalSection(&context_handle->lock); + context_handle->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcContextHandle.lock"); context_handle->refs = 1; /* lock here to mirror unmarshall, so we don't need to special-case the * freeing of a non-marshalled context handle */ - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); list_add_tail(&assoc->context_handle_list, &context_handle->entry); @@ -500,7 +500,7 @@ RPC_STATUS RpcServerAssoc_FindContextHandle(RpcAssoc *assoc, const UUID *uuid, { LeaveCriticalSection(&assoc->cs); TRACE("found %p\n", context_handle); - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); return RPC_S_OK; } } @@ -555,7 +555,8 @@ static void RpcContextHandle_Destroy(RpcContextHandle *context_handle) context_handle->rundown_routine(context_handle->user_context); } - RtlDeleteResource(&context_handle->rw_lock); + context_handle->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&context_handle->lock); HeapFree(GetProcessHeap(), 0, context_handle); } @@ -566,7 +567,7 @@ unsigned int RpcServerAssoc_ReleaseContextHandle(RpcAssoc *assoc, NDR_SCONTEXT S unsigned int refs; if (release_lock) - RtlReleaseResource(&context_handle->rw_lock); + LeaveCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); refs = --context_handle->refs;

1 0

Zebediah Figura : kernelbase: Implement ReOpenFile().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: c7019a8887a3b035ce6b1ff6b113a8b5c0cc5e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7019a8887a3b035ce6b1ff6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 11:06:43 2020 -0600 kernelbase: Implement ReOpenFile(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47668 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 80 ++++++++++++++++++++++++----------- 2 files changed, 158 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7019a8887a3b035ce6b…

1 0

Chip Davis : setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 4588f10f8d3895624a8a2087f2e5c3c1b51e576f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4588f10f8d3895624a8a2087… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Jan 26 18:02:37 2020 -0600 setupapi: Implement CM_Get_DevNode_Property[_Ex]W(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-0.spec | 2 +- .../api-ms-win-devices-config-l1-1-1.spec | 2 +- dlls/cfgmgr32/cfgmgr32.spec | 2 + dlls/setupapi/devinst.c | 105 +++++++++++++++------ dlls/setupapi/setupapi.spec | 2 + 5 files changed, 83 insertions(+), 30 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index 6fe5ee3b21..59004c997f 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -8,7 +8,7 @@ @ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index 33dad4eaac..e10352eda5 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -8,7 +8,7 @@ @ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 20ede7b13d..8360048421 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,6 +57,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da0..f8a4e93efc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } -/*********************************************************************** - * SetupDiGetDevicePropertyW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, - const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, - DWORD prop_buff_size, DWORD *required_size, DWORD flags) +static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; - WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + WCHAR key_path[55] = L"Properties\\"; HKEY hkey; DWORD value_type; DWORD value_size = 0; LSTATUS ls; - struct device *device; - - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, - required_size, flags); - - if (!(device = get_device(devinfo, device_data))) - return FALSE; if (!prop_key) - { - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return ERROR_INVALID_DATA; if (!prop_type || (!prop_buff && prop_buff_size)) - { - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } + return ERROR_INVALID_USER_BUFFER; if (flags) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } + return ERROR_INVALID_FLAGS; SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); - swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid); + swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid); ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); if (!ls) @@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ if (required_size) *required_size = value_size; + return ls; +} + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + struct device *device; + LSTATUS ls; + + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); + SetLastError(ls); return !ls; } +/*********************************************************************** + * CM_Get_DevNode_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine) +{ + struct device *device = get_devnode_device(devnode); + LSTATUS ls; + + TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + flags, machine); + + if (machine) + return CR_MACHINE_UNAVAILABLE; + + if (!device) + return CR_NO_SUCH_DEVINST; + + if (!prop_buff_size) + return CR_INVALID_POINTER; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags); + switch (ls) + { + case NO_ERROR: + return CR_SUCCESS; + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + case ERROR_INVALID_USER_BUFFER: + return CR_INVALID_POINTER; + case ERROR_INVALID_FLAGS: + return CR_INVALID_FLAG; + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + case ERROR_NOT_FOUND: + return CR_NO_SUCH_VALUE; + } + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE *type, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc101..74c252c6fd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,6 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr)

1 0

Alexandre Julliard : unicode: Use a standard two-level mapping table for the digit map.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 31360d4785fc889927039ea3721d20da873bcc45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31360d4785fc889927039ea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 27 19:36:05 2020 +0100 unicode: Use a standard two-level mapping table for the digit map. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/digitmap.c | 893 ++++++--------------------------------------- dlls/kernelbase/locale.c | 5 +- libs/port/digitmap.c | 893 ++++++--------------------------------------- libs/port/fold.c | 3 +- tools/make_unicode | 2 +- 5 files changed, 235 insertions(+), 1561 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31360d4785fc88992703…

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _searchenv.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 1d0cca465ab6b185dd91db00f61d9ad5d272a766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0cca465ab6b185dd91db00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 18:26:12 2020 +0100 msvcrt: Add support for quoted paths in _searchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- dlls/msvcrt/tests/dir.c | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index e8cba58ac7..d07fcd6c7d 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1683,12 +1683,27 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index 210cf3983c..6c817dfb2e 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -597,6 +597,20 @@ static void test_searchenv(void) ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); } + strcpy(env1, "TEST_PATH="); + strcat(env1, tmppath); + strcat(env1, "\"\\search_env_test\\\"d\"i\"r\"1"); + putenv(env1); + strcpy(exp, tmppath); + strcat(exp, files[0]); + _searchenv("1.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + strcat(env1, ";"); + putenv(env1); + _searchenv("1.dat", "TEST_PATH", result); + ok(!result[0], "got %s, expected ''\n", result); + putenv("TEST_PATH="); for (i=ARRAY_SIZE(files)-1; i>=0; i--) {

1 0

Alexandre Julliard : unicode: Use a standard two-level mapping table for the sortkeys map.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: bfeb0a97fe2f134ab427a36d5709294930aa4253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfeb0a97fe2f134ab427a36d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 27 20:22:47 2020 +0100 unicode: Use a standard two-level mapping table for the sortkeys map. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/collation.c | 443 +++++++++++++------------------------------- dlls/kernelbase/locale.c | 10 +- libs/port/collation.c | 443 +++++++++++++------------------------------- libs/port/sortkey.c | 6 +- tools/make_unicode | 41 ++-- 5 files changed, 295 insertions(+), 648 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bfeb0a97fe2f134ab427…

1 0

Alexandre Julliard : unicode: Use a standard two-level mapping table for the mirror map.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: fb87398b99c57e858752527b091db53d3042749e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb87398b99c57e858752527b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 27 19:38:50 2020 +0100 unicode: Use a standard two-level mapping table for the mirror map. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 3 +- dlls/dwrite/mirror.c | 658 ++++++++++++++++----------------------------------- dlls/usp10/mirror.c | 658 ++++++++++++++++----------------------------------- dlls/usp10/usp10.c | 3 +- tools/make_unicode | 2 +- 5 files changed, 405 insertions(+), 919 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb87398b99c57e858752…

1 0

Zebediah Figura : httpapi: Stub HttpSetRequestQueueProperty().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: afe9217b57c9077dce20a6c9762ae27813d43b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe9217b57c9077dce20a6c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 10:56:39 2020 -0600 httpapi: Stub HttpSetRequestQueueProperty(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48514 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 11 +++++++++++ include/http.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index c27d0c96b0..e1a16c39ab 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -51,6 +51,7 @@ @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation +@ stdcall HttpSetRequestQueueProperty(ptr long ptr long long ptr) @ stub HttpSetServerContextInformation @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) @ stdcall HttpSetUrlGroupProperty(int64 long ptr long) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 8adbd38be5..c24cadfaeb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -760,3 +760,14 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) return GetLastError(); return ERROR_SUCCESS; } + +/*********************************************************************** + * HttpSetRequestQueueProperty (HTTPAPI.@) + */ +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, + void *value, ULONG length, ULONG reserved1, void *reserved2) +{ + FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + queue, property, value, length, reserved1, reserved2); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/http.h b/include/http.h index 394167fd68..f569c1ecb5 100644 --- a/include/http.h +++ b/include/http.h @@ -447,6 +447,7 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length);

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection get/put ConnectionString.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 765fc5cb319b199d1bd9fe145111ea5951c86696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=765fc5cb319b199d1bd9fe14… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 28 11:36:03 2020 +0100 msado15: Implement _Connection get/put ConnectionString. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 24 ++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..2f0aa0c8df 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + WCHAR *datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + heap_free( connection->datasource ); heap_free( connection ); } return refs; @@ -125,14 +127,27 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + BSTR source = NULL; + + TRACE( "%p, %p\n", connection, str ); + + if (connection->datasource && !(source = SysAllocString( connection->datasource ))) return E_OUTOFMEMORY; + *str = source; + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + WCHAR *source = NULL; + + TRACE( "%p, %s\n", connection, debugstr_w( !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); + + if (str && !(source = strdupW( str ))) return E_OUTOFMEMORY; + heap_free( connection->datasource ); + connection->datasource = source; + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) @@ -392,6 +407,7 @@ HRESULT Connection_create( void **obj ) connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; + connection->datasource = NULL; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 917d131063..fb77936bba 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -667,6 +667,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; LONG state, timeout; + BSTR str, str2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -702,6 +703,35 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); + + str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + +if (0) /* Crashes on windows */ +{ + hr = _Connection_get_ConnectionString(connection, NULL); + ok(hr == E_POINTER, "Failed, hr 0x%08x\n", hr); +} + + str2 = NULL; + hr = _Connection_get_ConnectionString(connection, &str2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); + SysFreeString(str); + SysFreeString(str2); + + hr = _Connection_put_ConnectionString(connection, NULL); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); _Connection_Release(connection); }

1 0

Henri Verbeet : wined3d: Get rid of the "DirectDrawRenderer" setting.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 6e515efb715824a4811c40ee3833d48e460d5e67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e515efb715824a4811c40ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 16:35:40 2020 +0330 wined3d: Get rid of the "DirectDrawRenderer" setting. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5d60a44ef6..05684aeb3b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -374,8 +374,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if (!get_config_key(hkey, appkey, "renderer", buffer, size) - || !get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size)) + if (!get_config_key(hkey, appkey, "renderer", buffer, size)) { if (!strcmp(buffer, "vulkan")) {

1 0

Zebediah Figura : winegstreamer: Append an audioconvert element to raw audio streams.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 11b30ffc076126c6e75cb2c4bd026a9d468c18da URL: https://source.winehq.org/git/wine.git/?a=commit;h=11b30ffc076126c6e75cb2c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 19:06:55 2020 -0600 winegstreamer: Append an audioconvert element to raw audio streams. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 155 +++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 77 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 66557b63a5..8e36644030 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -85,10 +85,7 @@ struct gstdemux_source struct strmbase_source pin; IQualityControl IQualityControl_iface; - GstElement *flipfilter; - GstPad *flip_sink, *flip_src; - GstPad *their_src; - GstPad *my_sink; + GstPad *their_src, *post_sink, *post_src, *my_sink; AM_MEDIA_TYPE mt; HANDLE caps_event; GstSegment *segment; @@ -1004,11 +1001,10 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) if (pin->their_src == pad) { - if(pin->flipfilter) - gst_pad_unlink(pin->their_src, pin->flip_sink); + if (pin->post_sink) + gst_pad_unlink(pin->their_src, pin->post_sink); else gst_pad_unlink(pin->their_src, pin->my_sink); - gst_object_unref(pin->their_src); pin->their_src = NULL; return; @@ -1052,85 +1048,91 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * if (!strcmp(typename, "video/x-raw")) { - GstElement *vconv; - - TRACE("setting up videoflip filter for pin %p, my_sink: %p, their_src: %p\n", - pin, pin->my_sink, pad); + GstElement *vconv, *flip; - /* gstreamer outputs video top-down, but dshow expects bottom-up, so - * make new transform filter to invert video */ - vconv = gst_element_factory_make("videoconvert", NULL); - if(!vconv){ - ERR("Missing videoconvert filter?\n"); - ret = -1; - goto exit; + /* decodebin considers many YUV formats to be "raw", but some quartz + * filters can't handle those. Also, videoflip can't handle all "raw" + * formats either. Add a videoconvert to swap color spaces. */ + if (!(vconv = gst_element_factory_make("videoconvert", NULL))) + { + ERR("Failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + return; } - pin->flipfilter = gst_element_factory_make("videoflip", NULL); - if(!pin->flipfilter){ - ERR("Missing videoflip filter?\n"); - ret = -1; - goto exit; + /* GStreamer outputs video top-down, but DirectShow expects bottom-up. */ + if (!(flip = gst_element_factory_make("videoflip", NULL))) + { + ERR("Failed to create videoflip, are %u-bit GStreamer \"good\" plugins installed?\n", + 8 * (int)sizeof(void *)); + return; } - gst_util_set_object_arg(G_OBJECT(pin->flipfilter), "method", "vertical-flip"); + gst_util_set_object_arg(G_OBJECT(flip), "method", "vertical-flip"); gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ gst_element_sync_state_with_parent(vconv); - gst_bin_add(GST_BIN(This->container), pin->flipfilter); /* bin takes ownership */ - gst_element_sync_state_with_parent(pin->flipfilter); + gst_bin_add(GST_BIN(This->container), flip); /* bin takes ownership */ + gst_element_sync_state_with_parent(flip); - gst_element_link (vconv, pin->flipfilter); + gst_element_link(vconv, flip); - pin->flip_sink = gst_element_get_static_pad(vconv, "sink"); - if(!pin->flip_sink){ - WARN("Couldn't find sink on flip filter\n"); - pin->flipfilter = NULL; - ret = -1; - goto exit; - } + pin->post_sink = gst_element_get_static_pad(vconv, "sink"); + pin->post_src = gst_element_get_static_pad(flip, "src"); + } + else if (!strcmp(typename, "audio/x-raw")) + { + GstElement *convert; - ret = gst_pad_link(pad, pin->flip_sink); - if(ret < 0){ - WARN("gst_pad_link failed: %d\n", ret); - gst_object_unref(pin->flip_sink); - pin->flip_sink = NULL; - pin->flipfilter = NULL; - goto exit; + /* Currently our dsound can't handle 64-bit formats or all + * surround-sound configurations. Native dsound can't always handle + * 64-bit formats either. Add an audioconvert to allow changing bit + * depth and channel count. */ + if (!(convert = gst_element_factory_make("audioconvert", NULL))) + { + ERR("Failed to create audioconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + return; } - pin->flip_src = gst_element_get_static_pad(pin->flipfilter, "src"); - if(!pin->flip_src){ - WARN("Couldn't find src on flip filter\n"); - gst_object_unref(pin->flip_sink); - pin->flip_sink = NULL; - pin->flipfilter = NULL; - ret = -1; - goto exit; + gst_bin_add(GST_BIN(This->container), convert); + gst_element_sync_state_with_parent(convert); + + pin->post_sink = gst_element_get_static_pad(convert, "sink"); + pin->post_src = gst_element_get_static_pad(convert, "src"); + } + + if (pin->post_sink) + { + if ((ret = gst_pad_link(pad, pin->post_sink)) < 0) + { + ERR("Failed to link decodebin source pad to post-processing elements, error %s.\n", + gst_pad_link_get_name(ret)); + gst_object_unref(pin->post_sink); + pin->post_sink = NULL; + return; } - ret = gst_pad_link(pin->flip_src, pin->my_sink); - if(ret < 0){ - WARN("gst_pad_link failed: %d\n", ret); - gst_object_unref(pin->flip_src); - pin->flip_src = NULL; - gst_object_unref(pin->flip_sink); - pin->flip_sink = NULL; - pin->flipfilter = NULL; - goto exit; + if ((ret = gst_pad_link(pin->post_src, pin->my_sink)) < 0) + { + ERR("Failed to link post-processing elements to our sink pad, error %s.\n", + gst_pad_link_get_name(ret)); + gst_object_unref(pin->post_src); + pin->post_src = NULL; + gst_object_unref(pin->post_sink); + pin->post_sink = NULL; + return; } - } else - ret = gst_pad_link(pad, pin->my_sink); + } + else if ((ret = gst_pad_link(pad, pin->my_sink)) < 0) + { + ERR("Failed to link decodebin source pad to our sink pad, error %s.\n", + gst_pad_link_get_name(ret)); + return; + } gst_pad_set_active(pin->my_sink, 1); - -exit: - TRACE("Linking: %i\n", ret); - - if (ret >= 0) { - pin->their_src = pad; - gst_object_ref(pin->their_src); - } + gst_object_ref(pin->their_src = pad); } static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) @@ -1156,8 +1158,8 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) if (!pin->their_src) { gst_segment_init(pin->segment, GST_FORMAT_TIME); - if (pin->flipfilter) - ret = gst_pad_link(pad, pin->flip_sink); + if (pin->post_sink) + ret = gst_pad_link(pad, pin->post_sink); else ret = gst_pad_link(pad, pin->my_sink); @@ -2136,14 +2138,13 @@ static void free_source_pin(struct gstdemux_source *pin) if (pin->their_src) { - if (pin->flipfilter) + if (pin->post_sink) { - gst_pad_unlink(pin->their_src, pin->flip_sink); - gst_pad_unlink(pin->flip_src, pin->my_sink); - gst_object_unref(pin->flip_src); - gst_object_unref(pin->flip_sink); - pin->flipfilter = NULL; - pin->flip_src = pin->flip_sink = NULL; + gst_pad_unlink(pin->their_src, pin->post_sink); + gst_pad_unlink(pin->post_src, pin->my_sink); + gst_object_unref(pin->post_src); + gst_object_unref(pin->post_sink); + pin->post_src = pin->post_sink = NULL; } else gst_pad_unlink(pin->their_src, pin->my_sink);

1 0

Zebediah Figura : winegstreamer: Get rid of the AudioConvert filter.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 943b6564f5b2a285f9964f1d1c0743340b2f0bd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=943b6564f5b2a285f9964f1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 19:06:57 2020 -0600 winegstreamer: Get rid of the AudioConvert filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_guids.h | 1 - dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/gsttffilter.c | 120 --------------------------------------- dlls/winegstreamer/main.c | 35 ------------ 4 files changed, 157 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index fe7b65e445..e50ecb4851 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -DEFINE_GUID(CLSID_Gstreamer_AudioConvert, 0x334b2ec9, 0xf2b5, 0x40b9, 0x84, 0x32, 0x4a, 0x00, 0xe0, 0x03, 0x86, 0xa8); DEFINE_GUID(CLSID_Gstreamer_Mp3, 0x728dcf55, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 37b19ea626..7108a32e40 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -37,7 +37,6 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; -IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 5d1a98b0f5..21feefe09d 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -626,123 +626,3 @@ IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkouter, HRESULT *phr) return obj; } - -static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface, const AM_MEDIA_TYPE *amt) -{ - GstTfImpl *This = (GstTfImpl*)iface; - TRACE("%p %p\n", This, amt); - - if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) || - !IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) || - !IsEqualGUID(&amt->formattype, &FORMAT_WaveFormatEx)) - return S_FALSE; - return S_OK; -} - -static HRESULT audio_converter_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) -{ - GstTfImpl *This = (GstTfImpl*)tf; - GstCaps *capsin, *capsout; - AM_MEDIA_TYPE *outpmt = &This->tf.pmt; - WAVEFORMATEX *inwfe; - WAVEFORMATEX *outwfe; - WAVEFORMATEXTENSIBLE *outwfx; - GstAudioFormat format; - HRESULT hr; - BOOL inisfloat = FALSE; - int indepth; - - mark_wine_thread(); - - if (Gstreamer_AudioConvert_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) - return E_FAIL; - - FreeMediaType(outpmt); - *outpmt = *amt; - outpmt->pUnk = NULL; - outpmt->cbFormat = sizeof(WAVEFORMATEXTENSIBLE); - outpmt->pbFormat = CoTaskMemAlloc(outpmt->cbFormat); - - inwfe = (WAVEFORMATEX*)amt->pbFormat; - indepth = inwfe->wBitsPerSample; - if (inwfe->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { - WAVEFORMATEXTENSIBLE *inwfx = (WAVEFORMATEXTENSIBLE*)inwfe; - inisfloat = IsEqualGUID(&inwfx->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - if (inwfx->Samples.wValidBitsPerSample) - indepth = inwfx->Samples.wValidBitsPerSample; - } else if (inwfe->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) - inisfloat = TRUE; - - if (inisfloat) - format = inwfe->wBitsPerSample == 64 ? GST_AUDIO_FORMAT_F64LE : GST_AUDIO_FORMAT_F32LE; - else - format = gst_audio_format_build_integer(inwfe->wBitsPerSample != 8, G_LITTLE_ENDIAN, - inwfe->wBitsPerSample, indepth); - - capsin = gst_caps_new_simple("audio/x-raw", - "format", G_TYPE_STRING, gst_audio_format_to_string(format), - "channels", G_TYPE_INT, inwfe->nChannels, - "rate", G_TYPE_INT, inwfe->nSamplesPerSec, - NULL); - - outwfe = (WAVEFORMATEX*)outpmt->pbFormat; - outwfx = (WAVEFORMATEXTENSIBLE*)outwfe; - outwfe->wFormatTag = WAVE_FORMAT_EXTENSIBLE; - outwfe->nChannels = 2; - outwfe->nSamplesPerSec = inwfe->nSamplesPerSec; - outwfe->wBitsPerSample = 16; - outwfe->nBlockAlign = outwfe->nChannels * outwfe->wBitsPerSample / 8; - outwfe->nAvgBytesPerSec = outwfe->nBlockAlign * outwfe->nSamplesPerSec; - outwfe->cbSize = sizeof(*outwfx) - sizeof(*outwfe); - outwfx->Samples.wValidBitsPerSample = outwfe->wBitsPerSample; - outwfx->dwChannelMask = SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT; - outwfx->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - - capsout = gst_caps_new_simple("audio/x-raw", - "format", G_TYPE_STRING, "S16LE", - "channels", G_TYPE_INT, outwfe->nChannels, - "rate", G_TYPE_INT, outwfe->nSamplesPerSec, - NULL); - - - hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); - gst_caps_unref(capsin); - gst_caps_unref(capsout); - - This->cbBuffer = inwfe->nAvgBytesPerSec; - return hr; -} - -static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { - .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, - .pfnStartStreaming = Gstreamer_transform_ProcessBegin, - .pfnReceive = Gstreamer_transform_ProcessData, - .pfnStopStreaming = Gstreamer_transform_ProcessEnd, - .pfnCheckInputType = Gstreamer_AudioConvert_QueryConnect, - .transform_connect_sink = audio_converter_connect_sink, - .pfnBreakConnect = Gstreamer_transform_Cleanup, - .pfnEndOfStream = Gstreamer_transform_EndOfStream, - .pfnBeginFlush = Gstreamer_transform_BeginFlush, - .pfnEndFlush = Gstreamer_transform_EndFlush, - .pfnNewSegment = Gstreamer_transform_NewSegment, - .pfnNotify = Gstreamer_transform_QOS, -}; - -IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkouter, HRESULT *phr) -{ - IUnknown *obj = NULL; - - TRACE("%p %p\n", punkouter, phr); - - if (!init_gstreamer()) - { - *phr = E_FAIL; - return NULL; - } - - *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_AudioConvert, "audioconvert", &Gstreamer_AudioConvert_vtbl, (LPVOID*)&obj); - - TRACE("returning %p\n", obj); - - return obj; -} diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index cdc3ba0ddc..3e0ef28afb 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -40,8 +40,6 @@ static const WCHAR wGstreamer_Splitter[] = {'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_Mp3[] = {'G','S','t','r','e','a','m','e','r',' ','M','p','3',' ','f','i','l','t','e','r',0}; -static const WCHAR wGstreamer_AudioConvert[] = -{'G','S','t','r','e','a','m','e','r',' ','A','u','d','i','o','C','o','n','v','e','r','t',' ','f','i','l','t','e','r',0}; static const WCHAR wave_parserW[] = {'W','a','v','e',' ','P','a','r','s','e','r',0}; static const WCHAR avi_splitterW[] = @@ -122,32 +120,6 @@ AMOVIESETUP_FILTER const amfMp3 = amfMp3Pin }; -AMOVIESETUP_PIN amfAudioConvertPin[] = -{ { wNull, - FALSE, FALSE, FALSE, FALSE, - &GUID_NULL, - NULL, - 1, - amfMTaudio - }, - { - wNull, - FALSE, TRUE, FALSE, FALSE, - &GUID_NULL, - NULL, - 1, - amfMTaudio - }, -}; - -AMOVIESETUP_FILTER const amfAudioConvert = -{ &CLSID_Gstreamer_AudioConvert, - wGstreamer_AudioConvert, - MERIT_UNLIKELY, - 2, - amfAudioConvertPin -}; - static const AMOVIESETUP_MEDIATYPE wave_parser_sink_type_data[] = { {&MEDIATYPE_Stream, &MEDIASUBTYPE_WAVE}, @@ -295,13 +267,6 @@ FactoryTemplate const g_Templates[] = { NULL, &amfMp3, }, - { - wGstreamer_AudioConvert, - &CLSID_Gstreamer_AudioConvert, - Gstreamer_AudioConvert_create, - NULL, - &amfAudioConvert, - }, { wave_parserW, &CLSID_WAVEParser,

1 0