December 2019 - Wine-Commits

Damjan Jovanovic : msxml3: All string passed to IXMLDOMDocument_load() need to be URL-unescaped.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: e2f2ad0e81b854b5b18d029d309708d8ea7dd7bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f2ad0e81b854b5b18d029d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Dec 8 19:48:50 2019 +0200 msxml3: All string passed to IXMLDOMDocument_load() need to be URL-unescaped. msxml3 allows URL escape sequences even for C:\ style paths. eg. C:\Program%20Files\... Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48242 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/bsc.c | 10 +++++++--- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index df4cf37346..0b9e679bda 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -253,15 +253,19 @@ HRESULT create_uri(const WCHAR *url, IUri **uri) WCHAR fullpath[MAX_PATH]; DWORD needed = ARRAY_SIZE(fileUrl); - if (!PathSearchAndQualifyW(url, fullpath, ARRAY_SIZE(fullpath))) + lstrcpynW(fileUrl, url, ARRAY_SIZE(fileUrl)); + UrlUnescapeW(fileUrl, NULL, NULL, URL_UNESCAPE_INPLACE); + + if (!PathSearchAndQualifyW(fileUrl, fullpath, ARRAY_SIZE(fullpath))) { WARN("can't find path\n"); return E_FAIL; } - if (FAILED(UrlCreateFromPathW(fullpath, fileUrl, &needed, 0))) + if (FAILED(UrlApplySchemeW(fullpath, fileUrl, &needed, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | + URL_APPLY_DEFAULT))) { - ERR("can't create url from path\n"); + ERR("Failed to apply url scheme.\n"); return E_FAIL; } url = fileUrl; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c4337ab191..aa4c7a2832 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10219,6 +10219,7 @@ static void test_load(void) VARIANT src; HRESULT hr; void* ptr; + int n; GetTempPathA(MAX_PATH, path); strcat(path, "winetest.xml"); @@ -10268,6 +10269,22 @@ static void test_load(void) ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(bstr1); + /* Regular local path with some URL encoded characters. */ + strcpy(path2, path); + n = strlen(path2); + strcpy(&path2[n-1], "%6C"); /* C:\path\to\winetest.xm%6C */ + test_doc_load_from_path(doc, path2); + + /* Both spaces and %20s work. */ + GetTempPathA(MAX_PATH, path2); + strcat(path2, "wine test.xml"); + write_to_file(path2, win1252xml); + test_doc_load_from_path(doc, path2); + GetTempPathA(MAX_PATH, path2); + strcat(path2, "wine%20test.xml"); + test_doc_load_from_path(doc, path2); + DeleteFileA(path2); + DeleteFileA(path); /* load from existing path, no xml content */

1 0

Michael Stefaniuc : dmime/tests: Add more GetTrack() tests.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 4649f2f1a0d739a08bb245f2b43d971397150072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4649f2f1a0d739a08bb245f2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 8 18:53:51 2019 +0100 dmime/tests: Add more GetTrack() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e8fa6a596d..2e0626cde4 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -543,14 +543,17 @@ static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *na #define add_track(seg, class, group) _add_track(seg, &CLSID_DirectMusic ## class, #class, group) static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, - DWORD index) + DWORD index, BOOL ignore_guid) { IDirectMusicTrack *track; IPersistStream *ps; CLSID class; HRESULT hr; - hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + if (ignore_guid) + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + else + hr = IDirectMusicSegment8_GetTrack(seg, expect, group, index, &track); if (!expect) { ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); return; @@ -568,9 +571,12 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char IDirectMusicTrack_Release(track); } -#define expect_track(seg, class, group, index) _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index) +#define expect_track(seg, class, group, index) \ + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, TRUE) +#define expect_guid_track(seg, class, group, index) \ + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, FALSE) -static void test_track_identify(void) +static void test_gettrack(void) { IDirectMusicSegment8 *seg; IDirectMusicTrack *track; @@ -586,7 +592,9 @@ static void test_track_identify(void) add_track(seg, SegmentTriggerTrack, 0x2); /* idx 1 group 2 */ add_track(seg, SeqTrack, 0x1); /* idx 2 group 1 */ add_track(seg, TempoTrack, 0x7); /* idx 3 group 1, idx 2 group 2, idx 0 group 3 */ + add_track(seg, WaveTrack, 0xffffffff); /* idx 4 group 1, idx 3 group 2, idx 1 group 3 */ + /* Ignore GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); @@ -594,12 +602,30 @@ static void test_track_identify(void) expect_track(seg, ParamControlTrack, 0x1, 1); expect_track(seg, SeqTrack, 0x1, 2); expect_track(seg, TempoTrack, 0x1, 3); - _expect_track(seg, NULL, "", 0x1, 4); + expect_track(seg, WaveTrack, 0x1, 4); + _expect_track(seg, NULL, "", 0x1, 5, TRUE); + _expect_track(seg, NULL, "", 0x1, DMUS_SEG_ANYTRACK, TRUE); expect_track(seg, ParamControlTrack, 0x2, 0); + expect_track(seg, WaveTrack, 0x80000000, 0); expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ + _expect_track(seg, NULL, "", 0xffffffff, DMUS_SEG_ANYTRACK, TRUE); + + /* Use the GUID in GetTrack */ + hr = IDirectMusicSegment8_GetTrack(seg, &CLSID_DirectMusicLyricsTrack, 0, 0, &track); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + + expect_guid_track(seg, LyricsTrack, 0x1, 0); + expect_guid_track(seg, ParamControlTrack, 0x1, 0); + expect_guid_track(seg, SeqTrack, 0x1, 0); + expect_guid_track(seg, TempoTrack, 0x1, 0); + expect_guid_track(seg, ParamControlTrack, 0x2, 0); + expect_guid_track(seg, SegmentTriggerTrack, 0x3, 0); + expect_guid_track(seg, SeqTrack, 0x3, 0); + expect_guid_track(seg, TempoTrack, 0x7, 0); + expect_guid_track(seg, TempoTrack, 0xffffffff, 0); IDirectMusicSegment8_Release(seg); } @@ -1090,7 +1116,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); - test_track_identify(); + test_gettrack(); test_track(); test_parsedescriptor();

1 0

Alistair Leslie-Hughes : loader: Install msado15.dll into the correct location.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: d37a2c861ac5793b388d8a2633382b86ce3ea60d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37a2c861ac5793b388d8a26… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 8 22:21:40 2019 +0000 loader: Install msado15.dll into the correct location. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 19c034d7fd..c830525379 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2706,6 +2706,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Windows NT\Accessories,wordpad.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\ADO,msado15.dll 11,,* [FakeDlls] @@ -2767,6 +2768,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\ADO,msado15.dll 11,,* [SystemIni]

1 0

Nikolay Sivov : ntdll/tests: Enable some more string API tests.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: a5bc81ebe55ad9cef8fdc41718608c7aa6da9d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5bc81ebe55ad9cef8fdc417… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:07:22 2019 +0300 ntdll/tests: Enable some more string API tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtlstr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 6f59e956c2..d2091859b8 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -597,6 +597,7 @@ static void test_RtlUpcaseUnicodeChar(void) } else { expected_upper_ch = ch; } +todo_wine_if(ch == 0xb5) ok(upper_ch == expected_upper_ch, "RtlUpcaseUnicodeChar('%c'[=0x%x]) has result '%c'[=0x%x], expected: '%c'[=0x%x]\n", ch, ch, upper_ch, upper_ch, expected_upper_ch, expected_upper_ch); @@ -646,6 +647,7 @@ static void test_RtlUpcaseUnicodeString(void) pRtlUpcaseUnicodeString(&result_str, &ascii_str, 0); for (i = 0; i <= 255; i++) { +todo_wine_if(ascii_str.Buffer[i] == 0xb5) ok(result_str.Buffer[i] == upper_str.Buffer[i], "RtlUpcaseUnicodeString works wrong: '%c'[=0x%x] is converted to '%c'[=0x%x], expected: '%c'[=0x%x]\n", ascii_str.Buffer[i], ascii_str.Buffer[i], @@ -2615,10 +2617,10 @@ START_TEST(rtlstr) test_RtlStringFromGUID(); test_RtlIsTextUnicode(); test_RtlCompareUnicodeString(); + test_RtlUpcaseUnicodeChar(); + test_RtlUpcaseUnicodeString(); if(0) { - test_RtlUpcaseUnicodeChar(); - test_RtlUpcaseUnicodeString(); test_RtlDowncaseUnicodeString(); } test_RtlHashUnicodeString();

1 0

Nikolay Sivov : oleaut32/typelib: No need to query self for supported interface.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: ae67aa8bbfacc5da94d23b187b63b86bee407466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae67aa8bbfacc5da94d23b18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:08:46 2019 +0300 oleaut32/typelib: No need to query self for supported interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index eb713a4e2f..6e8a18c9d7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -11180,7 +11180,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface, static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - ITypeInfo *tinfo; + ITypeInfo2 *tinfo = &This->ITypeInfo2_iface; TLBFuncDesc *func_desc; UINT user_vft = 0, i, depth = 0; HRESULT hres = S_OK; @@ -11189,25 +11189,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) This->needs_layout = FALSE; - hres = ICreateTypeInfo2_QueryInterface(iface, &IID_ITypeInfo, (LPVOID*)&tinfo); - if (FAILED(hres)) - return hres; - if (This->typeattr.typekind == TKIND_INTERFACE) { ITypeInfo *inh; TYPEATTR *attr; HREFTYPE inh_href; - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &inh_href); + hres = ITypeInfo2_GetRefTypeOfImplType(tinfo, 0, &inh_href); if (SUCCEEDED(hres)) { - hres = ITypeInfo_GetRefTypeInfo(tinfo, inh_href, &inh); + hres = ITypeInfo2_GetRefTypeInfo(tinfo, inh_href, &inh); if (SUCCEEDED(hres)) { hres = ITypeInfo_GetTypeAttr(inh, &attr); if (FAILED(hres)) { ITypeInfo_Release(inh); - ITypeInfo_Release(tinfo); return hres; } This->typeattr.cbSizeVft = attr->cbSizeVft; @@ -11231,17 +11226,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } else if (hres == TYPE_E_ELEMENTNOTFOUND) { This->typeattr.cbSizeVft = 0; hres = S_OK; - } else { - ITypeInfo_Release(tinfo); + } else return hres; - } } else if (hres == TYPE_E_ELEMENTNOTFOUND) { This->typeattr.cbSizeVft = 0; hres = S_OK; - } else { - ITypeInfo_Release(tinfo); + } else return hres; - } } else if (This->typeattr.typekind == TKIND_DISPATCH) This->typeattr.cbSizeVft = 7 * This->pTypeLib->ptr_size; else @@ -11316,7 +11307,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } } - ITypeInfo_Release(tinfo); return hres; }

1 0

Nikolay Sivov : dwrite: Compare axis values when testing for face reference equality.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: f7f9339969d82480df790dfbb9fb7e059edb2881 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7f9339969d82480df790dfb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:09:36 2019 +0300 dwrite: Compare axis values when testing for face reference equality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 +++++++++++++++------- dlls/dwrite/tests/font.c | 60 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2670a22839..84e3af8b70 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -236,6 +236,8 @@ struct dwrite_fontfacereference IDWriteFactory7 *factory; }; +static const IDWriteFontFaceReference1Vtbl fontfacereferencevtbl; + struct dwrite_fontresource { IDWriteFontResource IDWriteFontResource_iface; @@ -1896,6 +1898,16 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace5_iface); } +static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface) +{ + if (!iface) + return NULL; + if (iface->lpVtbl != (IDWriteFontFaceReferenceVtbl *)&fontfacereferencevtbl) + return NULL; + return CONTAINING_RECORD((IDWriteFontFaceReference1 *)iface, struct dwrite_fontfacereference, + IDWriteFontFaceReference1_iface); +} + void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf) { struct dwrite_font *font = unsafe_impl_from_IDWriteFont(iface); @@ -6132,18 +6144,18 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference1 *iface, IDWriteFontFaceReference *ref) { struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - IDWriteFontFile *file; + struct dwrite_fontfacereference *other = unsafe_impl_from_IDWriteFontFaceReference(ref); BOOL ret; TRACE("%p, %p.\n", iface, ref); - if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) - return FALSE; - - ret = is_same_fontfile(reference->file, file) && - reference->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && - reference->simulations == IDWriteFontFaceReference_GetSimulations(ref); - IDWriteFontFile_Release(file); + ret = is_same_fontfile(reference->file, other->file) && reference->index == other->index && + reference->simulations == other->simulations; + if (reference->axis_values_count) + { + ret &= reference->axis_values_count == other->axis_values_count && + !memcmp(reference->axis_values, other->axis_values, reference->axis_values_count * sizeof(*reference->axis_values)); + } return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a0d36e2f0b..219a0510ea 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9279,13 +9279,14 @@ static void test_font_resource(void) IDWriteFontFaceReference1 *reference, *reference2; IDWriteFontResource *resource, *resource2; IDWriteFontFile *fontfile, *fontfile2; - DWRITE_FONT_AXIS_VALUE axis_value; + DWRITE_FONT_AXIS_VALUE axis_values[2]; IDWriteFontFace5 *fontface5; IDWriteFontFace *fontface; IDWriteFactory6 *factory; UINT32 count, index; HRESULT hr; ULONG ref; + BOOL ret; if (!(factory = create_factory_iid(&IID_IDWriteFactory6))) { @@ -9316,9 +9317,9 @@ static void test_font_resource(void) ok(!index, "Unexpected index %u.\n", index); /* Specify axis value, font has no variations. */ - axis_value.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; - axis_value.value = 400.0f; - hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, &axis_value, 1, &reference); + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[0].value = 400.0f; + hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 1, &reference); ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); @@ -9326,7 +9327,7 @@ static void test_font_resource(void) IDWriteFontFaceReference1_Release(reference); - hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, &axis_value, 1, + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 1, &reference); count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); ok(count == 1, "Unexpected axis value count.\n"); @@ -9360,6 +9361,55 @@ static void test_font_resource(void) IDWriteFontFace5_Release(fontface5); + /* Reference equality regarding set axis values. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[0].value = 400.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[1].value = 1.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); + ok(count == 2, "Unexpected axis value count.\n"); + + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(!count, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + /* Different values order. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[0].value = 1.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[1].value = 400.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(count == 2, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + /* Different axis values. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[0].value = 1.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[1].value = 401.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(count == 2, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + IDWriteFontFaceReference1_Release(reference); + IDWriteFontFile_Release(fontfile); IDWriteFontFace_Release(fontface);

1 0

Mathew Hodson : kernel32/tests: Add broken result for Windows XP and 2003.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: df94a9a45063239516bdca15b7e6427cb434fe23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df94a9a45063239516bdca15… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Sat Dec 7 21:59:35 2019 -0500 kernel32/tests: Add broken result for Windows XP and 2003. Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9328666181..c8cc904791 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3439,7 +3439,7 @@ static void test_FoldStringW(void) }; static const WCHAR foldczone_broken_dst[] = { - 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x3cb,0x1f0,0xa0,0xaa,0 + 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x03c5,0x0308,'j',0x030c,0x00a0,0x00aa,0 }; static const WCHAR ligatures_src[] = { @@ -3582,9 +3582,11 @@ static void test_FoldStringW(void) /* MAP_FOLDCZONE */ SetLastError(0); ret = pFoldStringW(MAP_FOLDCZONE, foldczone_src, -1, dst, 256); - ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError()); + ok(ret == ARRAY_SIZE(foldczone_dst) + || broken(ret == ARRAY_SIZE(foldczone_broken_dst)), /* winxp, win2003 */ + "Got %d, error %d.\n", ret, GetLastError()); ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)) - || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), + || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), /* winxp, win2003 */ "Got unexpected string %s.\n", wine_dbgstr_w(dst)); /* MAP_EXPAND_LIGATURES */

1 0

Zebediah Figura : qcap/avimux: Use BaseOutputPinImpl_Connect().
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 5ea2267f28f1b2043458722690a945904af79c80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea2267f28f1b20434587226… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:37 2019 -0600 qcap/avimux: Use BaseOutputPinImpl_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 58 ++++++++++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index d2f29dbbeb..677e79ef68 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1132,19 +1132,35 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP return S_OK; } -static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base, +static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { + AviMux *filter = impl_from_source_pin(&iface->pin); PIN_DIRECTION dir; + unsigned int i; HRESULT hr; - TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", base, pReceivePin, pmt); - hr = IPin_QueryDirection(pReceivePin, &dir); if(hr==S_OK && dir!=PINDIR_INPUT) return VFW_E_INVALID_DIRECTION; - return BaseOutputPinImpl_AttemptConnection(base, pReceivePin, pmt); + if (FAILED(hr = BaseOutputPinImpl_AttemptConnection(iface, pReceivePin, pmt))) + return hr; + + for (i = 0; i < filter->input_pin_no; ++i) + { + if (!filter->in[i]->pin.pin.peer) + continue; + + hr = IFilterGraph_Reconnect(filter->filter.filterInfo.pGraph, &filter->in[i]->pin.pin.IPin_iface); + if (FAILED(hr)) + { + IPin_Disconnect(&iface->pin.IPin_iface); + break; + } + } + + return hr; } static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPosition, AM_MEDIA_TYPE *amt) @@ -1201,43 +1217,11 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = AviMuxOut_DecideAllocator, }; -static inline AviMux *impl_from_out_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, AviMux, source.pin.IPin_iface); -} - -static HRESULT WINAPI AviMuxOut_Connect(IPin *iface, - IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) -{ - AviMux *This = impl_from_out_IPin(iface); - HRESULT hr; - int i; - - TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pReceivePin, pmt); - - hr = BaseOutputPinImpl_Connect(iface, pReceivePin, pmt); - if(FAILED(hr)) - return hr; - - for(i=0; i<This->input_pin_no; i++) { - if(!This->in[i]->pin.pin.peer) - continue; - - hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, &This->in[i]->pin.pin.IPin_iface); - if(FAILED(hr)) { - BaseOutputPinImpl_Disconnect(iface); - break; - } - } - - return hr; -} - static const IPinVtbl AviMuxOut_PinVtbl = { BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, - AviMuxOut_Connect, + BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, BasePinImpl_ConnectedTo,

1 0

Zebediah Figura : winegstreamer: Use BasePinImpl_QueryInterface().
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 5c83561b3324e82c0e67a2cd8c463c3d8ad16f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c83561b3324e82c0e67a2cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:33 2019 -0600 winegstreamer: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 63 +++++++++---------------------------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 78c8e38701..04fb54915c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1735,29 +1735,19 @@ static inline struct gstdemux_source *impl_source_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, struct gstdemux_source, pin.pin.IPin_iface); } -static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - struct gstdemux_source *This = impl_source_from_IPin(iface); + struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->seek; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->IQualityControl_iface; + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &pin->seek.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &pin->IQualityControl_iface; + else + return E_NOINTERFACE; - if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - FIXME("No interface for %s!\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) @@ -1847,7 +1837,7 @@ static void free_source_pin(struct gstdemux_source *pin) } static const IPinVtbl GST_OutputPin_Vtbl = { - GSTOutPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect, @@ -1869,6 +1859,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = { static const struct strmbase_source_ops source_ops = { + .base.pin_query_interface = source_query_interface, .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, @@ -2071,36 +2062,8 @@ static HRESULT WINAPI GSTInPin_NewSegment(IPin *iface, REFERENCE_TIME start, return S_OK; } -static HRESULT WINAPI GSTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) -{ - struct gstdemux *filter = impl_from_sink_IPin(iface); - - TRACE("filter %p, riid %s, ppv %p.\n", filter, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - { - return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, &IID_IMediaSeeking, ppv); - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static const IPinVtbl GST_InputPin_Vtbl = { - GSTInPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect,

1 0

Alexandre Julliard : msvcrt: Create the Ansi argv from the Unicode one.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 94a3d4adad43dad1086f8293d6ea293cc601c13b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94a3d4adad43dad1086f8293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:45:43 2019 +0100 msvcrt: Create the Ansi argv from the Unicode one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 187 ++++++++++++++++++++--------------------------------- 1 file changed, 71 insertions(+), 116 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c3a1255a60..af7a13528f 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); int MSVCRT___argc = 0; -static int argc_expand; static int wargc_expand; unsigned int MSVCRT__commode = 0; int MSVCRT__fmode = 0; @@ -50,7 +49,6 @@ unsigned int MSVCRT___setlc_active = 0; unsigned int MSVCRT___unguarded_readlc_active = 0; double MSVCRT__HUGE = 0; char **MSVCRT___argv = NULL; -static char **argv_expand; MSVCRT_wchar_t **MSVCRT___wargv = NULL; static MSVCRT_wchar_t **wargv_expand; char *MSVCRT__acmdln = NULL; @@ -139,6 +137,28 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) return wblk; } +static char **build_argv( WCHAR **wargv ) +{ + int argc; + char *p, **argv; + DWORD total = 0; + + for (argc = 0; wargv[argc]; argc++) + total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); + + argv = HeapAlloc( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); + p = (char *)(argv + argc + 1); + for (argc = 0; wargv[argc]; argc++) + { + DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); + argv[argc] = p; + p += reslen; + total -= reslen; + } + argv[argc] = NULL; + return argv; +} + typedef void (CDECL *_INITTERMFUN)(void); typedef int (CDECL *_INITTERM_E_FN)(void); @@ -327,10 +347,10 @@ void msvcrt_init_args(void) OSVERSIONINFOW osvi; MSVCRT__acmdln = MSVCRT__strdup( GetCommandLineA() ); - MSVCRT__wcmdln = msvcrt_wstrdupa(MSVCRT__acmdln); + MSVCRT__wcmdln = MSVCRT__wcsdup( GetCommandLineW() ); MSVCRT___argc = __wine_main_argc; - MSVCRT___argv = __wine_main_argv; MSVCRT___wargv = __wine_main_wargv; + MSVCRT___argv = build_argv( MSVCRT___wargv ); TRACE("got %s, wide = %s argc=%d\n", debugstr_a(MSVCRT__acmdln), debugstr_w(MSVCRT__wcmdln),MSVCRT___argc); @@ -382,125 +402,16 @@ void msvcrt_init_args(void) void msvcrt_free_args(void) { /* FIXME: more things to free */ + HeapFree(GetProcessHeap(), 0, MSVCRT___argv); HeapFree(GetProcessHeap(), 0, MSVCRT___initenv); HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv); HeapFree(GetProcessHeap(), 0, MSVCRT__environ); HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); - HeapFree(GetProcessHeap(), 0, argv_expand); HeapFree(GetProcessHeap(), 0, wargv_expand); } -static int build_expanded_argv(int *argc, char **argv) -{ - int i, size=0, args_no=0, path_len; - BOOL is_expandable; - HANDLE h; - - args_no = 0; - for(i=0; i<__wine_main_argc; i++) { - WIN32_FIND_DATAA data; - int len = 0; - - is_expandable = FALSE; - for(path_len = strlen(__wine_main_argv[i])-1; path_len>=0; path_len--) { - if(__wine_main_argv[i][path_len]=='*' || __wine_main_argv[i][path_len]=='?') - is_expandable = TRUE; - else if(__wine_main_argv[i][path_len]=='\\' || __wine_main_argv[i][path_len]=='/') - break; - } - path_len++; - - if(is_expandable) - h = FindFirstFileA(__wine_main_argv[i], &data); - else - h = INVALID_HANDLE_VALUE; - - if(h != INVALID_HANDLE_VALUE) { - do { - if(data.cFileName[0]=='.' && (data.cFileName[1]=='\0' || - (data.cFileName[1]=='.' && data.cFileName[2]=='\0'))) - continue; - - len = strlen(data.cFileName)+1; - if(argv) { - argv[args_no] = (char*)(argv+*argc+1)+size; - memcpy(argv[args_no], __wine_main_argv[i], path_len*sizeof(char)); - memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(char)); - } - args_no++; - size += len+path_len; - }while(FindNextFileA(h, &data)); - FindClose(h); - } - - if(!len) { - len = strlen(__wine_main_argv[i])+1; - if(argv) { - argv[args_no] = (char*)(argv+*argc+1)+size; - memcpy(argv[args_no], __wine_main_argv[i], len*sizeof(char)); - } - args_no++; - size += len; - } - } - - if(argv) - argv[args_no] = NULL; - size += (args_no+1)*sizeof(char*); - *argc = args_no; - return size; -} - -/********************************************************************* - * __getmainargs (MSVCRT.@) - */ -int CDECL __getmainargs(int *argc, char** *argv, char** *envp, - int expand_wildcards, int *new_mode) -{ - TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); - - if (expand_wildcards) { - HeapFree(GetProcessHeap(), 0, argv_expand); - argv_expand = NULL; - - argv_expand = HeapAlloc(GetProcessHeap(), 0, - build_expanded_argv(&argc_expand, NULL)); - if (argv_expand) { - build_expanded_argv(&argc_expand, argv_expand); - - MSVCRT___argc = argc_expand; - MSVCRT___argv = argv_expand; - }else { - expand_wildcards = 0; - } - } - if (!expand_wildcards) { - MSVCRT___argc = __wine_main_argc; - MSVCRT___argv = __wine_main_argv; - } - - *argc = MSVCRT___argc; - *argv = MSVCRT___argv; - *envp = MSVCRT___initenv; - - if (new_mode) - MSVCRT__set_new_mode( *new_mode ); - return 0; -} - -#ifdef _CRTDLL -/********************************************************************* - * __GetMainArgs (CRTDLL.@) - */ -void CDECL __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) -{ - int new_mode = 0; - __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); -} -#endif - static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) { int i, size=0, args_no=0, path_len; @@ -573,8 +484,6 @@ int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *w if (expand_wildcards) { HeapFree(GetProcessHeap(), 0, wargv_expand); - wargv_expand = NULL; - wargv_expand = HeapAlloc(GetProcessHeap(), 0, build_expanded_wargv(&wargc_expand, NULL)); if (wargv_expand) { @@ -602,6 +511,52 @@ int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *w return 0; } +/********************************************************************* + * __getmainargs (MSVCRT.@) + */ +int CDECL __getmainargs(int *argc, char** *argv, char** *envp, + int expand_wildcards, int *new_mode) +{ + TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); + + if (expand_wildcards) { + HeapFree(GetProcessHeap(), 0, wargv_expand); + wargv_expand = HeapAlloc(GetProcessHeap(), 0, + build_expanded_wargv(&wargc_expand, NULL)); + if (wargv_expand) { + build_expanded_wargv(&wargc_expand, wargv_expand); + + MSVCRT___argc = wargc_expand; + MSVCRT___argv = build_argv( wargv_expand ); + }else { + expand_wildcards = 0; + } + } + if (!expand_wildcards) { + MSVCRT___argc = __wine_main_argc; + MSVCRT___argv = build_argv( __wine_main_wargv ); + } + + *argc = MSVCRT___argc; + *argv = MSVCRT___argv; + *envp = MSVCRT___initenv; + + if (new_mode) + MSVCRT__set_new_mode( *new_mode ); + return 0; +} + +#ifdef _CRTDLL +/********************************************************************* + * __GetMainArgs (CRTDLL.@) + */ +void CDECL __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) +{ + int new_mode = 0; + __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); +} +#endif + /********************************************************************* * _initterm (MSVCRT.@) */

1 0