November 2019 - Wine-Commits

Jacek Caban : vbscript: Store only VBScript this objects in execution context.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 708c1e865d8938973491fe44fcd25d658e218a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=708c1e865d8938973491fe44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:09:04 2019 +0100 vbscript: Store only VBScript this objects in execution context. If it's an implicit this, we can handle that in interp_me. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a74c6c320e..211a5af5f8 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -31,7 +31,6 @@ typedef struct { instr_t *instr; script_ctx_t *script; function_t *func; - IDispatch *this_obj; vbdisp_t *vbthis; VARIANT *args; @@ -1446,13 +1445,21 @@ static HRESULT interp_stop(exec_ctx_t *ctx) static HRESULT interp_me(exec_ctx_t *ctx) { + IDispatch *disp; VARIANT v; TRACE("\n"); - IDispatch_AddRef(ctx->this_obj); + if(ctx->vbthis) + disp = (IDispatch*)&ctx->vbthis->IDispatchEx_iface; + else if(ctx->script->host_global) + disp = ctx->script->host_global; + else + disp = (IDispatch*)&ctx->script->script_obj->IDispatchEx_iface; + + IDispatch_AddRef(disp); V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = ctx->this_obj; + V_DISPATCH(&v) = disp; return stack_push(ctx, &v); } @@ -2205,8 +2212,8 @@ static void release_exec(exec_ctx_t *ctx) VariantClear(&ctx->ret_val); release_dynamic_vars(ctx->dynamic_vars); - if(ctx->this_obj) - IDispatch_Release(ctx->this_obj); + if(ctx->vbthis) + IDispatchEx_Release(&ctx->vbthis->IDispatchEx_iface); if(ctx->args) { for(i=0; i < ctx->func->arg_cnt; i++) @@ -2301,14 +2308,9 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd IActiveScriptSite_OnEnterScript(ctx->site); if(vbthis) { - exec.this_obj = (IDispatch*)&vbthis->IDispatchEx_iface; + IDispatchEx_AddRef(&vbthis->IDispatchEx_iface); exec.vbthis = vbthis; - }else if (ctx->host_global) { - exec.this_obj = ctx->host_global; - }else { - exec.this_obj = (IDispatch*)&ctx->script_obj->IDispatchEx_iface; } - IDispatch_AddRef(exec.this_obj); exec.instr = exec.code->instrs + func->code_off; exec.script = ctx;

1 0

Vincent Povirk : msi: Use integers internally for MSIDBOPEN constants.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: cce9a5f124ae6d3fffcc7772cab6523f09a1e3d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cce9a5f124ae6d3fffcc7772… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 4 15:05:42 2019 -0600 msi: Use integers internally for MSIDBOPEN constants. This fixes a bug where some verions of mingw and probably gcc assume that the result of pointer subtraction will be non-NULL, causing MSI_OpenDatabaseW to break when given the mode MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 40 ++++++++++++++++++++++------------------ dlls/msi/msipriv.h | 10 +++++++++- dlls/msi/msiquery.c | 2 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 776fe53e16..f7c70aeead 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -144,7 +144,8 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) HRESULT r; MSIDATABASE *db = NULL; UINT ret = ERROR_FUNCTION_FAILED; - LPCWSTR szMode, save_path; + LPCWSTR save_path; + UINT mode; STATSTG stat; BOOL created = FALSE, patch = FALSE; WCHAR path[MAX_PATH]; @@ -154,31 +155,34 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( !pdb ) return ERROR_INVALID_PARAMETER; - if (szPersist - MSIDBOPEN_PATCHFILE <= MSIDBOPEN_CREATEDIRECT) + save_path = szDBPath; + if ( IS_INTMSIDBOPEN(szPersist) ) { - TRACE("Database is a patch\n"); - szPersist -= MSIDBOPEN_PATCHFILE; - patch = TRUE; + mode = LOWORD(szPersist); } - - save_path = szDBPath; - szMode = szPersist; - if( !IS_INTMSIDBOPEN(szPersist) ) + else { if (!CopyFileW( szDBPath, szPersist, FALSE )) return ERROR_OPEN_FAILED; szDBPath = szPersist; - szPersist = MSIDBOPEN_TRANSACT; + mode = MSI_OPEN_TRANSACT; created = TRUE; } - if( szPersist == MSIDBOPEN_READONLY ) + if ((mode & MSI_OPEN_PATCHFILE) == MSI_OPEN_PATCHFILE) + { + TRACE("Database is a patch\n"); + mode &= ~MSI_OPEN_PATCHFILE; + patch = TRUE; + } + + if( mode == MSI_OPEN_READONLY ) { r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } - else if( szPersist == MSIDBOPEN_CREATE ) + else if( mode == MSI_OPEN_CREATE ) { r = StgCreateDocfile( szDBPath, STGM_CREATE|STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg ); @@ -187,7 +191,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) r = db_initialize( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); created = TRUE; } - else if( szPersist == MSIDBOPEN_CREATEDIRECT ) + else if( mode == MSI_OPEN_CREATEDIRECT ) { r = StgCreateDocfile( szDBPath, STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg ); @@ -196,19 +200,19 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) r = db_initialize( stg, patch ? &CLSID_MsiPatch : &CLSID_MsiDatabase ); created = TRUE; } - else if( szPersist == MSIDBOPEN_TRANSACT ) + else if( mode == MSI_OPEN_TRANSACT ) { r = StgOpenStorage( szDBPath, NULL, STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } - else if( szPersist == MSIDBOPEN_DIRECT ) + else if( mode == MSI_OPEN_DIRECT ) { r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); } else { - ERR("unknown flag %p\n",szPersist); + ERR("unknown flag %x\n",mode); return ERROR_INVALID_PARAMETER; } @@ -267,7 +271,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) enum_stream_names( stg ); db->storage = stg; - db->mode = szMode; + db->mode = mode; if (created) db->deletefile = strdupW( szDBPath ); list_init( &db->tables ); @@ -1977,7 +1981,7 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ))) return MSIDBSTATE_ERROR; - if (db->mode != MSIDBOPEN_READONLY ) + if (db->mode != MSI_OPEN_READONLY ) ret = MSIDBSTATE_WRITE; msiobj_release( &db->hdr ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0732973341..fca2f9e7b4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -95,6 +95,14 @@ typedef struct tagMSITRANSFORM IStorage *stg; } MSITRANSFORM; +/* integer versions of the MSIDBOPEN_* constants */ +#define MSI_OPEN_READONLY 0 +#define MSI_OPEN_TRANSACT 1 +#define MSI_OPEN_DIRECT 2 +#define MSI_OPEN_CREATE 3 +#define MSI_OPEN_CREATEDIRECT 4 +#define MSI_OPEN_PATCHFILE 32 + typedef struct tagMSIDATABASE { MSIOBJECTHDR hdr; @@ -104,7 +112,7 @@ typedef struct tagMSIDATABASE LPWSTR path; LPWSTR deletefile; LPWSTR tempfolder; - LPCWSTR mode; + UINT mode; UINT media_transform_offset; UINT media_transform_disk_id; struct list tables; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index cf8b2b2b4d..526589c320 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -981,7 +981,7 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb ) return ERROR_SUCCESS; } - if (db->mode == MSIDBOPEN_READONLY) + if (db->mode == MSI_OPEN_READONLY) { msiobj_release( &db->hdr ); return ERROR_SUCCESS;

1 0

Nikolay Sivov : comsvcs: Add GetTimeOfLastChange() for "new" moniker.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 2ede7a5a742ca1562b926de6393d5638ac0ada12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ede7a5a742ca1562b926de6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 13:09:27 2019 +0300 comsvcs: Add GetTimeOfLastChange() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 4 ++-- dlls/comsvcs/tests/comsvcs.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 6b292844d9..ee75893561 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -577,9 +577,9 @@ static HRESULT WINAPI new_moniker_IsRunning(IMoniker* iface, IBindCtx *pbc, IMon static HRESULT WINAPI new_moniker_GetTimeOfLastChange(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *itemtime) { - FIXME("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, itemtime); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, itemtime); - return E_NOTIMPL; + return MK_E_UNAVAILABLE; } static HRESULT WINAPI new_moniker_Inverse(IMoniker *iface, IMoniker **inverse) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 37fce3dab4..bdb817a144 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -344,7 +344,6 @@ todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); -todo_wine ok(hr == MK_E_UNAVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj);

1 0

Jacek Caban : vbscript: Add Replace function implementation.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: e343fcaf7656eb0ca0b648d8aa159ab2f6007785 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e343fcaf7656eb0ca0b648d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:07:58 2019 +0100 vbscript: Add Replace function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 76 +++++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 68 +++++++++++++++++++++++++++++++++++++--- dlls/vbscript/vbregexp.c | 42 +++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 179 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e4ff572412..8d4150ad70 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2278,10 +2278,80 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return E_NOTIMPL; } -static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR string, find = NULL, replace = NULL, ret; + int from = 1, cnt = -1; + HRESULT hres = S_OK; + + TRACE("%s %s %s %u...\n", debugstr_variant(args), debugstr_variant(args+1), debugstr_variant(args+2), args_cnt); + + assert(3 <= args_cnt && args_cnt <= 6); + if(V_VT(args) != VT_BSTR) { + hres = to_string(args, &string); + if(FAILED(hres)) + return hres; + }else { + string = V_BSTR(args); + } + + if(V_VT(args+1) != VT_BSTR) { + hres = to_string(args+1, &find); + if(FAILED(hres)) + goto error; + }else { + find = V_BSTR(args+1); + } + + if(V_VT(args+2) != VT_BSTR) { + hres = to_string(args+2, &replace); + if(FAILED(hres)) + goto error; + }else { + replace = V_BSTR(args+2); + } + + if(args_cnt >= 4) { + hres = to_int(args+3, &from); + if(FAILED(hres)) + goto error; + if(from < 1) { + hres = E_INVALIDARG; + goto error; + } + } + + if(args_cnt >= 5) { + hres = to_int(args+4, &cnt); + if(FAILED(hres)) + goto error; + if(cnt < -1) { + hres = E_INVALIDARG; + goto error; + } + } + + if(args_cnt == 6) + FIXME("copare argument not supported\n"); + + ret = string_replace(string, find, replace, from - 1, cnt); + if(!ret) { + hres = E_OUTOFMEMORY; + }else if(res) { + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + }else { + SysFreeString(ret); + } + +error: + if(V_VT(args) != VT_BSTR) + SysFreeString(string); + if(V_VT(args+1) != VT_BSTR) + SysFreeString(find); + if(V_VT(args+2) != VT_BSTR) + SysFreeString(replace); + return hres; } static HRESULT Global_StrReverse(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d4f3eeaa47..0a65984483 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -640,11 +640,6 @@ TestLTrim "", "" TestLTrim 123, "123" if isEnglishLang then TestLTrim true, "True" -Sub TestRound(val, exval, vt) - Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) - Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) -End Sub - Sub TestRTrim(str, exstr) Call ok(RTrim(str) = exstr, "RTrim(" & str & ") = " & RTrim(str)) End Sub @@ -657,6 +652,69 @@ TestRTrim "", "" TestRTrim 123, "123" if isEnglishLang then TestRTrim true, "True" +sub test_replace(str, find, rep, exp) + dim r + r = Replace(str, find, rep) + ok r = exp, "Replace(""" & str & """, """ & find & """, """ & rep & """) = """ & _ + r & """ expected """ & exp & """" +end sub + +sub test_replace_from(str, find, rep, from, exp) + dim r + r = Replace(str, find, rep, from) + ok r = exp, "Replace(""" & str & """, """ & find & """, """ & rep & """, " & from & ") = """ & _ + r & """ expected """ & exp & """" +end sub + +sub test_replace_cnt(str, find, rep, from, cnt, exp) + dim r + r = Replace(str, find, rep, from, cnt) + ok r = exp, "Replace(""" & str & """, """ & find & """, """ & rep & """, " & from & ", " & cnt & ") = """ & _ + r & """ expected """ & exp & """" +end sub + +test_replace "xx testxx(xx)", "xx", "!", "! test!(!)" +test_replace "xxx", "", "y", "xxx" +test_replace "xxxxx", "xx", "y", "yyx" +test_replace 123, 2, 6, "163" +test_replace "xyz" & Chr(0) & "xyz", "y", "Y", "xYz" & Chr(0) & "xYz" +test_replace "xyz" & Chr(0) & "xyz", Chr(0) & "x", "Y" & Chr(0) & Chr(0), "xyzY" & Chr(0) & Chr(0) & "yz" + +test_replace_from "xx testxx(xx)", "xx", "!", 1, "! test!(!)" +test_replace_from "xx testxx(xx)", "xx", "!", 1, "! test!(!)" +test_replace_from "xx testxx(xx)", "xx", "!", 2, "x test!(!)" +test_replace_from "xx testxx(xx)", "xx", "!", 2000, "" +test_replace_from "xxx", "", "y", 2, "xx" + +test_replace_cnt "xx testxx(xx)", "xx", "!", 1, 2, "! test!(xx)" +test_replace_cnt "xx testxx(xx)", "xx", "!", 1, 1, "! testxx(xx)" +test_replace_cnt "xx testxx(xx)", "xx", "!", 2, 1, "x test!(xx)" +test_replace_cnt "xx testxx(xx)", "xx", "!", 1, -1, "! test!(!)" +test_replace_cnt "xx testxx(xx)", "xx", "!", 1, 0, "xx testxx(xx)" + +on error resume next +Replace "xx", "x", "y", -1 +x = err.number +on error goto 0 +ok x = 5, "err = " & x + +on error resume next +Replace "xx", "x", "y", 0 +x = err.number +on error goto 0 +ok x = 5, "err = " & x + +on error resume next +Replace "xx", "x", "y", 1, -2 +x = err.number +on error goto 0 +ok x = 5, "err = " & x + +Sub TestRound(val, exval, vt) + Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) + Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) +End Sub + TestRound 3, 3, "VT_I2" TestRound 3.3, 3, "VT_R8" TestRound 3.8, 4, "VT_R8" diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 4edf9dcbfe..ac667da442 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1629,6 +1629,48 @@ static const IRegExp2Vtbl RegExp2Vtbl = { RegExp2_Replace }; +BSTR string_replace(BSTR string, BSTR find, BSTR replace, int from, int cnt) +{ + const WCHAR *ptr, *string_end; + strbuf_t buf = { NULL, 0, 0 }; + size_t replace_len, find_len; + BSTR ret = NULL; + HRESULT hres = S_OK; + + string_end = string + SysStringLen(string); + ptr = from > SysStringLen(string) ? string_end : string + from; + + find_len = SysStringLen(find); + replace_len = SysStringLen(replace); + if(!replace_len) + cnt = 0; + + while(string_end - ptr >= find_len && cnt && find_len) { + if(memcmp(ptr, find, find_len * sizeof(WCHAR))) { + hres = strbuf_append(&buf, ptr, 1); + if(FAILED(hres)) + break; + ptr++; + }else { + hres = strbuf_append(&buf, replace, replace_len); + if(FAILED(hres)) + break; + ptr += find_len; + if(cnt != -1) + cnt--; + } + } + + if(SUCCEEDED(hres)) { + hres = strbuf_append(&buf, ptr, string_end - ptr); + if(SUCCEEDED(hres)) + ret = SysAllocStringLen(buf.buf, buf.len); + } + + heap_free(buf.buf); + return ret; +} + static inline RegExp2 *impl_from_IRegExp(IRegExp *iface) { return CONTAINING_RECORD(iface, RegExp2, IRegExp_iface); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 8543813c49..0bd1fce156 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -373,6 +373,7 @@ static inline BOOL is_int32(double d) } HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; +BSTR string_replace(BSTR,BSTR,BSTR,int,int) DECLSPEC_HIDDEN; HRESULT map_hres(HRESULT) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : comsvcs: Implement IPersistStream methods for "new" moniker.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 239055cfc71b241df94150b066e9f3be87102da4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=239055cfc71b241df94150b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 13:09:29 2019 +0300 comsvcs: Implement IPersistStream methods for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 59 ++++++++++++++++++++++++++++++++++++-------- dlls/comsvcs/tests/comsvcs.c | 44 ++++++++++++++++++++++++++++++++- 2 files changed, 92 insertions(+), 11 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 58a5f26823..c7d6aaa613 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -476,37 +476,76 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) static HRESULT WINAPI new_moniker_GetClassID(IMoniker *iface, CLSID *clsid) { - FIXME("%p, %p.\n", iface, clsid); + TRACE("%p, %p.\n", iface, clsid); - return E_NOTIMPL; + if (!clsid) + return E_POINTER; + + *clsid = CLSID_NewMoniker; + + return S_OK; } static HRESULT WINAPI new_moniker_IsDirty(IMoniker* iface) { - FIXME("%p.\n", iface); + TRACE("%p.\n", iface); - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) { - FIXME("%p, %p.\n", iface, stream); + struct new_moniker *moniker = impl_from_IMoniker(iface); + ULARGE_INTEGER pad; + CLSID clsid; + HRESULT hr; + DWORD len; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, stream); + + hr = IStream_Read(stream, &clsid, sizeof(clsid), &len); + if (FAILED(hr)) + return hr; + + pad.QuadPart = 1; + hr = IStream_Read(stream, &pad, sizeof(pad), &len); + if (FAILED(hr)) + return hr; + + if (pad.QuadPart != 0) + return E_FAIL; + + moniker->clsid = clsid; + + return S_OK; } static HRESULT WINAPI new_moniker_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { - FIXME("%p, %p, %d.\n", iface, stream, clear_dirty); + struct new_moniker *moniker = impl_from_IMoniker(iface); + static const ULARGE_INTEGER pad; + ULONG written; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %d.\n", iface, stream, clear_dirty); + + hr = IStream_Write(stream, &moniker->clsid, sizeof(moniker->clsid), &written); + if (SUCCEEDED(hr)) + hr = IStream_Write(stream, &pad, sizeof(pad), &written); + + return hr; } static HRESULT WINAPI new_moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *size) { - FIXME("%p, %p.\n", iface, size); + TRACE("%p, %p.\n", iface, size); - return E_NOTIMPL; + if (!size) + return E_POINTER; + + size->QuadPart = sizeof(CLSID) + 2 * sizeof(DWORD); + + return S_OK; } static HRESULT WINAPI new_moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 8e59abc52b..bdd078da33 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -270,13 +270,17 @@ static void create_dispenser(void) static void test_new_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *class_moniker; + IUnknown *obj, *obj2; + ULARGE_INTEGER size; DWORD moniker_type; IBindCtx *bindctx; FILETIME filetime; DWORD hash, eaten; - IUnknown *obj, *obj2; + IStream *stream; + HGLOBAL hglobal; CLSID clsid; HRESULT hr; + void *ptr; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); @@ -372,6 +376,44 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(obj == NULL, "Unexpected return value.\n"); + /* Serialization. */ + hr = IMoniker_GetSizeMax(moniker, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + size.QuadPart = 0; + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Failed to get size, hr %#x.\n", hr); + ok(size.QuadPart == (sizeof(GUID) + 2 * sizeof(DWORD)), "Unexpected size %s.\n", + wine_dbgstr_longlong(size.QuadPart)); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = IMoniker_Save(moniker, stream, FALSE); + ok(hr == S_OK, "Failed to save moniker, hr %#x.\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "Failed to get a handle, hr %#x.\n", hr); + + ptr = GlobalLock(hglobal); + ok(!!ptr, "Failed to get data pointer.\n"); + + hr = CLSIDFromString(L"{20d04fe0-3aea-1069-a2d8-08002b30309d}", &clsid); + ok(hr == S_OK, "Failed to get CLSID, hr %#x.\n", hr); + ok(IsEqualGUID((GUID *)ptr, &clsid), "Unexpected buffer content.\n"); + ok(*(DWORD *)((BYTE *)ptr + sizeof(GUID)) == 0, "Unexpected buffer content.\n"); + ok(*(DWORD *)((BYTE *)ptr + sizeof(GUID) + sizeof(DWORD)) == 0, "Unexpected buffer content.\n"); + + GlobalUnlock(hglobal); + + IStream_Release(stream); + + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetClassID(moniker, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : comsvcs: Accept progid's when creating "new" monikers.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: eab97b206812005efbf74c4f25c444512e07df6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eab97b206812005efbf74c4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 13:09:30 2019 +0300 comsvcs: Accept progid's when creating "new" monikers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 2 +- dlls/comsvcs/tests/comsvcs.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index c7d6aaa613..86ffe2587b 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -790,7 +790,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG if (wcsnicmp(name, L"new:", 4)) return MK_E_SYNTAX; - if (!guid_from_string(name + 4, &guid)) + if (!guid_from_string(name + 4, &guid) && FAILED(CLSIDFromProgID(name + 4, &guid))) return MK_E_SYNTAX; moniker = heap_alloc_zero(sizeof(*moniker)); diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index bdd078da33..d94b99afd1 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -271,6 +271,7 @@ static void test_new_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *class_moniker; IUnknown *obj, *obj2; + BIND_OPTS2 bind_opts; ULARGE_INTEGER size; DWORD moniker_type; IBindCtx *bindctx; @@ -415,6 +416,18 @@ todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); IMoniker_Release(moniker); + + /* Full path to create new object, using progid. */ + memset(&bind_opts, 0, sizeof(bind_opts)); + bind_opts.cbStruct = sizeof(bind_opts); + bind_opts.dwClassContext = CLSCTX_INPROC_SERVER; + + hr = CoGetObject(L"new:msxml2.domdocument", (BIND_OPTS *)&bind_opts, &IID_IXMLDOMDocument, (void **)&obj); +todo_wine + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(obj); + IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : mfreadwrite: Use separate helpers for sync/async ReadSample().
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 0cd9878a407e7f7234dad198125a503720187725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd9878a407e7f7234dad198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:09:42 2019 +0300 mfreadwrite: Use separate helpers for sync/async ReadSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 114 +++++++++++++++++++++++----------------- dlls/mfreadwrite/tests/mfplat.c | 4 -- 2 files changed, 65 insertions(+), 53 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 3467746bb8..6fb00b4d37 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -778,14 +778,17 @@ static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *st return ret; } -static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, +static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { - struct source_reader *reader = impl_from_IMFSourceReader(iface); + struct media_stream *stream; DWORD stream_index; - HRESULT hr; + HRESULT hr = S_OK; - TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + if (!stream_flags || !sample) + return E_POINTER; + + *sample = NULL; switch (index) { @@ -802,68 +805,81 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, stream_index = index; } - /* FIXME: probably should happen once */ - IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL); - - if (reader->async_callback) + if (stream_index >= reader->stream_count) { - FIXME("Async mode is not implemented.\n"); - return E_NOTIMPL; + *stream_flags = MF_SOURCE_READERF_ERROR; + if (actual_index) + *actual_index = index; + return MF_E_INVALIDSTREAMNUMBER; } - else - { - struct media_stream *stream; - if (!stream_flags || !sample) - return E_POINTER; + if (actual_index) + *actual_index = stream_index; - *sample = NULL; + stream = &reader->streams[stream_index]; - if (stream_index >= reader->stream_count) + EnterCriticalSection(&stream->cs); + + if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) + { + while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) { - *stream_flags = MF_SOURCE_READERF_ERROR; - if (actual_index) - *actual_index = index; - return MF_E_INVALIDSTREAMNUMBER; + if (stream->stream) + { + if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) + WARN("Sample request failed, hr %#x.\n", hr); + } + SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); } + } - if (actual_index) - *actual_index = stream_index; + *sample = media_stream_pop_sample(stream, stream_flags); - stream = &reader->streams[stream_index]; + LeaveCriticalSection(&stream->cs); - EnterCriticalSection(&stream->cs); + TRACE("Got sample %p.\n", *sample); - if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) - { - while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) - { - if (stream->stream) - { - if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) - WARN("Sample request failed, hr %#x.\n", hr); - } - SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); - } - } + if (timestamp) + { + /* TODO: it's possible timestamp has to be set for some events. + For MEEndOfStream it's correct to return 0. */ + *timestamp = 0; + if (*sample) + IMFSample_GetSampleTime(*sample, timestamp); + } - *sample = media_stream_pop_sample(stream, stream_flags); + return hr; +} - LeaveCriticalSection(&stream->cs); +static HRESULT source_reader_read_sample_async(struct source_reader *reader, DWORD index, DWORD flags) +{ + FIXME("Async mode is not implemented.\n"); - TRACE("Got sample %p.\n", *sample); + return E_NOTIMPL; +} - if (timestamp) - { - /* TODO: it's possible timestamp has to be set for some events. - For MEEndOfStream it's correct to return 0. */ - *timestamp = 0; - if (*sample) - IMFSample_GetSampleTime(*sample, timestamp); - } +static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, + DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) +{ + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + + /* FIXME: probably should happen once */ + IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL); + + if (reader->async_callback) + { + if (actual_index || stream_flags || timestamp || sample) + return E_INVALIDARG; + + hr = source_reader_read_sample_async(reader, index, flags); } + else + hr = source_reader_read_sample(reader, index, flags, actual_index, stream_flags, timestamp, sample); - return S_OK; + return hr; } static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 27ceb0faf1..16bb92b80e 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -894,19 +894,15 @@ todo_wine /* Return values are delivered to callback only. */ hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, &stream_flags, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, &timestamp, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFSourceReader_ReadSample(reader, 0, 0, NULL, NULL, NULL, &sample); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IMFSourceReader_Release(reader);

1 0

Nikolay Sivov : mfreadwrite: Track source state in reader.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: a095d157699709b270893c1069050f59a49accc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a095d157699709b270893c10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 14:09:43 2019 +0300 mfreadwrite: Track source state in reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 6fb00b4d37..9fa1445a8f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -84,6 +84,12 @@ enum media_stream_state STREAM_STATE_EOS, }; +enum media_source_state +{ + SOURCE_STATE_STOPPED = 0, + SOURCE_STATE_STARTED, +}; + struct media_stream { IMFMediaStream *stream; @@ -107,6 +113,7 @@ struct source_reader DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; BOOL shutdown_on_release; + enum media_source_state source_state; struct media_stream *streams; DWORD stream_count; CRITICAL_SECTION cs; @@ -268,6 +275,30 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM return hr; } +static HRESULT source_reader_source_state_handler(struct source_reader *reader, MediaEventType event_type) +{ + enum media_source_state state; + + switch (event_type) + { + case MESourceStarted: + state = SOURCE_STATE_STARTED; + break; + case MESourceStopped: + state = SOURCE_STATE_STOPPED; + break; + default: + WARN("Unhandled state %d.\n", event_type); + return E_FAIL; + } + + EnterCriticalSection(&reader->cs); + reader->source_state = state; + LeaveCriticalSection(&reader->cs); + + return S_OK; +} + static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); @@ -292,6 +323,11 @@ static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallba case MENewStream: hr = source_reader_new_stream_handler(reader, event); break; + case MESourceStarted: + case MESourcePaused: + case MESourceStopped: + hr = source_reader_source_state_handler(reader, event_type); + break; default: ; }

1 0

Nikolay Sivov : comsvcs: Add Enum() for "new" moniker.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: f1123366d17497dd1d15fdd4ecfe1729e64d5833 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1123366d17497dd1d15fdd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 5 13:09:28 2019 +0300 comsvcs: Add Enum() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 9 +++++++-- dlls/comsvcs/tests/comsvcs.c | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index ee75893561..58a5f26823 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -543,9 +543,14 @@ static HRESULT WINAPI new_moniker_ComposeWith(IMoniker *iface, IMoniker *mkRight static HRESULT WINAPI new_moniker_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **enum_moniker) { - FIXME("%p, %d, %p.\n", iface, forward, enum_moniker); + TRACE("%p, %d, %p.\n", iface, forward, enum_moniker); - return E_NOTIMPL; + if (!enum_moniker) + return E_POINTER; + + *enum_moniker = NULL; + + return S_OK; } static HRESULT WINAPI new_moniker_IsEqual(IMoniker *iface, IMoniker *other_moniker) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index bdb817a144..8e59abc52b 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -364,6 +364,14 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + hr = IMoniker_Enum(moniker, FALSE, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + obj = (IUnknown *)moniker; + hr = IMoniker_Enum(moniker, FALSE, (IEnumMoniker **)&obj); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(obj == NULL, "Unexpected return value.\n"); + IMoniker_Release(moniker); IBindCtx_Release(bindctx); }

1 0

Jacek Caban : vbscript: Lookup this object in lookup_identifier only if it's an actual VBScript object.
by Alexandre Julliard Nov. 5, 2019

Nov. 5, 2019

Module: wine Branch: master Commit: 3c366be35384790713d9cc5e06ab28dcda5bf50f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c366be35384790713d9cc5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:08:47 2019 +0100 vbscript: Lookup this object in lookup_identifier only if it's an actual VBScript object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 14 +++++++------- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4800ae7ce6..a74c6c320e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -139,14 +139,14 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } } - } - hres = disp_get_id(ctx->this_obj, name, invoke_type, TRUE, &id); - if(SUCCEEDED(hres)) { - ref->type = REF_DISP; - ref->u.d.disp = ctx->this_obj; - ref->u.d.id = id; - return S_OK; + hres = vbdisp_get_id(ctx->vbthis, name, invoke_type, TRUE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = (IDispatch*)&ctx->vbthis->IDispatchEx_iface; + ref->u.d.id = id; + return S_OK; + } } } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9ed1096a4d..707fd89493 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -3025,6 +3025,12 @@ static void run_tests(void) parse_script_a("testOptionalArg 1,,2"); CHECK_CALLED(global_testoptionalarg_i); + parse_script_a("sub x()\n" + " dim y\n" + " y = cint(3)\n" + "end sub\n" + "x\n"); + strict_dispid_check = FALSE; SET_EXPECT(testobj_value_i);

1 0