November 2019 - Wine-Commits

Jacek Caban : vbscript: Support changing script state to SCRIPTSTATE_INITIALIZED.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 9e2700b2fc04dc4c7cfafc671d820d9ea83d52b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e2700b2fc04dc4c7cfafc67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:08:22 2019 +0100 vbscript: Support changing script state to SCRIPTSTATE_INITIALIZED. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 29 +++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 9 ++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index fd769cc280..c0a582c361 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -796,6 +796,35 @@ static void test_vbscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); + SET_EXPECT(OnStateChange_STARTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_STARTED); + + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_INITIALIZED); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08x\n", hres); + + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CLOSED); + + test_state(script, SCRIPTSTATE_CLOSED); + + SET_EXPECT(GetLCID); + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + CHECK_CALLED(OnStateChange_INITIALIZED); + + test_state(script, SCRIPTSTATE_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); hres = IActiveScript_Close(script); ok(hres == S_OK, "Close failed: %08x\n", hres); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index ebd100f4e5..886c9d01af 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -207,14 +207,13 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) /* FALLTHROUGH */ case SCRIPTSTATE_STARTED: case SCRIPTSTATE_DISCONNECTED: - if(This->state == SCRIPTSTATE_DISCONNECTED) - change_state(This, SCRIPTSTATE_INITIALIZED); - if(state == SCRIPTSTATE_INITIALIZED) - break; + change_state(This, SCRIPTSTATE_INITIALIZED); /* FALLTHROUGH */ case SCRIPTSTATE_INITIALIZED: case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); + if(state == SCRIPTSTATE_INITIALIZED) + break; release_script(This->ctx); This->thread_id = 0; break; @@ -469,7 +468,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE exec_queued_code(This->ctx); break; case SCRIPTSTATE_INITIALIZED: - FIXME("unimplemented SCRIPTSTATE_INITIALIZED\n"); + decrease_state(This, SCRIPTSTATE_INITIALIZED); return S_OK; case SCRIPTSTATE_DISCONNECTED: FIXME("unimplemented SCRIPTSTATE_DISCONNECTED\n");

1 0

Nikolay Sivov : mfreadwrite: Return earlier on ReadSample() is stream is deselected.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 9cb55ea30d57fe9c775db259733f8b5a58a8e0a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb55ea30d57fe9c775db259… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:09:44 2019 +0300 mfreadwrite: Return earlier on ReadSample() is stream is deselected. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 9fa1445a8f..f24de690bc 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -591,10 +591,20 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) return refcount; } +static HRESULT source_reader_get_stream_selection(const struct source_reader *reader, DWORD index, BOOL *selected) +{ + IMFStreamDescriptor *sd; + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, selected, &sd))) + return MF_E_INVALIDSTREAMNUMBER; + IMFStreamDescriptor_Release(sd); + + return S_OK; +} + static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL *selected) { struct source_reader *reader = impl_from_IMFSourceReader(iface); - IMFStreamDescriptor *sd; TRACE("%p, %#x, %p.\n", iface, index, selected); @@ -610,11 +620,7 @@ static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWOR ; } - if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, selected, &sd))) - return MF_E_INVALIDSTREAMNUMBER; - IMFStreamDescriptor_Release(sd); - - return S_OK; + return source_reader_get_stream_selection(reader, index, selected); } static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL selected) @@ -820,6 +826,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind struct media_stream *stream; DWORD stream_index; HRESULT hr = S_OK; + BOOL selected; if (!stream_flags || !sample) return E_POINTER; @@ -841,12 +848,16 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind stream_index = index; } - if (stream_index >= reader->stream_count) + /* Can't read from deselected streams. */ + if (SUCCEEDED(hr = source_reader_get_stream_selection(reader, stream_index, &selected)) && !selected) + hr = MF_E_INVALIDREQUEST; + + if (FAILED(hr)) { *stream_flags = MF_SOURCE_READERF_ERROR; if (actual_index) *actual_index = index; - return MF_E_INVALIDSTREAMNUMBER; + return hr; } if (actual_index)

1 0

Jacek Caban : vbscript: Don't allow changing script state when script site is not set.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 706898dcbb5d1553a3e9f60c422f9112fad57694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=706898dcbb5d1553a3e9f60c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:08:09 2019 +0100 vbscript: Don't allow changing script state when script site is not set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 5 +++++ dlls/vbscript/vbscript.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index fdbfc4465b..fd769cc280 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -713,6 +713,11 @@ static void test_vbscript_uninitializing(void) test_no_script_dispatch(script); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_INITIALIZED) failed: %08x\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 59ec577846..ebd100f4e5 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -457,7 +457,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE return S_OK; } - if(!This->is_initialized) + if(!This->is_initialized || !This->ctx->site) return E_UNEXPECTED; switch(ss) {

1 0

Jacek Caban : vbscript: Fix parsing call expressions.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 509044296dde3688cfdaaf02325a1bc8f890bd85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=509044296dde3688cfdaaf02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:08:35 2019 +0100 vbscript: Fix parsing call expressions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41119 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 15 --------------- dlls/vbscript/lex.c | 8 +++++++- dlls/vbscript/parser.y | 22 ++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 19 +++++++++++++++++++ 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 6b0e113bef..e52b0814e0 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1038,21 +1038,6 @@ static HRESULT compile_call_statement(compile_ctx_t *ctx, call_statement_t *stat { HRESULT hres; - /* It's challenging for parser to distinguish parameterized assignment with one argument from call - * with equality expression argument, so we do it in compiler. */ - if(!stat->is_strict && stat->expr->args && !stat->expr->args->next && stat->expr->args->type == EXPR_EQUAL) { - binary_expression_t *eqexpr = (binary_expression_t*)stat->expr->args; - - if(eqexpr->left->type == EXPR_BRACKETS) { - call_expression_t new_call = *stat->expr; - - WARN("converting call expr to assign expr\n"); - - new_call.args = ((unary_expression_t*)eqexpr->left)->subexpr; - return compile_assignment(ctx, &new_call, eqexpr->right, FALSE); - } - } - hres = compile_call_expression(ctx, stat->expr, FALSE); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f78eee4ff9..005e7c3d58 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -409,7 +409,13 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) ctx->ptr++; return tEMPTYBRACKETS; } - return '('; + /* + * Parser can't predict if bracket is part of argument expression or an argument + * in call expression. We predict it here instead. + */ + if(ctx->last_token == tIdentifier || ctx->last_token == ')') + return '('; + return tEXPRLBRACKET; case '"': return parse_string_literal(ctx, lval); case '&': diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 46af0b16be..9315b7ea39 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -107,7 +107,7 @@ static statement_t *link_statements(statement_t*,statement_t*); double dbl; } -%token tEXPRESSION tEOF tNL tEMPTYBRACKETS +%token tEXPRESSION tEOF tNL tEMPTYBRACKETS tEXPRLBRACKET %token tLTEQ tGTEQ tNEQ %token tSTOP tME tREM tDOT %token <string> tTRUE tFALSE @@ -427,7 +427,7 @@ IntegerValue | tInt { $$ = $1; } PrimaryExpression - : '(' Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } + : tEXPRLBRACKET Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } | tME { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; } ClassDeclaration @@ -729,18 +729,28 @@ static call_expression_t *make_call_expression(parser_ctx_t *ctx, expression_t * call_expr = (call_expression_t*)callee_expr; if(!call_expr->args) { call_expr->args = arguments; - }else if(call_expr->args->next) { + return call_expr; + } + + if(call_expr->args->next) { FIXME("Invalid syntax: invalid use of parentheses for arguments\n"); ctx->hres = E_FAIL; return NULL; - }else if(arguments->type != EXPR_NOARG) { + } + + call_expr->args = new_unary_expression(ctx, EXPR_BRACKETS, call_expr->args); + if(!call_expr->args) + return NULL; + if(!arguments) + return call_expr; + + if(arguments->type != EXPR_NOARG) { FIXME("Invalid syntax: missing comma\n"); ctx->hres = E_FAIL; return NULL; - }else { - call_expr->args->next = arguments->next; } + call_expr->args->next = arguments->next; return call_expr; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8a6f0ecd45..46e2ac7ab8 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1645,4 +1645,23 @@ end function set x = testsetresult(1, 2) ok x.prop = 1, "x.prop = " & x.prop +set arr(0) = new TestPropSyntax +arr(0).prop = 1 +ok arr(0).prop = 1, "arr(0) = " & arr(0).prop + +function f2(x,y) +end function + +f2 1 = 1, 2 + +function f1(x) + ok x = true, "x = " & x +end function + +f1 1 = 1 +f1 1 = (1) +f1 not 1 = 0 + +arr (0) = 2 xor -2 + reportSuccess()

1 0

Jacek Caban : vbscript: Clean up lookup_identifier.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: ae1291cbe0c7fbe0dd4aeffbe214388c4ebecb2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1291cbe0c7fbe0dd4aeffb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:09:20 2019 +0100 vbscript: Clean up lookup_identifier. Be more explicit about what applies only to non-global code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 211a5af5f8..89f9d359da 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -109,26 +109,26 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - for(i=0; i < ctx->func->var_cnt; i++) { - if(!wcsicmp(ctx->func->vars[i].name, name)) { - ref->type = REF_VAR; - ref->u.v = ctx->vars+i; - return TRUE; + if(ctx->func->type != FUNC_GLOBAL) { + for(i=0; i < ctx->func->var_cnt; i++) { + if(!wcsicmp(ctx->func->vars[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->vars+i; + return TRUE; + } } - } - for(i=0; i < ctx->func->arg_cnt; i++) { - if(!wcsicmp(ctx->func->args[i].name, name)) { - ref->type = REF_VAR; - ref->u.v = ctx->args+i; - return S_OK; + for(i=0; i < ctx->func->arg_cnt; i++) { + if(!wcsicmp(ctx->func->args[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->args+i; + return S_OK; + } } - } - if(lookup_dynamic_vars(ctx->func->type == FUNC_GLOBAL ? ctx->script->global_vars : ctx->dynamic_vars, name, ref)) - return S_OK; + if(lookup_dynamic_vars(ctx->dynamic_vars, name, ref)) + return S_OK; - if(ctx->func->type != FUNC_GLOBAL) { if(ctx->vbthis) { /* FIXME: Bind such identifier while generating bytecode. */ for(i=0; i < ctx->vbthis->desc->prop_cnt; i++) { @@ -159,7 +159,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; for(i = 0; i < ctx->script->global_funcs_cnt; i++) {

1 0

Nikolay Sivov : shell32: Remove "stub" from traces.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 539644ad63702a71080427a2be3359d6f081019c URL: https://source.winehq.org/git/wine.git/?a=commit;h=539644ad63702a71080427a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:33:47 2019 +0300 shell32: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shlview.c | 19 +++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 54fb818526..e2746deb48 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1105,7 +1105,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR filename, shortname; WIN32_FIND_DATAA * pfd; - TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); + TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len); pdump(pidl); if (!psf || !dest) @@ -1163,7 +1163,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR filename, shortname; WIN32_FIND_DATAW * pfd = dest; - TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); + TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len); pdump(pidl); diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 956fd50871..3b70a2a94b 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -269,7 +269,7 @@ DWORD WINAPI CheckEscapesW( DWORD size = lstrlenW(string); LPWSTR s, d; - TRACE("(%s %d) stub\n", debugstr_w(string), len); + TRACE("%s, %u.\n", debugstr_w(string), len); if (StrPBrkW(string, strEscapedChars) && size + 2 <= len) { diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index bcb9466315..ff1332087d 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -778,13 +778,9 @@ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This) TRACE("-- return (menu=%p)\n",hSubMenu); return hSubMenu; } -/********************************************************** -* ShellView_MergeFileMenu() -*/ + static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu) { - TRACE("(%p)->(submenu=%p) stub\n",This,hSubMenu); - if (hSubMenu) { static const WCHAR dummyW[] = {'d','u','m','m','y','4','5',0}; @@ -806,8 +802,6 @@ static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu) mii.fType = MFT_STRING; InsertMenuItemW(hSubMenu, 0, TRUE, &mii); } - - TRACE("--\n"); } /********************************************************** @@ -989,7 +983,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL LPCONTEXTMENU pContextMenu = NULL; CMINVOKECOMMANDINFO cmi; - TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",This, x, y, bDefault); + TRACE("%p, %d, %d, %d.\n", This, x, y, bDefault); /* look, what's selected and create a context menu object of it*/ if( ShellView_GetSelections(This) ) @@ -1230,7 +1224,7 @@ static LRESULT ShellView_OnSetFocus(IShellViewImpl * This) */ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This) { - TRACE("(%p) stub\n",This); + TRACE("%p.\n", This); ShellView_OnActivate(This, SVUIA_ACTIVATE_NOFOCUS); /* Notify the ICommDlgBrowser */ @@ -1870,7 +1864,7 @@ static HRESULT WINAPI IShellView_fnUIActivate(IShellView3 *iface, UINT uState) LRESULT lResult; int nPartArray[1] = {-1}; - TRACE("(%p)->(state=%x) stub\n",This, uState); + TRACE("%p, %d.\n", This, uState); /*don't do anything if the state isn't really changing*/ if(This->uState == uState) @@ -2677,7 +2671,7 @@ static ULONG WINAPI FolderView_Release(IFolderView2 *iface) static HRESULT WINAPI FolderView_GetCurrentViewMode(IFolderView2 *iface, UINT *mode) { IShellViewImpl *This = impl_from_IFolderView2(iface); - TRACE("(%p)->(%p), stub\n", This, mode); + TRACE("%p, %p.\n", This, mode); if(!mode) return E_INVALIDARG; @@ -2690,7 +2684,8 @@ static HRESULT WINAPI FolderView_SetCurrentViewMode(IFolderView2 *iface, UINT mo { IShellViewImpl *This = impl_from_IFolderView2(iface); DWORD dwStyle; - TRACE("(%p)->(%u), stub\n", This, mode); + + TRACE("%p, %u.\n", This, mode); if((mode < FVM_FIRST || mode > FVM_LAST) && (mode != FVM_AUTO))

1 0

Nikolay Sivov : ole32: Remove "stub" from traces.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 4fe18052c552268c1a5c5e8de7c9ac654436a4f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe18052c552268c1a5c5e8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:34:08 2019 +0300 ole32: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 3837a1f74c..07d55e2f94 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -142,7 +142,7 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) ******************************************************************************/ static HRESULT WINAPI ClassMoniker_GetClassID(IMoniker* iface,CLSID *pClassID) { - TRACE("(%p,%p),stub!\n",iface,pClassID); + TRACE("(%p, %p)\n", iface, pClassID); if (pClassID==NULL) return E_POINTER;

1 0

Nikolay Sivov : msxml3: Remove "stub" from traces.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: be89f936877a3218e5361c2c1efec761045a98ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=be89f936877a3218e5361c2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:34:18 2019 +0300 msxml3: Remove "stub" from traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/parseerror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 438c9eb3c4..2ca0885708 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -224,7 +224,7 @@ static HRESULT WINAPI parseError_get_line( { parse_error_t *This = impl_from_IXMLDOMParseError2( iface ); - TRACE("(%p)->(%p): stub\n", This, line); + TRACE("%p, %p.\n", This, line); if (!line) return E_INVALIDARG;

1 0

Alexandre Julliard : kernel32: Move support for running wineboot to ntdll.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 461b5e56f95eb095d97e4af1cb1c5fd64bb2862a URL: https://source.winehq.org/git/wine.git/?a=commit;h=461b5e56f95eb095d97e4af1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 11:05:07 2019 +0100 kernel32: Move support for running wineboot to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 296 +------------------------------------------ dlls/ntdll/env.c | 100 +++++++++++++-- programs/wineboot/wineboot.c | 14 +- 3 files changed, 97 insertions(+), 313 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=461b5e56f95eb095d97e…

1 0

Alexandre Julliard : ntdll: Support running a builtin without corresponding file in RtlCreateUserProcess().
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 326df4c18042bdb6243a75a0843a71f85927dc71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=326df4c18042bdb6243a75a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 11:03:54 2019 +0100 ntdll: Support running a builtin without corresponding file in RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c7e2cdb1b7..7c108f2896 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1135,6 +1135,32 @@ static NTSTATUS spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int soc } +/*************************************************************************** + * is_builtin_path + */ +static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) +{ + static const WCHAR systemW[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\'}; + static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','w','o','w','6','4'}; + + *is_64bit = is_win64; + if (path->Length > sizeof(systemW) && !strncmpiW( path->Buffer, systemW, ARRAY_SIZE(systemW) )) + { + if (is_wow64 && !ntdll_get_thread_data()->wow64_redir) *is_64bit = TRUE; + return TRUE; + } + if ((is_win64 || is_wow64) && path->Length > sizeof(wow64W) && + !strncmpiW( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) + { + *is_64bit = FALSE; + return TRUE; + } + return FALSE; +} + + /*********************************************************************** * get_pe_file_info */ @@ -1148,7 +1174,29 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, InitializeObjectAttributes( &attr, path, attributes, 0, 0 ); if ((status = NtOpenFile( handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_DELETE, 0 ))) return status; + FILE_SHARE_READ | FILE_SHARE_DELETE, 0 ))) + { + BOOL is_64bit; + + if (is_builtin_path( path, &is_64bit )) + { + TRACE( "assuming %u-bit builtin for %s\n", is_64bit ? 64 : 32, debugstr_us(path)); + memset( info, 0, sizeof(*info) ); + /* assume current arch */ +#if defined(__i386__) || defined(__x86_64__) + info->cpu = is_64bit ? CPU_x86_64 : CPU_x86; +#elif defined(__powerpc__) + info->cpu = CPU_POWERPC; +#elif defined(__arm__) + info->cpu = CPU_ARM; +#elif defined(__aarch64__) + info->cpu = CPU_ARM64; +#endif + *handle = 0; + return STATUS_SUCCESS; + } + return status; + } if (!(status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE, @@ -1355,10 +1403,10 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, process_handle = thread_handle = 0; status = STATUS_SUCCESS; } - else status = err ? err : ERROR_INTERNAL_ERROR; + else status = err ? err : STATUS_INTERNAL_ERROR; done: - NtClose( file_handle ); + if (file_handle) NtClose( file_handle ); if (process_info) NtClose( process_info ); if (process_handle) NtClose( process_handle ); if (thread_handle) NtClose( thread_handle );

1 0