October 2019 - Wine-Commits

Jeff Smith : crypt32: Make CryptBinaryToStringA fill short base64 buffer correctly.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: a9e6f9aa71074f96fda9a2475ef1b9009ceeb652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9e6f9aa71074f96fda9a247… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Oct 9 12:53:55 2019 -0500 crypt32: Make CryptBinaryToStringA fill short base64 buffer correctly. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 105 +++++++++++++++++++++++--------------------- dlls/crypt32/tests/base64.c | 2 - 2 files changed, 56 insertions(+), 51 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index acd05ec1a5..ac60c6efbd 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -93,50 +93,53 @@ static BOOL EncodeBinaryToBinaryA(const BYTE *pbBinary, return ret; } -static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, +static DWORD stradd(LPSTR ptr, LPCSTR end, LPCSTR s, DWORD slen) +{ + if (ptr + slen > end) + slen = end - ptr; + memcpy(ptr, s, slen); + return slen; +} + +static DWORD encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, char* out_buf, DWORD *out_len) { int div, i; const BYTE *d = in_buf; int bytes = (in_len*8 + 5)/6, pad_bytes = (bytes % 4) ? 4 - (bytes % 4) : 0; - DWORD needed; LPSTR ptr; + LPCSTR end; + char chunk[4]; - TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); - needed = bytes + pad_bytes; - needed += (needed / 64 + (needed % 64 ? 1 : 0)) * strlen(sep); - needed++; - - if (needed > *out_len) + if (!out_buf) { - *out_len = needed; - return ERROR_INSUFFICIENT_BUFFER; + TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); + *out_len = bytes + pad_bytes; + *out_len += (*out_len / 64 + (*out_len % 64 ? 1 : 0)) * strlen(sep) + 1; + return 0; } - else - *out_len = needed; /* Three bytes of input give 4 chars of output */ div = in_len / 3; ptr = out_buf; + end = ptr + *out_len; i = 0; - while (div > 0) + while (div > 0 && ptr < end) { if (i && i % 64 == 0) - { - strcpy(ptr, sep); - ptr += strlen(sep); - } + ptr += stradd(ptr, end, sep, strlen(sep)); /* first char is the first 6 bits of the first byte*/ - *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + chunk[0] = b64[ ( d[0] >> 2) & 0x3f ]; /* second char is the last 2 bits of the first byte and the first 4 * bits of the second byte */ - *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + chunk[1] = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; /* third char is the last 4 bits of the second byte and the first 2 * bits of the third byte */ - *ptr++ = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; + chunk[2] = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; /* fourth char is the remaining 6 bits of the third byte */ - *ptr++ = b64[ d[2] & 0x3f]; + chunk[3] = b64[ d[2] & 0x3f]; + ptr += stradd(ptr, end, chunk, 4); i += 4; d += 3; div--; @@ -146,31 +149,33 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, { case 1: /* first char is the first 6 bits of the first byte*/ - *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + chunk[0] = b64[ ( d[0] >> 2) & 0x3f ]; /* second char is the last 2 bits of the first byte and the first 4 * bits of the second byte */ - *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + chunk[1] = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; /* third char is the last 4 bits of the second byte padded with * two zeroes */ - *ptr++ = b64[ ((d[1] << 2) & 0x3c) ]; + chunk[2] = b64[ ((d[1] << 2) & 0x3c) ]; /* fourth char is a = to indicate one byte of padding */ - *ptr++ = '='; + chunk[3] = '='; + ptr += stradd(ptr, end, chunk, 4); break; case 2: /* first char is the first 6 bits of the first byte*/ - *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + chunk[0] = b64[ ( d[0] >> 2) & 0x3f ]; /* second char is the last 2 bits of the first byte padded with * four zeroes*/ - *ptr++ = b64[ ((d[0] << 4) & 0x30)]; + chunk[1] = b64[ ((d[0] << 4) & 0x30)]; /* third char is = to indicate padding */ - *ptr++ = '='; + chunk[2] = '='; /* fourth char is = to indicate padding */ - *ptr++ = '='; + chunk[3] = '='; + ptr += stradd(ptr, end, chunk, 4); break; } - strcpy(ptr, sep); + ptr += stradd(ptr, end, sep, strlen(sep)); - return ERROR_SUCCESS; + return ptr - out_buf; } static BOOL BinaryToBase64A(const BYTE *pbBinary, @@ -215,26 +220,28 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, if (pszString) { - if (charsNeeded <= *pcchString) + LPSTR ptr = pszString; + DWORD size = *pcchString; + LPSTR end = ptr + size; + + if (header) { - LPSTR ptr = pszString; - DWORD size = charsNeeded; + ptr += stradd(ptr, end, header, strlen(header)); + ptr += stradd(ptr, end, sep, strlen(sep)); + size = end - ptr; + } + ptr += encodeBase64A(pbBinary, cbBinary, sep, ptr, &size); + if (trailer) + { + ptr += stradd(ptr, end, trailer, strlen(trailer)); + ptr += stradd(ptr, end, sep, strlen(sep)); + } - if (header) - { - strcpy(ptr, header); - ptr += strlen(ptr); - strcpy(ptr, sep); - ptr += strlen(sep); - } - encodeBase64A(pbBinary, cbBinary, sep, ptr, &size); - ptr += size - 1; - if (trailer) - { - strcpy(ptr, trailer); - ptr += strlen(ptr); - strcpy(ptr, sep); - } + if (ptr < end) + *ptr = '\0'; + + if (charsNeeded <= *pcchString) + { *pcchString = charsNeeded - 1; } else diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index f2d16735ab..31605fe6b9 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -137,12 +137,10 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n", ret, GetLastError()); ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2); -todo_wine { if (header) ok(str[0] == header[0], "Unexpected buffer contents %#x.\n", str[0]); else ok(str[0] == expected[0], "Unexpected buffer contents %#x.\n", str[0]); -} strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError());

1 0

Nikolay Sivov : dwrite: Update font family object to use IDWriteFontList2.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: 85ffc36b5e96a9969ecff065102e0bea0302932b URL: https://source.winehq.org/git/wine.git/?a=commit;h=85ffc36b5e96a9969ecff065… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 11:04:57 2019 +0300 dwrite: Update font family object to use IDWriteFontList2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 95 ++++++++++++++++++++++++++---------------------- dlls/dwrite/tests/font.c | 10 +++++ 2 files changed, 62 insertions(+), 43 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6432acb231..d9b22b15b4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -128,7 +128,7 @@ struct dwrite_fontcollection struct dwrite_fontfamily { IDWriteFontFamily2 IDWriteFontFamily2_iface; - IDWriteFontList1 IDWriteFontList1_iface; + IDWriteFontList2 IDWriteFontList2_iface; LONG refcount; struct dwrite_fontfamily_data *data; @@ -294,9 +294,9 @@ static inline struct dwrite_fontfamily *impl_from_IDWriteFontFamily2(IDWriteFont return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontFamily2_iface); } -static inline struct dwrite_fontfamily *impl_family_from_IDWriteFontList1(IDWriteFontList1 *iface) +static inline struct dwrite_fontfamily *impl_family_from_IDWriteFontList2(IDWriteFontList2 *iface) { - return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontList1_iface); + return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontList2_iface); } static inline struct dwrite_fontcollection *impl_from_IDWriteFontCollection3(IDWriteFontCollection3 *iface) @@ -2004,22 +2004,22 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily2 *iface, IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IDWriteFontFamily2_AddRef(iface); - return S_OK; } - - if (IsEqualIID(riid, &IID_IDWriteFontList1) || + else if (IsEqualIID(riid, &IID_IDWriteFontList2) || + IsEqualIID(riid, &IID_IDWriteFontList1) || IsEqualIID(riid, &IID_IDWriteFontList)) { - *obj = &family->IDWriteFontList1_iface; - IDWriteFontList1_AddRef(&family->IDWriteFontList1_iface); - return S_OK; + *obj = &family->IDWriteFontList2_iface; + } + else + { + WARN("%s not implemented.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; } - WARN("%s not implemented.\n", debugstr_guid(riid)); - - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } static ULONG WINAPI dwritefontfamily_AddRef(IDWriteFontFamily2 *iface) @@ -2329,63 +2329,71 @@ static const IDWriteFontFamily2Vtbl fontfamilyvtbl = dwritefontfamily2_GetFontSet, }; -static HRESULT WINAPI dwritefontfamilylist_QueryInterface(IDWriteFontList1 *iface, REFIID riid, void **obj) +static HRESULT WINAPI dwritefontfamilylist_QueryInterface(IDWriteFontList2 *iface, REFIID riid, void **obj) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily_QueryInterface(&This->IDWriteFontFamily2_iface, riid, obj); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily_QueryInterface(&family->IDWriteFontFamily2_iface, riid, obj); } -static ULONG WINAPI dwritefontfamilylist_AddRef(IDWriteFontList1 *iface) +static ULONG WINAPI dwritefontfamilylist_AddRef(IDWriteFontList2 *iface) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily_AddRef(&This->IDWriteFontFamily2_iface); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily_AddRef(&family->IDWriteFontFamily2_iface); } -static ULONG WINAPI dwritefontfamilylist_Release(IDWriteFontList1 *iface) +static ULONG WINAPI dwritefontfamilylist_Release(IDWriteFontList2 *iface) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily_Release(&This->IDWriteFontFamily2_iface); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily_Release(&family->IDWriteFontFamily2_iface); } -static HRESULT WINAPI dwritefontfamilylist_GetFontCollection(IDWriteFontList1 *iface, +static HRESULT WINAPI dwritefontfamilylist_GetFontCollection(IDWriteFontList2 *iface, IDWriteFontCollection **collection) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily_GetFontCollection(&This->IDWriteFontFamily2_iface, collection); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily_GetFontCollection(&family->IDWriteFontFamily2_iface, collection); } -static UINT32 WINAPI dwritefontfamilylist_GetFontCount(IDWriteFontList1 *iface) +static UINT32 WINAPI dwritefontfamilylist_GetFontCount(IDWriteFontList2 *iface) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily_GetFontCount(&This->IDWriteFontFamily2_iface); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily_GetFontCount(&family->IDWriteFontFamily2_iface); } -static HRESULT WINAPI dwritefontfamilylist_GetFont(IDWriteFontList1 *iface, UINT32 index, IDWriteFont **font) +static HRESULT WINAPI dwritefontfamilylist_GetFont(IDWriteFontList2 *iface, UINT32 index, IDWriteFont **font) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily_GetFont(&This->IDWriteFontFamily2_iface, index, font); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily_GetFont(&family->IDWriteFontFamily2_iface, index, font); } -static DWRITE_LOCALITY WINAPI dwritefontfamilylist1_GetFontLocality(IDWriteFontList1 *iface, UINT32 index) +static DWRITE_LOCALITY WINAPI dwritefontfamilylist1_GetFontLocality(IDWriteFontList2 *iface, UINT32 index) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily1_GetFontLocality(&This->IDWriteFontFamily2_iface, index); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily1_GetFontLocality(&family->IDWriteFontFamily2_iface, index); } -static HRESULT WINAPI dwritefontfamilylist1_GetFont(IDWriteFontList1 *iface, UINT32 index, IDWriteFont3 **font) +static HRESULT WINAPI dwritefontfamilylist1_GetFont(IDWriteFontList2 *iface, UINT32 index, IDWriteFont3 **font) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily1_GetFont(&This->IDWriteFontFamily2_iface, index, font); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily1_GetFont(&family->IDWriteFontFamily2_iface, index, font); } -static HRESULT WINAPI dwritefontfamilylist1_GetFontFaceReference(IDWriteFontList1 *iface, UINT32 index, +static HRESULT WINAPI dwritefontfamilylist1_GetFontFaceReference(IDWriteFontList2 *iface, UINT32 index, IDWriteFontFaceReference **reference) { - struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface); - return dwritefontfamily1_GetFontFaceReference(&This->IDWriteFontFamily2_iface, index, reference); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); + return dwritefontfamily1_GetFontFaceReference(&family->IDWriteFontFamily2_iface, index, reference); +} + +static HRESULT WINAPI dwritefontfamilylist2_GetFontSet(IDWriteFontList2 *iface, IDWriteFontSet1 **fontset) +{ + FIXME("%p, %p.\n", iface, fontset); + + return E_NOTIMPL; } -static const IDWriteFontList1Vtbl fontfamilylistvtbl = { +static const IDWriteFontList2Vtbl fontfamilylistvtbl = +{ dwritefontfamilylist_QueryInterface, dwritefontfamilylist_AddRef, dwritefontfamilylist_Release, @@ -2395,6 +2403,7 @@ static const IDWriteFontList1Vtbl fontfamilylistvtbl = { dwritefontfamilylist1_GetFontLocality, dwritefontfamilylist1_GetFont, dwritefontfamilylist1_GetFontFaceReference, + dwritefontfamilylist2_GetFontSet, }; static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT32 index, @@ -2409,7 +2418,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 return E_OUTOFMEMORY; object->IDWriteFontFamily2_iface.lpVtbl = &fontfamilyvtbl; - object->IDWriteFontList1_iface.lpVtbl = &fontfamilylistvtbl; + object->IDWriteFontList2_iface.lpVtbl = &fontfamilylistvtbl; object->refcount = 1; object->collection = collection; IDWriteFontCollection3_AddRef(&collection->IDWriteFontCollection3_iface); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8b44c43e86..32156fdedd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1601,6 +1601,7 @@ if (0) /* crashes on native */ if (hr == S_OK) { IDWriteFontFaceReference *ref, *ref1; IDWriteFontList1 *fontlist1; + IDWriteFontList2 *fontlist2; IDWriteFontList *fontlist; IDWriteFont3 *font3; IDWriteFont1 *font1; @@ -1629,6 +1630,15 @@ if (0) /* crashes on native */ ok(fontlist == (IDWriteFontList *)fontlist1, "Unexpected interface pointer.\n"); ok(fontlist != (IDWriteFontList *)family1, "Unexpected interface pointer.\n"); ok(fontlist != (IDWriteFontList *)family, "Unexpected interface pointer.\n"); + + if (SUCCEEDED(IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList2, (void **)&fontlist2))) + { + ok(fontlist == (IDWriteFontList *)fontlist2, "Unexpected interface pointer.\n"); + IDWriteFontList2_Release(fontlist2); + } + else + win_skip("IDWriteFontList2 is not supported.\n"); + IDWriteFontList1_Release(fontlist1); IDWriteFontList_Release(fontlist); }

1 0

Nikolay Sivov : dwrite: Update matches list to IDWriteFontList2.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: 0159812e21462d88c3f307f9ed6a790de209695c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0159812e21462d88c3f307f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 11:04:56 2019 +0300 dwrite: Update matches list to IDWriteFontList2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 131 +++++++++++++++++++++++++---------------------- dlls/dwrite/tests/font.c | 8 +++ 2 files changed, 79 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0159812e21462d88c3f3…

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontFaceReference1.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: 28dc5ff1916f0ceaf8f46b90013b84b50b87a37d URL: https://source.winehq.org/git/wine.git/?a=commit;h=28dc5ff1916f0ceaf8f46b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 11:04:54 2019 +0300 dwrite: Update to IDWriteFontFaceReference1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 220 +++++++++++++++++++++++++++++------------------------ 1 file changed, 119 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28dc5ff1916f0ceaf8f4…

1 0

Gijs Vermeulen : scrrun/tests: Make test_clone more descriptive.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: 1eeb3662ecb8d4505876266355af01dc81b0dc26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eeb3662ecb8d45058762663… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Oct 9 04:11:40 2019 +0200 scrrun/tests: Make test_clone more descriptive. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 46d452f113..5f207ed37a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -973,7 +973,7 @@ static void test_GetFolder(void) IFolder_Release(folder); } -static void test_clone(IEnumVARIANT *enumvar, BOOL position_inherited) +static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, int line) { HRESULT hr; IEnumVARIANT *clone; @@ -981,34 +981,34 @@ static void test_clone(IEnumVARIANT *enumvar, BOOL position_inherited) VARIANT var, var2; hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); VariantInit(&var); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); /* clone enumerator */ hr = IEnumVARIANT_Clone(enumvar, &clone); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(clone != enumvar, "got %p, %p\n", enumvar, clone); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(clone != enumvar, "%d: got %p, %p\n", line, enumvar, clone); /* check if clone inherits position */ VariantInit(&var2); fetched = -1; hr = IEnumVARIANT_Next(clone, 1, &var2, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); if (!position_inherited) - todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "values don't match\n"); + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); else { fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); - todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "values don't match\n"); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); } VariantClear(&var2); @@ -1016,8 +1016,9 @@ static void test_clone(IEnumVARIANT *enumvar, BOOL position_inherited) IEnumVARIANT_Release(clone); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); } +#define test_clone(a, b) _test_clone(a, b, __LINE__) /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void)

1 0

Alistair Leslie-Hughes : dinput: Don't treat Stylus devices as joysticks.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: db07ff83b3385736f2f23c8aa001c4650e99f82c URL: https://source.winehq.org/git/wine.git/?a=commit;h=db07ff83b3385736f2f23c8a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 9 08:14:46 2019 +0000 dinput: Don't treat Stylus devices as joysticks. Tablet/Stylus devices have a js* entry which we are treating as a joystick. Any testbox VM that is configured with a tablet is currently failing the joystick tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 4ee7397c2c..e0c1331937 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -168,6 +168,7 @@ static INT find_joystick_devices(void) struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; SHORT btn_map[KEY_MAX - BTN_MISC + 1]; + BOOL is_stylus = FALSE; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) == -1) @@ -241,12 +242,22 @@ static INT find_joystick_devices(void) case BTN_DEAD: joydev.is_joystick = TRUE; break; + case BTN_STYLUS: + is_stylus = TRUE; + break; default: break; } } } + if(is_stylus) + { + TRACE("Stylus detected. Skipping\n"); + close(fd); + continue; + } + if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0) { WARN("ioctl(%s,JSIOCGAXMAP) failed: %s\n", joydev.device, strerror(errno));

1 0

Zebediah Figura : strmbase: Properly implement IVideoWindow::get_WindowState().
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: a3d3b399ff724205470f0ba6c27110fba3995bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3d3b399ff724205470f0ba6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 8 20:02:20 2019 -0500 strmbase: Properly implement IVideoWindow::get_WindowState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 14 +++++++------- dlls/strmbase/window.c | 21 ++++++++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 1c16fa1f82..96a2b1cabb 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1487,7 +1487,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_HIDE, "Got state %d.\n", state); + ok(state == SW_HIDE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OAFALSE, "Got state %d.\n", state); @@ -1501,7 +1501,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); + ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OATRUE, "Got state %d.\n", state); @@ -1518,7 +1518,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_MINIMIZE, "Got state %d.\n", state); + ok(state == SW_MINIMIZE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OATRUE, "Got state %d.\n", state); @@ -1533,7 +1533,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); + ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OATRUE, "Got state %d.\n", state); @@ -1566,7 +1566,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_HIDE, "Got state %d.\n", state); + ok(state == SW_HIDE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OAFALSE, "Got state %d.\n", state); @@ -1581,7 +1581,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); + ok(state == SW_SHOW, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OATRUE, "Got state %d.\n", state); @@ -1596,7 +1596,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowState(window, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == SW_HIDE, "Got state %d.\n", state); + ok(state == SW_HIDE, "Got state %d.\n", state); hr = IVideoWindow_get_Visible(window, &state); ok(state == OAFALSE, "Got state %d.\n", state); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 206aecb8de..57dbaca8bf 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -402,15 +402,22 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowState(IVideoWindow *iface, LONG W return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_get_WindowState(IVideoWindow *iface, LONG *WindowState) +HRESULT WINAPI BaseControlWindowImpl_get_WindowState(IVideoWindow *iface, LONG *state) { - WINDOWPLACEMENT place; - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); + DWORD style; - place.length = sizeof(place); - GetWindowPlacement(This->baseWindow.hWnd, &place); - TRACE("(%p/%p)->(%p)\n", This, iface, WindowState); - *WindowState = place.showCmd; + TRACE("window %p, state %p.\n", window, state); + + style = GetWindowLongPtrW(window->baseWindow.hWnd, GWL_STYLE); + if (!(style & WS_VISIBLE)) + *state = SW_HIDE; + else if (style & WS_MINIMIZE) + *state = SW_MINIMIZE; + else if (style & WS_MAXIMIZE) + *state = SW_MAXIMIZE; + else + *state = SW_SHOW; return S_OK; }

1 0

Zebediah Figura : strmbase: Don't move or activate the window in IVideoWindow::put_WindowStyle().
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: ab98626afa03674db2ae3cb6c5eaffce31505617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab98626afa03674db2ae3cb6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 8 20:02:19 2019 -0500 strmbase: Don't move or activate the window in IVideoWindow::put_WindowStyle(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/strmbase/window.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 558dc26cb9..1c16fa1f82 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1438,7 +1438,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw style = GetWindowLongA(hwnd, GWL_STYLE); todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); - todo_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); + ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); hr = IVideoWindow_get_WindowStyleEx(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index ecedc17489..206aecb8de 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -330,7 +330,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W return E_INVALIDARG; SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle); - SetWindowPos(This->baseWindow.hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); + SetWindowPos(This->baseWindow.hWnd, 0, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); This->baseWindow.WindowStyles = WindowStyle; return S_OK;

1 0

Jeff Smith : crypt32: Fix CryptBinaryToString return value on short base64 buffer.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: e0708d06019584572cbd7c2fa7871ed8a112b57b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0708d06019584572cbd7c2f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Oct 9 12:53:54 2019 -0500 crypt32: Fix CryptBinaryToString return value on short base64 buffer. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 4 ++-- dlls/crypt32/tests/base64.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index d158c1aceb..acd05ec1a5 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -240,7 +240,7 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, else { *pcchString = charsNeeded; - SetLastError(ERROR_INSUFFICIENT_BUFFER); + SetLastError(ERROR_MORE_DATA); ret = FALSE; } } @@ -460,7 +460,7 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, else { *pcchString = charsNeeded; - SetLastError(ERROR_INSUFFICIENT_BUFFER); + SetLastError(ERROR_MORE_DATA); ret = FALSE; } } diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 3668543048..f2d16735ab 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -134,7 +134,6 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, strLen2 = strLen - 1; str[0] = 0x12; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2); -todo_wine ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n", ret, GetLastError()); ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2); @@ -207,7 +206,6 @@ static void encode_compare_base64_W(const BYTE *toEncode, DWORD toEncodeLen, DWO strLen2 = strLen - 1; strW[0] = 0x1234; ret = CryptBinaryToStringW(toEncode, toEncodeLen, format, strW, &strLen2); -todo_wine ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringW failed, %d, error %d\n", ret, GetLastError()); if (headerW)

1 0

Jeff Smith : crypt32/tests: Tidy up unexpected length failure messages in base64.
by Alexandre Julliard Oct. 9, 2019

Oct. 9, 2019

Module: wine Branch: master Commit: 6cbedfa65bef2206a6c27c67f53019a3bf175f7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cbedfa65bef2206a6c27c67… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Oct 9 12:53:53 2019 -0500 crypt32/tests: Tidy up unexpected length failure messages in base64. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 4ff76272e3..3668543048 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -121,12 +121,12 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Unexpected required length.\n"); + ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen); strLen2 = strLen - 1; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, NULL, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen == strLen2, "Unexpected required length.\n"); + ok(strLen == strLen2, "Unexpected required length %u, expected %u.\n", strLen2, strLen); str = heap_alloc(strLen); @@ -137,7 +137,7 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, todo_wine ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n", ret, GetLastError()); - ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen - 1, strLen); + ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2); todo_wine { if (header) ok(str[0] == header[0], "Unexpected buffer contents %#x.\n", str[0]); @@ -147,7 +147,7 @@ todo_wine { strLen2 = strLen; ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2); ok(ret, "CryptBinaryToStringA failed: %d\n", GetLastError()); - ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen); + ok(strLen2 == strLen - 1, "Expected length %d, got %d\n", strLen - 1, strLen2); ptr = str; if (header)

1 0