May 2016 - Wine-Commits - list.winehq.org

Jacek Caban : wininet: Fixed handing NULL buffer in InternetReadFileExW.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: f70c9ae8d147ac2f4377dae1f90eacf18d05df91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70c9ae8d147ac2f4377dae1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:42:19 2016 +0200 wininet: Fixed handing NULL buffer in InternetReadFileExW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/http.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5359794..e192592 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2280,7 +2280,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext); - if (lpBuffer->dwStructSize != sizeof(*lpBuffer)) { + if (!lpBuffer || lpBuffer->dwStructSize != sizeof(*lpBuffer)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b4cad7d..78cec50 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1067,6 +1067,11 @@ static void InternetReadFileExA_test(int flags) CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + rc = InternetReadFileExW(hor, NULL, 0, 0xdeadcafe); + ok(!rc && (GetLastError() == ERROR_INVALID_PARAMETER), + "InternetReadFileEx should have failed with ERROR_INVALID_PARAMETER instead of %s, %u\n", + rc ? "TRUE" : "FALSE", GetLastError()); + /* tests invalid dwStructSize */ inetbuffers.dwStructSize = sizeof(inetbuffers)+1; inetbuffers.lpcszHeader = NULL;

1 0

Nikolay Sivov : dwrite: Don' t reset advances if original and modified advances are the same array.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: cc610a09334731f1832492c79d7b0075df2556d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc610a09334731f1832492c79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:51:36 2016 +0300 dwrite: Don't reset advances if original and modified advances are the same array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 3 ++- dlls/dwrite/tests/analyzer.c | 64 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 90b53ad..9ae0cca 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1374,7 +1374,8 @@ static HRESULT WINAPI dwritetextanalyzer1_ApplyCharacterSpacing(IDWriteTextAnaly len, glyph_count, clustermap, advances, offsets, props, modified_advances, modified_offsets); if (min_advance_width < 0.0f) { - memset(modified_advances, 0, glyph_count*sizeof(*modified_advances)); + if (modified_advances != advances) + memset(modified_advances, 0, glyph_count*sizeof(*modified_advances)); return E_INVALIDARG; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 23c3d22..ea09bd5 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1723,7 +1723,7 @@ static void test_ApplyCharacterSpacing(void) offsets[0].advanceOffset = ptr->offsets[0]; offsets[1].advanceOffset = ptr->offsets[1]; offsets[2].advanceOffset = ptr->offsets[2]; - /* Ascender offsets are never thouched as spacing applies in reading direction only, + /* Ascender offsets are never touched as spacing applies in reading direction only, we'll only test them to see if they are not changed */ offsets[0].ascenderOffset = 23.0; offsets[1].ascenderOffset = 32.0; @@ -1758,11 +1758,8 @@ static void test_ApplyCharacterSpacing(void) props, advances, offsets); - /* invalid argument cases */ - if (ptr->min_advance < 0.0) - ok(hr == E_INVALIDARG, "%d: got 0x%08x\n", i, hr); - else - ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + ok(hr == (ptr->min_advance < 0.0f ? E_INVALIDARG : S_OK), "%d: got 0x%08x\n", i, hr); + if (hr == S_OK) { ok(ptr->modified_advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->modified_advances[0]); ok(ptr->modified_advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->modified_advances[1]); @@ -1791,6 +1788,61 @@ static void test_ApplyCharacterSpacing(void) ok(offsets[0].ascenderOffset == 23.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); ok(offsets[1].ascenderOffset == 32.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); } + + /* same, with argument aliasing */ + memcpy(advances, ptr->advances, glyph_count * sizeof(*advances)); + offsets[0].advanceOffset = ptr->offsets[0]; + offsets[1].advanceOffset = ptr->offsets[1]; + offsets[2].advanceOffset = ptr->offsets[2]; + /* Ascender offsets are never touched as spacing applies in reading direction only, + we'll only test them to see if they are not changed */ + offsets[0].ascenderOffset = 23.0f; + offsets[1].ascenderOffset = 32.0f; + offsets[2].ascenderOffset = 31.0f; + + hr = IDWriteTextAnalyzer1_ApplyCharacterSpacing(analyzer1, + ptr->leading, + ptr->trailing, + ptr->min_advance, + sizeof(clustermap)/sizeof(clustermap[0]), + glyph_count, + clustermap, + advances, + offsets, + props, + advances, + offsets); + ok(hr == (ptr->min_advance < 0.0f ? E_INVALIDARG : S_OK), "%d: got 0x%08x\n", i, hr); + + if (hr == S_OK) { + ok(ptr->modified_advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->modified_advances[0]); + ok(ptr->modified_advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->modified_advances[1]); + if (glyph_count > 2) + ok(ptr->modified_advances[2] == advances[2], "%d: got advance[2] %.2f, expected %.2f\n", i, advances[2], ptr->modified_advances[2]); + + ok(ptr->modified_offsets[0] == offsets[0].advanceOffset, "%d: got offset[0] %.2f, expected %.2f\n", i, + offsets[0].advanceOffset, ptr->modified_offsets[0]); + ok(ptr->modified_offsets[1] == offsets[1].advanceOffset, "%d: got offset[1] %.2f, expected %.2f\n", i, + offsets[1].advanceOffset, ptr->modified_offsets[1]); + if (glyph_count > 2) + ok(ptr->modified_offsets[2] == offsets[2].advanceOffset, "%d: got offset[2] %.2f, expected %.2f\n", i, + offsets[2].advanceOffset, ptr->modified_offsets[2]); + + ok(offsets[0].ascenderOffset == 23.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); + ok(offsets[1].ascenderOffset == 32.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); + ok(offsets[2].ascenderOffset == 31.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[2].ascenderOffset); + } + else { + /* with aliased advances original values are retained */ + ok(ptr->advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->advances[0]); + ok(ptr->advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->advances[1]); + ok(ptr->offsets[0] == offsets[0].advanceOffset, "%d: got offset[0] %.2f, expected %.2f\n", i, + offsets[0].advanceOffset, ptr->modified_offsets[0]); + ok(ptr->offsets[1] == offsets[1].advanceOffset, "%d: got offset[1] %.2f, expected %.2f\n", i, + offsets[1].advanceOffset, ptr->modified_offsets[1]); + ok(offsets[0].ascenderOffset == 23.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); + ok(offsets[1].ascenderOffset == 32.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); + } } IDWriteTextAnalyzer1_Release(analyzer1);

1 0

Sebastian Lackner : wininet: Return synchronously from InternetReadFile if there is no more data to read.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: a3a572beb07a9072cba9a619eafeae26ccc8cb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a572beb07a9072cba9a619e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 11 23:25:18 2016 +0200 wininet: Return synchronously from InternetReadFile if there is no more data to read. Similar to 87fffa1ebfb71fe7a34aa989fa88f85409dbb62f. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 646619b..c7d857e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3242,7 +3242,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW if (TryEnterCriticalSection( &req->read_section )) { - if (get_avail_data(req)) + if (get_avail_data(req) || end_of_read_data(req)) { res = HTTPREQ_Read(req, buffer, size, read); LeaveCriticalSection( &req->read_section );

1 0

Jacek Caban : wininet: Added test of cookies with long URL.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 238a462d2b903264e8fbcf5aef00bdea8d768ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=238a462d2b903264e8fbcf5ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:46:08 2016 +0200 wininet: Added test of cookies with long URL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 37490c2..d762768 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -614,6 +614,7 @@ static void test_cookie_attrs(void) static void test_cookie_url(void) { + char long_url[5000] = "http://long.url.test.com/", *p; WCHAR bufw[512]; char buf[512]; DWORD len; @@ -640,6 +641,23 @@ static void test_cookie_url(void) res = pInternetGetCookieExW(about_blankW, NULL, bufw, &len, 0, NULL); ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, "InternetGetCookeExW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + p = long_url + strlen(long_url); + memset(p, 'x', long_url+sizeof(long_url)-p); + p += (long_url+sizeof(long_url)-p) - 3; + p[0] = '/'; + p[2] = 0; + res = InternetSetCookieA(long_url, NULL, "A=B"); + ok(res, "InternetSetCookieA failed: %u\n", GetLastError()); + + len = sizeof(buf); + res = InternetGetCookieA(long_url, NULL, buf, &len); + ok(res, "InternetGetCookieA failed: %u\n", GetLastError()); + ok(!strcmp(buf, "A=B"), "buf = %s\n", buf); + + len = sizeof(buf); + res = InternetGetCookieA("http://long.url.test.com/", NULL, buf, &len); + ok(!res && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookieA failed: %u\n", GetLastError()); } static void test_null(void)

1 0

Jacek Caban : wininet: Pass arguments as substrings to create_cookie_url.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 51cacda534411bedf8a10b126181e5087f9908e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cacda534411bedf8a10b126… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 16 22:42:49 2016 +0200 wininet: Pass arguments as substrings to create_cookie_url. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 2a3efa6..4e885d7 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -257,7 +257,7 @@ static BOOL cookie_match_path(cookie_container_t *container, const WCHAR *path) return !strncmpiW(container->path, path, strlenW(container->path)); } -static BOOL create_cookie_url(LPCWSTR domain, LPCWSTR path, WCHAR *buf, DWORD buf_len) +static BOOL create_cookie_url(substr_t domain, substr_t path, WCHAR *buf, DWORD buf_len) { static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; @@ -282,18 +282,16 @@ static BOOL create_cookie_url(LPCWSTR domain, LPCWSTR path, WCHAR *buf, DWORD bu *(buf++) = '@'; buf_len--; - len = strlenW(domain); - if(len >= buf_len) + if(domain.len >= buf_len) return FALSE; - memcpy(buf, domain, len*sizeof(WCHAR)); - buf += len; - buf_len -= len; + memcpy(buf, domain.str, domain.len*sizeof(WCHAR)); + buf += domain.len; + buf_len -= domain.len; - len = strlenW(path); - if(len >= buf_len) + if(path.len >= buf_len) return FALSE; - memcpy(buf, path, len*sizeof(WCHAR)); - buf += len; + memcpy(buf, path.str, path.len*sizeof(WCHAR)); + buf += path.len; *buf = 0; @@ -314,8 +312,10 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) WCHAR *name, *data; FILETIME expiry, create, time; - if (!create_cookie_url(domain, path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) + if (!create_cookie_url(substrz(domain), substrz(path), cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) { + FIXME("Failed to create cookie URL.\n"); return FALSE; + } size = 0; RetrieveUrlCacheEntryStreamW(cookie_url, NULL, &size, FALSE, 0); @@ -409,8 +409,11 @@ static BOOL save_persistent_cookie(cookie_container_t *container) FILETIME time; DWORD bytes_written; - if (!create_cookie_url(container->domain->domain, container->path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) + if (!create_cookie_url(substrz(container->domain->domain), substrz(container->path), + cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) { + FIXME("Failed to create cookie URL.\n"); return FALSE; + } /* check if there's anything to save */ GetSystemTimeAsFileTime(&time);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 0fc9a55c8b646cac88882949a7e65449297159cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc9a55c8b646cac88882949a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 22:16:38 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index a78a280..c3259ce 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-04 22:10+0300\n" +"PO-Revision-Date: 2016-05-16 22:15+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -2994,7 +2994,7 @@ msgstr "%1!u!МБ используется, %2!u!МБ доступно" #: gdi32.rc:28 msgid "Western" -msgstr "Западный" +msgstr "Западноевропейский" #: gdi32.rc:29 msgid "Central European" @@ -3038,19 +3038,19 @@ msgstr "Японский" #: gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "CHINESE_GB2312" +msgstr "Китайский GB2312" #: gdi32.rc:40 msgid "Hangul" -msgstr "Хангул" +msgstr "Хангыль" #: gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "CHINESE_BIG5" +msgstr "Китайский BIG5" #: gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "Хангул(Johab)" +msgstr "Хангыль(Johab)" #: gdi32.rc:43 msgid "Symbol"

1 0

Nikolay Sivov : amstream/tests: Simplify refcount check.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: b9357ecaad919a96df5a1461c9527b56718f8b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9357ecaad919a96df5a1461c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:54:31 2016 +0300 amstream/tests: Simplify refcount check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1db88c2..c9e9392 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -29,9 +29,10 @@ #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static const WCHAR filenameW[] = {'t','e','s','t','.','a','v','i',0};

1 0

Nikolay Sivov : dwrite/tests: Couple more tests for IDWriteNumberSubstitution creation.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 7119c50940fb091e2985bdf8662189e8e9013837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7119c50940fb091e2985bdf86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:51:35 2016 +0300 dwrite/tests: Couple more tests for IDWriteNumberSubstitution creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 043d7a1..23c3d22 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1207,10 +1207,16 @@ static void test_numbersubstitution(void) IDWriteNumberSubstitution *substitution; HRESULT hr; + /* locale is not specified, method does not require it */ hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, NULL, FALSE, &substitution); ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteNumberSubstitution_Release(substitution); + /* invalid locale name, method does not require it */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, dummyW, FALSE, &substitution); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteNumberSubstitution_Release(substitution); + /* invalid method */ hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL+1, NULL, FALSE, &substitution); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -1220,6 +1226,9 @@ static void test_numbersubstitution(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); /* invalid locale */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, NULL, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, dummyW, FALSE, &substitution); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : msdaps: Fix GetBasicErrorInfo() method proxy (Clang).
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 2b5390290ce5bae9848e4d21bd90ab9480745f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5390290ce5bae9848e4d21b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 20:48:13 2016 +0300 msdaps: Fix GetBasicErrorInfo() method proxy (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index ef0163a..53aca39 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1362,9 +1362,19 @@ HRESULT __RPC_STUB IErrorRecords_GetCustomErrorObject_Stub(IErrorRecords* This, HRESULT CALLBACK IErrorRecords_GetBasicErrorInfo_Proxy(IErrorRecords* This, ULONG ulRecordNum, ERRORINFO *pErrorInfo) { + IErrorInfo *error = NULL; + HRESULT hr; + TRACE("(%p)->%d %p\n", This, ulRecordNum, pErrorInfo); - return IErrorRecords_GetBasicErrorInfo_Proxy(This, ulRecordNum, pErrorInfo); + hr = IErrorRecords_RemoteGetBasicErrorInfo_Proxy(This, ulRecordNum, pErrorInfo, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + return hr; } HRESULT __RPC_STUB IErrorRecords_GetBasicErrorInfo_Stub(IErrorRecords* This, ULONG ulRecordNum, ERRORINFO *pErrorInfo,

1 0

Nikolay Sivov : mmdevapi: Increment loop counter once per iteration (Clang ).
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 3ac1059bf47226741f948c8826a2b90ae64a612b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac1059bf47226741f948c882… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 16 00:41:49 2016 +0300 mmdevapi: Increment loop counter once per iteration (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index aa4baa5..110c802 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -304,7 +304,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) *ppv = &MMDEVAPI_CF[i]; return S_OK; } - i++; } WARN("(%s, %s, %p): no class found.\n", debugstr_guid(rclsid),

1 0