August 2020 - Wine-Devel - list.winehq.org

[PATCH] dwrite: Add IDWriteFontFace5::Equals() stub.
by Brendan Shanks Aug. 20, 2020

Aug. 20, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Fixes crash in current CEF. dlls/dwrite/font.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 19fe911420f..e1d9849a9d8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1562,6 +1562,13 @@ static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, I return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); } +static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFace *other) +{ + FIXME("%p, %p.\n", iface, other); + + return E_NOTIMPL; +} + static const IDWriteFontFace5Vtbl dwritefontfacevtbl = { dwritefontface_QueryInterface, @@ -1621,6 +1628,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl = dwritefontface5_GetFontAxisValues, dwritefontface5_HasVariations, dwritefontface5_GetFontResource, + dwritefontface5_Equals, }; static HRESULT WINAPI dwritefontface_reference_QueryInterface(IDWriteFontFaceReference *iface, REFIID riid, void **obj) -- 2.26.2

3 2

[PATCH v2] winebrowser: Prefix an invalid URL with 'http://' before opening with a browser.
by Brendan Shanks Aug. 19, 2020

Aug. 19, 2020

Fixes usage like 'winebrowser winehq.org' when xdg-open or macOS 'open' is used. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Only prefix the URL with 'http://' when URL parsing fails. Clarify error printed when URL parsing fails. programs/winebrowser/main.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..7895afae842 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -118,7 +118,7 @@ static LSTATUS get_commands( HKEY key, const WCHAR *value, WCHAR *buffer, DWORD return res; } -static int open_http_url( const WCHAR *url ) +static int open_http_url( const WCHAR *url, BOOL url_valid ) { #ifdef __APPLE__ static const WCHAR defaultbrowsers[] = @@ -136,9 +136,13 @@ static int open_http_url( const WCHAR *url ) #endif static const WCHAR browsersW[] = {'B','r','o','w','s','e','r','s',0}; + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; WCHAR browsers[256]; + WCHAR *url_prefixed; HKEY key; + int ret; LONG r; /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ @@ -150,7 +154,27 @@ static int open_http_url( const WCHAR *url ) if (r != ERROR_SUCCESS) memcpy( browsers, defaultbrowsers, sizeof(defaultbrowsers) ); - return launch_app( browsers, url ); + /* If url parsing failed, prefix url with 'http://'. Required by xdg-open and macOS open. */ + if (url_valid) + { + ret = launch_app( browsers, url ); + } + else + { + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = launch_app( browsers, url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + } + return ret; } static int open_mailto_url( const WCHAR *url ) @@ -448,8 +472,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); if(FAILED(hres)) { - WINE_ERR("Failed to parse URL\n"); - ret = open_http_url(url); + WINE_ERR("Failed to parse URL %s, treating as HTTP\n", wine_dbgstr_w(url)); + ret = open_http_url(url, FALSE); HeapFree(GetProcessHeap(), 0, ddeString); return ret; } @@ -476,7 +500,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ret = open_mailto_url(display_uri); else /* let the browser decide how to handle the given url */ - ret = open_http_url(display_uri); + ret = open_http_url(display_uri, TRUE); SysFreeString(display_uri); return ret; -- 2.26.2

1 0

[PATCH v4] vbscript: Implement Split.
by Robert Wilhelm Aug. 19, 2020

Aug. 19, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47570 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v3: Try to address comments from Jacek's review: Fix some corner cases, avoid memory leaks and add more tests. v4: If there are two delimeters or delimeter is at front or rear, an empty string is returned. --- dlls/vbscript/global.c | 126 +++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 43 ++++++++++++ 2 files changed, 166 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 122f5c7b71..b3f4999685 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2291,10 +2291,130 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V return E_NOTIMPL; } -static HRESULT Global_Split(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, string, delimeter = NULL; + int count, max, mode, len, start, end, ret, delimeterlen = 1; + SAFEARRAYBOUND bounds; + SAFEARRAY *sa = NULL; + VARIANT *data, var; + HRESULT hres = S_OK; + + TRACE("%s %u...\n", debugstr_variant(args), args_cnt); + + assert(1 <= args_cnt && args_cnt <= 4); + if(V_VT(args) != VT_BSTR) { + hres = to_string(args, &string); + if(FAILED(hres)) + return hres; + }else { + string = V_BSTR(args); + } + + if(args_cnt > 1) + { + if(V_VT(args+1) != VT_BSTR) { + hres = to_string(args+1, &delimeter); + if(FAILED(hres)) + goto error; + }else { + delimeter = V_BSTR(args+1); + } + delimeterlen = SysStringLen(delimeter); + } + + if(args_cnt > 2) { + hres = to_int(args+2, &max); + if(FAILED(hres)) + goto error;; + }else { + max = -1; + } + + if(args_cnt == 4) { + hres = to_int(args+3, &mode); + if(FAILED(hres)) + goto error; + if (mode != 0 && mode != 1) { + FIXME("unknown compare mode = %d\n", mode); + hres = E_FAIL; + goto error; + } + } + else { + mode = 0; + } + + start = 0; + bounds.lLbound = 0; + bounds.cElements = 0; + sa = SafeArrayCreate( VT_VARIANT, 1, &bounds); + if (!sa) + { + hres = E_OUTOFMEMORY; + goto error; + } + len = SysStringLen(string); + count = 0; + + while(1) { + ret = -1; + if (delimeterlen) { + ret = FindStringOrdinal(FIND_FROMSTART, string + start, len -start, + delimeter ? delimeter : L" ", delimeterlen, mode); + } + + if (ret == -1) { + end = len; + } + else { + end = start + ret; + } + + str = SysAllocStringLen(string + start, end - start); + if (!str) { + hres = E_OUTOFMEMORY; + break; + } + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = str; + bounds.cElements++; + SafeArrayRedim(sa, &bounds); + hres = SafeArrayAccessData(sa, (void**)&data); + if(FAILED(hres)) { + SafeArrayDestroy(sa); + break; + } + + hres = VariantCopyInd(data+count, &var); + if(FAILED(hres)) { + SafeArrayUnaccessData(sa); + SafeArrayDestroy(sa); + break; + } + + SafeArrayUnaccessData(sa); + count++; + + if (ret == -1) break; + start = start + ret + delimeterlen; + if (count == max) break; + if (start > len) break; + } + +error: + if(res) { + V_VT(res) = VT_ARRAY|VT_VARIANT; + V_ARRAY(res) = sa; + }else { + if (sa) SafeArrayDestroy(sa); + } + + if(V_VT(args) != VT_BSTR) + SysFreeString(string); + if(V_VT(args+1) != VT_BSTR) + SysFreeString(delimeter); + return hres; } static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6af49c849d..60ad6359dc 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -609,6 +609,49 @@ TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +x=Split("abc") +Call ok(x(0) = "abc", "Split(""abc"")(0)=" & x(0)) +x = Split("abc def") +Call ok(x(0) = "abc", "Split(""abc def"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc def"")(1)=" & x(1)) +x = Split("abc def ghi") +Call ok(x(0) = "abc", "Split(""abc def ghi"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc def ghi"")(1)=" & x(1)) +Call ok(x(2) = "ghi", "Split(""abc def ghi"")(2)=" & x(2)) +x = Split("abc def","") +Call ok(x(0) = "abc def", "Split(""abc def"","""")(0)=" & x(0)) +x = Split("abc-def","-") +Call ok(x(0) = "abc", "Split(""abc-def"",""-"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc-def"",""-"")(1)=" & x(1)) +x = Split("abc--def","-") +Call ok(x(0) = "abc", "Split(""abc--def"",""-"")(0)=" & x(0)) +Call ok(x(1) = "", "Split(""abc--def"",""-"")(1)=" & x(1)) +Call ok(x(2) = "def", "Split(""abc--def"",""-"")(2)=" & x(2)) +x = Split("abcdefghi","def") +Call ok(x(0) = "abc", "Split(""abcdefghi"",""def"")(0)=" & x(0)) +Call ok(x(1) = "ghi", "Split(""abcdefghi"",""def"")(1)=" & x(1)) +x = Split("12345",3) +Call ok(x(0) = "12", "Split(""12345"",3)(0)=" & x(0)) +Call ok(x(1) = "45", "Split(""12345"",3)(1)=" & x(1)) +x = Split("12345",5) +Call ok(x(0) = "1234", "Split(""12345"",5)(0)=" & x(0)) +Call ok(x(1) = "", "Split(""12345"",5)(1)=" & x(1)) +x = Split("12345",12) +Call ok(x(0) = "", "Split(""12345"",12)(0)=" & x(0)) +Call ok(x(1) = "345", "Split(""12345"",12)(1)=" & x(1)) +x = Split("abc-def-ghi","-") +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-""))=" & UBound(x)) +x = Split("abc-def-ghi","-",2) +Call ok(UBound(x) = 1, "UBound(Split(""abc-def-ghi"",""-"",2))=" & UBound(x)) +x = Split("abc-def-ghi","-",4) +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-"",4))=" & UBound(x)) +x = Split("abcZdefZghi","Z",3,0) +Call ok(UBound(x) = 2, "UBound(Split(""abcZdefZghi"",""Z"",3,0))=" & UBound(x)) +x = Split("abcZdefZghi","z",3,0) +Call ok(UBound(x) = 0, "UBound(Split(""abcZdefZghi"",""z"",3,0))=" & UBound(x)) +x = Split("abcZdefZghi","z",3,1) +Call ok(UBound(x) = 2, "UBound(Split(""abcZdefZghi"",""z"",3,1))=" & UBound(x)) + Sub TestStrComp(str_left, str_right, mode, ex) x = StrComp(str_left, str_right, mode) Call ok(x = ex, "StrComp(" & str_left & ", " & str_right & ", " & mode & ") = " & x & " expected " & ex) -- 2.26.2

2 1

[PATCH] msscript.ocx: Implement the ScriptProcedure enumerator.
by Gabriel Ivăncescu Aug. 19, 2020

Aug. 19, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 194 ++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 80 ++++++++++++ 2 files changed, 272 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a339e70..d493065 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -110,6 +110,15 @@ struct ScriptProcedureCollection { struct list hash_table[43]; }; +struct procedure_enum { + IEnumVARIANT IEnumVARIANT_iface; + LONG ref; + + WORD pos; + WORD count; + ScriptProcedureCollection *procedures; +}; + struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; @@ -532,6 +541,11 @@ static inline struct module_enum *module_enum_from_IEnumVARIANT(IEnumVARIANT *if return CONTAINING_RECORD(iface, struct module_enum, IEnumVARIANT_iface); } +static inline struct procedure_enum *procedure_enum_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, struct procedure_enum, IEnumVARIANT_iface); +} + /* IActiveScriptSite */ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { @@ -976,6 +990,151 @@ done: return hr; } +static HRESULT WINAPI procedure_enum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IEnumVARIANT, riid)) + { + *ppv = &This->IEnumVARIANT_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI procedure_enum_AddRef(IEnumVARIANT *iface) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI procedure_enum_Release(IEnumVARIANT *iface) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + IScriptProcedureCollection_Release(&This->procedures->IScriptProcedureCollection_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI procedure_enum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + FUNCDESC *desc; + ITypeInfo *ti; + UINT i, num; + HRESULT hr; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if (!rgVar) return E_POINTER; + if (!This->procedures->module->host) return E_FAIL; + + hr = start_script(This->procedures->module->host); + if (FAILED(hr)) return hr; + + hr = get_script_typeinfo(This->procedures->module, &ti); + if (FAILED(hr)) return hr; + + num = min(celt, This->count - This->pos); + for (i = 0; i < num; i++) + { + hr = ITypeInfo_GetFuncDesc(ti, This->pos + i, &desc); + if (FAILED(hr)) break; + + hr = get_script_procedure(This->procedures, ti, desc, (IScriptProcedure**)&V_DISPATCH(rgVar + i)); + if (FAILED(hr)) break; + + V_VT(rgVar + i) = VT_DISPATCH; + } + + if (FAILED(hr)) + { + while (i--) + VariantClear(rgVar + i); + if (pCeltFetched) *pCeltFetched = 0; + return hr; + } + + This->pos += i; + + if (pCeltFetched) *pCeltFetched = i; + return i == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI procedure_enum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%u)\n", This, celt); + + if (This->count - This->pos < celt) + { + This->pos = This->count; + return S_FALSE; + } + This->pos += celt; + return S_OK; +} + +static HRESULT WINAPI procedure_enum_Reset(IEnumVARIANT *iface) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + + TRACE("(%p)\n", This); + + This->pos = 0; + return S_OK; +} + +static HRESULT WINAPI procedure_enum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + struct procedure_enum *This = procedure_enum_from_IEnumVARIANT(iface); + struct procedure_enum *clone; + + TRACE("(%p)->(%p)\n", This, ppEnum); + + if (!ppEnum) return E_POINTER; + + if (!(clone = heap_alloc(sizeof(*clone)))) + return E_OUTOFMEMORY; + + *clone = *This; + clone->ref = 1; + IScriptProcedureCollection_AddRef(&This->procedures->IScriptProcedureCollection_iface); + + *ppEnum = &clone->IEnumVARIANT_iface; + return S_OK; +} + +static const IEnumVARIANTVtbl procedure_enum_vtbl = { + procedure_enum_QueryInterface, + procedure_enum_AddRef, + procedure_enum_Release, + procedure_enum_Next, + procedure_enum_Skip, + procedure_enum_Reset, + procedure_enum_Clone +}; + static HRESULT WINAPI ScriptProcedureCollection_QueryInterface(IScriptProcedureCollection *iface, REFIID riid, void **ppv) { ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); @@ -1091,10 +1250,41 @@ static HRESULT WINAPI ScriptProcedureCollection_Invoke(IScriptProcedureCollectio static HRESULT WINAPI ScriptProcedureCollection_get__NewEnum(IScriptProcedureCollection *iface, IUnknown **ppenumProcedures) { ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + struct procedure_enum *proc_enum; + TYPEATTR *attr; + ITypeInfo *ti; + UINT count; + HRESULT hr; - FIXME("(%p)->(%p)\n", This, ppenumProcedures); + TRACE("(%p)->(%p)\n", This, ppenumProcedures); - return E_NOTIMPL; + if (!ppenumProcedures) return E_POINTER; + if (!This->module->host) return E_FAIL; + + hr = start_script(This->module->host); + if (FAILED(hr)) return hr; + + hr = get_script_typeinfo(This->module, &ti); + if (FAILED(hr)) return hr; + + hr = ITypeInfo_GetTypeAttr(ti, &attr); + if (FAILED(hr)) return hr; + + count = attr->cFuncs; + ITypeInfo_ReleaseTypeAttr(ti, attr); + + if (!(proc_enum = heap_alloc(sizeof(*proc_enum)))) + return E_OUTOFMEMORY; + + proc_enum->IEnumVARIANT_iface.lpVtbl = &procedure_enum_vtbl; + proc_enum->ref = 1; + proc_enum->pos = 0; + proc_enum->count = count; + proc_enum->procedures = This; + IScriptProcedureCollection_AddRef(&This->IScriptProcedureCollection_iface); + + *ppenumProcedures = (IUnknown*)&proc_enum->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollection *iface, VARIANT index, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7233af5..085913a 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -3293,9 +3293,12 @@ static void test_IScriptControl_get_CodeObject(void) static void test_IScriptControl_get_Procedures(void) { IScriptProcedureCollection *procs, *procs2; + IEnumVARIANT *enumvar, *enumvar2; IScriptProcedure *proc, *proc2; IScriptControl *sc; + IUnknown *unknown; VARIANT_BOOL vbool; + ULONG fetched; VARIANT var; LONG count; HRESULT hr; @@ -3548,6 +3551,44 @@ static void test_IScriptControl_get_Procedures(void) ok(hr == E_INVALIDARG, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); CHECK_CALLED(GetFuncDesc); + /* _NewEnum never caches the function count */ + hr = IScriptProcedureCollection_get__NewEnum(procs, NULL); + ok(hr == E_POINTER, "IScriptProcedureCollection_get__NewEnum returned: 0x%08x.\n", hr); + SET_EXPECT(GetTypeAttr); + SET_EXPECT(ReleaseTypeAttr); + hr = IScriptProcedureCollection_get__NewEnum(procs, &unknown); + ok(hr == S_OK, "IScriptProcedureCollection_get__NewEnum failed: 0x%08x.\n", hr); + CHECK_CALLED(GetTypeAttr); + CHECK_CALLED(ReleaseTypeAttr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + ok((char*)unknown == (char*)enumvar, "unknown and enumvar are not the same (%p vs %p).\n", unknown, enumvar); + IEnumVARIANT_Release(enumvar); + IUnknown_Release(unknown); + SET_EXPECT(GetTypeAttr); + SET_EXPECT(ReleaseTypeAttr); + hr = IScriptProcedureCollection_get__NewEnum(procs, &unknown); + ok(hr == S_OK, "IScriptProcedureCollection_get__NewEnum failed: 0x%08x.\n", hr); + CHECK_CALLED(GetTypeAttr); + CHECK_CALLED(ReleaseTypeAttr); + hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + IUnknown_Release(unknown); + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next(enumvar, 0, NULL, NULL); + ok(hr == E_POINTER, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Next(enumvar, 0, NULL, &fetched); + ok(hr == E_POINTER, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); + ok(fetched == 0xdeadbeef, "got %u.\n", fetched); + hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + ok(fetched == 0, "got %u.\n", fetched); + hr = IEnumVARIANT_Next(enumvar, 0, &var, NULL); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + hr = IEnumVARIANT_Clone(enumvar, NULL); + ok(hr == E_POINTER, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + for (i = 0; i < ARRAY_SIZE(custom_engine_funcs); i++) { /* Querying by index still goes through the Bind process */ @@ -3583,6 +3624,25 @@ static void test_IScriptControl_get_Procedures(void) CHECK_CALLED(GetNames); CHECK_CALLED(ReleaseFuncDesc); + /* Compare with the enumerator */ + SET_EXPECT(GetFuncDesc); + SET_EXPECT(GetNames); + SET_EXPECT(ReleaseFuncDesc); + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "IEnumVARIANT_Next for index %u failed: 0x%08x.\n", i, hr); + ok(fetched == 1, "got %u.\n", fetched); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(var) = %d.\n", V_VT(&var)); + CHECK_CALLED(GetFuncDesc); + CHECK_CALLED(GetNames); + CHECK_CALLED(ReleaseFuncDesc); + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IScriptProcedure, (void**)&proc2); + ok(hr == S_OK, "Failed to query IScriptProcedure for index %u: 0x%08x.\n", i, hr); + VariantClear(&var); + + ok(proc == proc2, "proc and proc2 are not the same for %s and enum index %u.\n", + wine_dbgstr_w(custom_engine_funcs[i].name), i); + IScriptProcedure_Release(proc2); + /* Verify the properties */ hr = IScriptProcedure_get_Name(proc, &str); ok(hr == S_OK, "get_Name for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); @@ -3601,6 +3661,26 @@ static void test_IScriptControl_get_Procedures(void) IScriptProcedure_Release(proc); } + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); + ok(fetched == 0, "got %u.\n", fetched); + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 1); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "IEnumVARIANT_Reset failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar, ARRAY_SIZE(custom_engine_funcs) - 1); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Clone(enumvar, &enumvar2); + ok(hr == S_OK, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar2, 1); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + hr = IEnumVARIANT_Skip(enumvar2, 1); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + + IEnumVARIANT_Release(enumvar2); + IEnumVARIANT_Release(enumvar); IScriptProcedureCollection_Release(procs); IActiveScriptSite_Release(site); -- 2.21.0

2 1

[PATCH] user32: Set default user preferences to enable animations
by Fabian Maurer Aug. 19, 2020

Aug. 19, 2020

This allows games like solitaire, chess titans, etc. to use animations. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0c0f8fac5d1..114ac6adfab 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1432,7 +1432,7 @@ static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); -static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00, 0x00 }; +static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); static FONT_ENTRY( CAPTIONLOGFONT, FW_BOLD ); -- 2.28.0

2 1

[PATCH alt 2] loader: Fix the generic case in get_self_exe()
by Martin Storsjo Aug. 19, 2020

Aug. 19, 2020

Previously this just returned the matched directory, not the path to the executable itself. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Smaller modification, but this builds the returned path twice; once for testing with access() and once for returning. --- loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/main.c b/loader/main.c index 0e6b6f66b5..52cf5b573e 100644 --- a/loader/main.c +++ b/loader/main.c @@ -220,7 +220,7 @@ static const char *get_self_exe( char *argv0 ) free( name ); if (found) break; } - if (p) p = strdup( p ); + if (p) p = build_path( p, argv0 ); free( path ); return p; } -- 2.24.3 (Apple Git-128)

1 0

[PATCH alt 1] loader: Fix the generic case in get_self_exe()
by Martin Storsjo Aug. 19, 2020

Aug. 19, 2020

Previously this just returned the matched directory, not the path to the executable itself. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Slightly bigger modification, but more straightforward in the end. --- loader/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/loader/main.c b/loader/main.c index 0e6b6f66b5..3c06728504 100644 --- a/loader/main.c +++ b/loader/main.c @@ -216,13 +216,15 @@ static const char *get_self_exe( char *argv0 ) for (p = strtok( path, ":" ); p; p = strtok( NULL, ":" )) { char *name = build_path( p, argv0 ); - int found = !access( name, X_OK ); + if (!access( name, X_OK )) + { + free( path ); + return name; + } free( name ); - if (found) break; } - if (p) p = strdup( p ); free( path ); - return p; + return NULL; } return argv0; #endif -- 2.24.3 (Apple Git-128)

1 0

[PATCH] libwine: Fix the init procedure to call __wine_main just like the main laoder does
by Martin Storsjo Aug. 19, 2020

Aug. 19, 2020

This is called if no preloader is available and the loader doesn't find ntdll.so right away. The codepath used normally has seen a fair bit of restructurings in the past few months, while this codepath seems to have been left as things were before. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- libs/wine/loader.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c3b59d9022..e54cbd4cc1 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -857,6 +857,14 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) } #endif +static void *init_func_wrap( void *arg ) +{ + void (*init_func)(int, char **, char **) = + (void(*)(int, char **, char **)) arg; + init_func( __wine_main_argc, __wine_main_argv, __wine_main_environ ); + return NULL; +} + /*********************************************************************** * apple_create_wine_thread * @@ -888,7 +896,7 @@ static void apple_create_wine_thread( void *init_func ) #endif if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && - !pthread_create( &thread, &attr, init_func, NULL )) + !pthread_create( &thread, &attr, init_func_wrap, init_func )) success = 1; pthread_attr_destroy( &attr ); @@ -1090,7 +1098,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) struct dll_path_context context; char *path; void *ntdll = NULL; - void (*init_func)(void); + void (*init_func)(int, char **, char **); /* force a few limits that are set too low on some platforms */ #ifdef RLIMIT_NOFILE @@ -1105,9 +1113,8 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) __wine_main_argc = argc; __wine_main_argv = argv; __wine_main_environ = __wine_get_main_environment(); - mmap_init(); - for (path = first_dll_path( "ntdll.dll", 0, &context ); path; path = next_dll_path( &context )) + for (path = first_dll_path( "ntdll", 0, &context ); path; path = next_dll_path( &context )) { if ((ntdll = dlopen( path, RTLD_NOW ))) { @@ -1118,7 +1125,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) } free_dll_path( &context ); - if (!ntdll || !(init_func = dlsym( ntdll, "__wine_process_init" ))) + if (!ntdll || !(init_func = dlsym( ntdll, "__wine_main" ))) { if (error && error_size) { @@ -1136,6 +1143,6 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) #ifdef __APPLE__ apple_main_thread( init_func ); #else - init_func(); + init_func( __wine_main_argc, __wine_main_argv, __wine_main_environ ); #endif } -- 2.24.3 (Apple Git-128)

2 2

[PATCH] winebrowser: Ensure that a URL opened as HTTP begins with 'http://' or 'https://'.
by Brendan Shanks Aug. 19, 2020

Aug. 19, 2020

Fixes usage like 'winebrowser winehq.org' when xdg-open is used. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winebrowser/main.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..4b623dfac78 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -136,9 +136,15 @@ static int open_http_url( const WCHAR *url ) #endif static const WCHAR browsersW[] = {'B','r','o','w','s','e','r','s',0}; + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; + static const WCHAR httpsW[] = + {'h','t','t','p','s',':','/','/',0}; WCHAR browsers[256]; + WCHAR *url_prefixed; HKEY key; + int ret; LONG r; /* @@ Wine registry key: HKCU\Software\Wine\WineBrowser */ @@ -150,7 +156,27 @@ static int open_http_url( const WCHAR *url ) if (r != ERROR_SUCCESS) memcpy( browsers, defaultbrowsers, sizeof(defaultbrowsers) ); - return launch_app( browsers, url ); + /* If url doesn't begin with 'http://' or 'https://', prefix it with 'http://'. Required by xdg-open. */ + if (!strncmpiW( url, httpW, strlenW( httpW ) ) || !strncmpiW( url, httpsW , strlenW( httpsW ) )) + { + ret = launch_app( browsers, url ); + } + else + { + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = launch_app( browsers, url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + } + return ret; } static int open_mailto_url( const WCHAR *url ) -- 2.26.2

2 1

[PATCH][RFC] winemine: Add message context to advanced difficulty string
by Julian Rüger Aug. 19, 2020

Aug. 19, 2020

Hi everyone, as I explained in my previous mail "Translation problem with oledb32", the winemine difficulty and the oledb32 ADO dialog tab both share the same po string "Advanced". That is problematic for at least the German translation. (I wonder if that is the only one, I'd guess not, though I don't speak any other language nearly well enough to judge) I decided to add a message context to winemine and not to oledb32, since winemine is the odd one out in this case, while potentially in the future, other "Advanced" strings would likely have the same translation as oledb32. I'd love to hear some suggestions/opinions on what would be the best way to handle this. 1. Should I add a similar message context to the "Beginner" and "Expert" difficulties as well, to keep it consistent even when there are no collisions (yet)? 2. There are two strings for each difficulty, for the file menu "&Beginner", "&Advanced", ... Add message contexts for these? 3. Avoid this whole thing by changing the winemine string to "Intermediate"? My personal feeling is 1. makes sense, 2. probably not, 3. easiest, cleanest solution but changes the tone, do people care? Also please point out any other issues with the patch. Thanks in advance for your input! Best, Julian

2 1