November 2016 - Wine-commits

Henri Verbeet : wined3d: Support wined3d_texture_get_dc() on WINED3DFMT_B4G4R4A4_UNORM and WINED3DFMT_B4G4R4X4_UNORM textures.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: bf3c65c6d8ec21c59f257a10b53912e486b2e3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3c65c6d8ec21c59f257a10b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 12:11:36 2016 +0100 wined3d: Support wined3d_texture_get_dc() on WINED3DFMT_B4G4R4A4_UNORM and WINED3DFMT_B4G4R4X4_UNORM textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6d23388..1255a9a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -287,6 +287,8 @@ static const struct wined3d_format_ddi_info ddi_formats[] = {WINED3DFMT_B5G6R5_UNORM, D3DDDIFMT_R5G6B5}, {WINED3DFMT_B5G5R5X1_UNORM, D3DDDIFMT_X1R5G5B5}, {WINED3DFMT_B5G5R5A1_UNORM, D3DDDIFMT_A1R5G5B5}, + {WINED3DFMT_B4G4R4A4_UNORM, D3DDDIFMT_A4R4G4B4}, + {WINED3DFMT_B4G4R4X4_UNORM, D3DDDIFMT_X4R4G4B4}, {WINED3DFMT_P8_UINT, D3DDDIFMT_P8}, };

1 0

Daniel Lehman : shlwapi: Make ParseURL case-insensitive.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 6cbcc76e413400edd3554ffccb34c37fc5c586dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbcc76e413400edd3554ffcc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Nov 10 06:56:15 2016 -0800 shlwapi: Make ParseURL case-insensitive. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 1 + dlls/shlwapi/url.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index c89b044..2cb6fea 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1435,6 +1435,7 @@ static const struct parse_url_test_t { {"htt?p://www.winehq.org/",URL_E_INVALID_SYNTAX}, {"ab-://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, {" http://www.winehq.org/",URL_E_INVALID_SYNTAX}, + {"HTTP://www.winehq.org/",S_OK,4,URL_SCHEME_HTTP}, }; static void test_ParseURL(void) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index fe97fae..879a734 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -138,7 +138,7 @@ static DWORD get_scheme_code(LPCWSTR scheme, DWORD scheme_len) for(i=0; i < sizeof(shlwapi_schemes)/sizeof(shlwapi_schemes[0]); i++) { if(scheme_len == strlenW(shlwapi_schemes[i].scheme_name) - && !memcmp(scheme, shlwapi_schemes[i].scheme_name, scheme_len*sizeof(WCHAR))) + && !memicmpW(scheme, shlwapi_schemes[i].scheme_name, scheme_len)) return shlwapi_schemes[i].scheme_number; }

1 0

Flávio J. Saraiva : cmd/tests: 'no echo' character with chains and brackets.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: a4161801f325d46cdf3d78c753261f6faff4c011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4161801f325d46cdf3d78c75… Author: Flávio J. Saraiva <flaviojs2005(a)gmail.com> Date: Thu Nov 17 07:36:32 2016 +0000 cmd/tests: 'no echo' character with chains and brackets. The @ character chains until we leave the current depth. The @ character can be applied to brackets. Signed-off-by: Flávio J. Saraiva <flaviojs2005(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 38a7700..9728e57 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -31,6 +31,12 @@ echo @tab(a)word echo @tab(a)word echo(a)tab@@tab(a)word echo @tab@ on @space@ +(a)echo --- @ with chains and brackets +(echo the @ character chains until&&@echo we leave the current depth||( +echo hidden +(a)echo hidden +))&&echo and can hide brackets||(@echo command hidden)||@(echo brackets hidden) +(a)echo --- @echo off echo off(a)tab@@space@ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d01a23e..c1f0d5f 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -88,6 +88,13 @@ word @tab(a)word @pwd@>echo @tab@ on @space@@space@ +--- @ with chains and brackets + +(a)todo_wine@@pwd@>(echo the @ character chains until && ) && echo and can hide brackets || () ||@space@ +(a)todo_wine@the @ character chains until +(a)todo_wine@we leave the current depth +(a)todo_wine@and can hide brackets +(a)todo_wine@--- noecho1 noecho2 echo3

1 0

Daniel Lehman : urlmon: Fix buffer overflow in parse_canonicalize.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 22b4599b8a715cb6ec71351ed24795fce1530195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b4599b8a715cb6ec71351ed… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Nov 4 13:26:02 2016 -0700 urlmon: Fix buffer overflow in parse_canonicalize. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 34 ++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 57 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 5f98d4e..da5a739 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7405,6 +7405,11 @@ static inline LPWSTR a2w(LPCSTR str) { return ret; } +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + static inline BOOL heap_free(void* mem) { return HeapFree(GetProcessHeap(), 0, mem); } @@ -10403,7 +10408,9 @@ static void test_CoInternetParseIUri_InvalidArgs(void) { HRESULT hr; IUri *uri = NULL; WCHAR tmp[3]; + WCHAR *longurl, *copy; DWORD result = -1; + DWORD i, len; hr = pCoInternetParseIUri(NULL, PARSE_CANONICALIZE, 0, tmp, 3, &result, 0); ok(hr == E_INVALIDARG, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", @@ -10459,6 +10466,33 @@ static void test_CoInternetParseIUri_InvalidArgs(void) { expected_len, result); } if(uri) IUri_Release(uri); + + /* a long url that causes a crash on Wine */ + len = INTERNET_MAX_URL_LENGTH*2; + longurl = heap_alloc((len+1)*sizeof(WCHAR)); + memcpy(longurl, http_urlW, sizeof(http_urlW)); + for(i = sizeof(http_urlW)/sizeof(WCHAR)-1; i < len; i++) + longurl[i] = 'x'; + longurl[len] = 0; + + copy = heap_alloc((len+1)*sizeof(WCHAR)); + memcpy(copy, longurl, (len+1)*sizeof(WCHAR)); + + hr = pCreateUri(longurl, 0, 0, &uri); + ok(SUCCEEDED(hr), "Error: CreateUri returned 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + result = -1; + memset(longurl, 0xcc, len*sizeof(WCHAR)); + hr = pCoInternetParseIUri(uri, PARSE_CANONICALIZE, 0, longurl, len+1, &result, 0); + ok(SUCCEEDED(hr), "Error: CoInternetParseIUri returned 0x%08x.\n", hr); + ok(!lstrcmpW(longurl, copy), "Error: expected long url '%s' but was '%s'.\n", + wine_dbgstr_w(copy), wine_dbgstr_w(longurl)); + ok(result == len, "Error: Expected 'result' to be %d, but was %d instead.\n", + len, result); + } + heap_free(longurl); + heap_free(copy); + if(uri) IUri_Release(uri); } static void test_CoInternetParseIUri(void) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e6f844b..79b073e 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6825,7 +6825,6 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, const WCHAR *ptr = NULL; WCHAR *path = NULL; const WCHAR **pptr; - WCHAR buffer[INTERNET_MAX_URL_LENGTH+1]; DWORD len = 0; BOOL reduce_path; @@ -6852,11 +6851,11 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, * it later. */ if(reduce_path && !path && ptr == uri->canon_uri+uri->path_start) - path = buffer+len; + path = output+len; /* Check if it's time to reduce the path. */ if(reduce_path && ptr == uri->canon_uri+uri->path_start+uri->path_len) { - DWORD current_path_len = (buffer+len) - path; + DWORD current_path_len = (output+len) - path; DWORD new_path_len = remove_dot_segments(path, current_path_len); /* Update the current length. */ @@ -6868,7 +6867,9 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, const WCHAR decoded = decode_pct_val(ptr); if(decoded) { if(allow_unescape && (flags & URL_UNESCAPE)) { - buffer[len++] = decoded; + if(len < output_len) + output[len] = decoded; + len++; ptr += 2; do_default_action = FALSE; } @@ -6876,48 +6877,55 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, /* See if %'s needed to encoded. */ if(do_default_action && (flags & URL_ESCAPE_PERCENT)) { - pct_encode_val(*ptr, buffer+len); + if(len + 3 < output_len) + pct_encode_val(*ptr, output+len); len += 3; do_default_action = FALSE; } } else if(*ptr == ' ') { if((flags & URL_ESCAPE_SPACES_ONLY) && !(flags & URL_ESCAPE_UNSAFE)) { - pct_encode_val(*ptr, buffer+len); + if(len + 3 < output_len) + pct_encode_val(*ptr, output+len); len += 3; do_default_action = FALSE; } } else if(!is_reserved(*ptr) && !is_unreserved(*ptr)) { if(flags & URL_ESCAPE_UNSAFE) { - pct_encode_val(*ptr, buffer+len); + if(len + 3 < output_len) + pct_encode_val(*ptr, output+len); len += 3; do_default_action = FALSE; } } - if(do_default_action) - buffer[len++] = *ptr; + if(do_default_action) { + if(len < output_len) + output[len] = *ptr; + len++; + } } /* Sometimes the path is the very last component of the IUri, so * see if the dot segments need to be reduced now. */ if(reduce_path && path) { - DWORD current_path_len = (buffer+len) - path; + DWORD current_path_len = (output+len) - path; DWORD new_path_len = remove_dot_segments(path, current_path_len); /* Update the current length. */ len -= (current_path_len-new_path_len); } - buffer[len++] = 0; + if(len < output_len) + output[len] = 0; + else + output[output_len-1] = 0; /* The null terminator isn't included in the length. */ - *result_len = len-1; - if(len > output_len) + *result_len = len; + if(len >= output_len) return STRSAFE_E_INSUFFICIENT_BUFFER; - else - memcpy(output, buffer, len*sizeof(WCHAR)); return S_OK; }

1 0

Piotr Caban : msvcr110: Add Concurrency::details:: _Condition_variable class stub.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 84bed7664c381637697f30f32f5b34787d9450da URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bed7664c381637697f30f32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 17 09:56:06 2016 -0600 msvcr110: Add Concurrency::details::_Condition_variable class stub. Based on patch by Yifu Wang. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 24 +++++++-------- dlls/msvcr110/msvcr110.spec | 36 +++++++++++------------ dlls/msvcr120/msvcr120.spec | 36 +++++++++++------------ dlls/msvcr120_app/msvcr120_app.spec | 36 +++++++++++------------ dlls/msvcrt/lock.c | 58 +++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84bed7664c381637697f3…

1 0

Piotr Caban : msvcr120: Add _Condition_variable implementation.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 5e981f8512ec08d0cd044e3241c969b209da5aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e981f8512ec08d0cd044e324… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 17 09:56:13 2016 -0600 msvcr120: Add _Condition_variable implementation. Based on patch by Yifu Wang. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 115 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 008ce37..85f6727 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -559,8 +559,14 @@ unsigned int __cdecl _GetConcurrency(void) #endif #if _MSVCR_VER >= 110 +typedef struct cv_queue { + struct cv_queue *next; + BOOL expired; +} cv_queue; + typedef struct { - void *chain; + /* cv_queue structure is not binary compatible */ + cv_queue *queue; critical_section lock; } _Condition_variable; @@ -569,8 +575,11 @@ typedef struct { DEFINE_THISCALL_WRAPPER(_Condition_variable_ctor, 4) _Condition_variable* __thiscall _Condition_variable_ctor(_Condition_variable *this) { - FIXME("(%p)\n", this); - return NULL; + TRACE("(%p)\n", this); + + this->queue = NULL; + critical_section_ctor(&this->lock); + return this; } /* ??1_Condition_variable(a)details@Concurrency@@QAE(a)XZ */ @@ -578,7 +587,16 @@ _Condition_variable* __thiscall _Condition_variable_ctor(_Condition_variable *th DEFINE_THISCALL_WRAPPER(_Condition_variable_dtor, 4) void __thiscall _Condition_variable_dtor(_Condition_variable *this) { - FIXME("(%p)\n", this); + TRACE("(%p)\n", this); + + while(this->queue) { + cv_queue *next = this->queue->next; + if(!this->queue->expired) + ERR("there's an active wait\n"); + HeapFree(GetProcessHeap(), 0, this->queue); + this->queue = next; + } + critical_section_dtor(&this->lock); } /* ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z */ @@ -586,7 +604,19 @@ void __thiscall _Condition_variable_dtor(_Condition_variable *this) DEFINE_THISCALL_WRAPPER(_Condition_variable_wait, 8) void __thiscall _Condition_variable_wait(_Condition_variable *this, critical_section *cs) { - FIXME("(%p, %p)\n", this, cs); + cv_queue q; + + TRACE("(%p, %p)\n", this, cs); + + critical_section_lock(&this->lock); + q.next = this->queue; + q.expired = FALSE; + this->queue = &q; + critical_section_unlock(&this->lock); + + critical_section_unlock(cs); + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + critical_section_lock(cs); } /* ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z */ @@ -595,8 +625,41 @@ DEFINE_THISCALL_WRAPPER(_Condition_variable_wait_for, 12) MSVCRT_bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, critical_section *cs, unsigned int timeout) { - FIXME("(%p %p %d)\n", this, cs, timeout); - return FALSE; + LARGE_INTEGER to; + NTSTATUS status; + FILETIME ft; + cv_queue *q; + + TRACE("(%p %p %d)\n", this, cs, timeout); + + if(!(q = HeapAlloc(GetProcessHeap(), 0, sizeof(cv_queue)))) { + throw_bad_alloc("bad allocation"); + } + + critical_section_lock(&this->lock); + q->next = this->queue; + q->expired = FALSE; + this->queue = q; + critical_section_unlock(&this->lock); + + critical_section_unlock(cs); + + GetSystemTimeAsFileTime(&ft); + to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + + ft.dwLowDateTime + (LONGLONG)timeout * 10000; + status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); + if(status == STATUS_TIMEOUT) { + if(!InterlockedExchange(&q->expired, TRUE)) { + critical_section_lock(cs); + return FALSE; + } + else + NtWaitForKeyedEvent(keyed_event, q, 0, 0); + } + + HeapFree(GetProcessHeap(), 0, q); + critical_section_lock(cs); + return TRUE; } /* ?notify_one(a)_Condition_variable@details(a)Concurrency@@QAEXXZ */ @@ -604,7 +667,30 @@ MSVCRT_bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, DEFINE_THISCALL_WRAPPER(_Condition_variable_notify_one, 4) void __thiscall _Condition_variable_notify_one(_Condition_variable *this) { - FIXME("(%p)\n", this); + cv_queue *node; + + TRACE("(%p)\n", this); + + if(!this->queue) + return; + + while(1) { + critical_section_lock(&this->lock); + node = this->queue; + if(!node) { + critical_section_unlock(&this->lock); + return; + } + this->queue = node->next; + critical_section_unlock(&this->lock); + + if(!InterlockedExchange(&node->expired, TRUE)) { + NtReleaseKeyedEvent(keyed_event, node, 0, NULL); + return; + } else { + HeapFree(GetProcessHeap(), 0, node); + } + } } /* ?notify_all(a)_Condition_variable@details(a)Concurrency@@QAEXXZ */ @@ -612,7 +698,27 @@ void __thiscall _Condition_variable_notify_one(_Condition_variable *this) DEFINE_THISCALL_WRAPPER(_Condition_variable_notify_all, 4) void __thiscall _Condition_variable_notify_all(_Condition_variable *this) { - FIXME("(%p)\n", this); + cv_queue *ptr; + + TRACE("(%p)\n", this); + + if(!this->queue) + return; + + critical_section_lock(&this->lock); + ptr = this->queue; + this->queue = NULL; + critical_section_unlock(&this->lock); + + while(ptr) { + cv_queue *next = ptr->next; + + if(!InterlockedExchange(&ptr->expired, TRUE)) + NtReleaseKeyedEvent(keyed_event, ptr, 0, NULL); + else + HeapFree(GetProcessHeap(), 0, ptr); + ptr = next; + } } #endif

1 0

Piotr Caban : msvcr120: Add _Condition_variable tests.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: ccda9bbba43f642f9f1cb631c18adfbc59019a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccda9bbba43f642f9f1cb631c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 17 09:56:21 2016 -0600 msvcr120: Add _Condition_variable tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 125 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 4ecea51..e631738 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -46,6 +46,8 @@ struct thiscall_thunk static ULONG_PTR (WINAPI *call_thiscall_func1)( void *func, void *this ); static ULONG_PTR (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); +static ULONG_PTR (WINAPI *call_thiscall_func3)( void *func, + void *this, const void *a, const void *b ); static void init_thiscall_thunk(void) { @@ -58,16 +60,19 @@ static void init_thiscall_thunk(void) thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ call_thiscall_func1 = (void *)thunk; call_thiscall_func2 = (void *)thunk; + call_thiscall_func3 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) #else #define init_thiscall_thunk() #define call_func1(func,_this) func(_this) #define call_func2(func,_this,a) func(_this,a) +#define call_func3(func,_this,a,b) func(_this,a,b) #endif /* __i386__ */ @@ -103,6 +108,11 @@ typedef struct int unknown2[2]; } critical_section_scoped_lock; +typedef struct { + void *chain; + critical_section lock; +} _Condition_variable; + static inline float __port_infinity(void) { static const unsigned __inf_bytes = 0x7f800000; @@ -188,6 +198,13 @@ static critical_section_scoped_lock* (__thiscall *p_critical_section_scoped_lock (critical_section_scoped_lock*, critical_section *); static void (__thiscall *p_critical_section_scoped_lock_dtor)(critical_section_scoped_lock*); +static _Condition_variable* (__thiscall *p__Condition_variable_ctor)(_Condition_variable*); +static void (__thiscall *p__Condition_variable_dtor)(_Condition_variable*); +static void (__thiscall *p__Condition_variable_wait)(_Condition_variable*, critical_section*); +static MSVCRT_bool (__thiscall *p__Condition_variable_wait_for)(_Condition_variable*, critical_section*, unsigned int); +static void (__thiscall *p__Condition_variable_notify_one)(_Condition_variable*); +static void (__thiscall *p__Condition_variable_notify_all)(_Condition_variable*); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -240,6 +257,18 @@ static BOOL init(void) "??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z"); SET(p_critical_section_scoped_lock_dtor, "??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ"); + SET(p__Condition_variable_ctor, + "??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ"); + SET(p__Condition_variable_dtor, + "??1_Condition_variable(a)details@Concurrency@@QEAA(a)XZ"); + SET(p__Condition_variable_wait, + "?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z"); + SET(p__Condition_variable_wait_for, + "?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z"); + SET(p__Condition_variable_notify_one, + "?notify_one(a)_Condition_variable@details(a)Concurrency@@QEAAXXZ"); + SET(p__Condition_variable_notify_all, + "?notify_all(a)_Condition_variable@details(a)Concurrency@@QEAAXXZ"); } else { #ifdef __arm__ SET(p_critical_section_ctor, @@ -260,6 +289,18 @@ static BOOL init(void) "??0scoped_lock(a)critical_section@Concurrency@@QAA(a)AAV12@@Z"); SET(p_critical_section_scoped_lock_dtor, "??1scoped_lock(a)critical_section@Concurrency@@QAA(a)XZ"); + SET(p__Condition_variable_ctor, + "??0_Condition_variable(a)details@Concurrency@@QAA(a)XZ"); + SET(p__Condition_variable_dtor, + "??1_Condition_variable(a)details@Concurrency@@QAA(a)XZ"); + SET(p__Condition_variable_wait, + "?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z"); + SET(p__Condition_variable_wait_for, + "?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z"); + SET(p__Condition_variable_notify_one, + "?notify_one(a)_Condition_variable@details(a)Concurrency@@QAAXXZ"); + SET(p__Condition_variable_notify_all, + "?notify_all(a)_Condition_variable@details(a)Concurrency@@QAAXXZ"); #else SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QAE(a)XZ"); @@ -279,6 +320,18 @@ static BOOL init(void) "??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z"); SET(p_critical_section_scoped_lock_dtor, "??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ"); + SET(p__Condition_variable_ctor, + "??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ"); + SET(p__Condition_variable_dtor, + "??1_Condition_variable(a)details@Concurrency@@QAE(a)XZ"); + SET(p__Condition_variable_wait, + "?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z"); + SET(p__Condition_variable_wait_for, + "?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z"); + SET(p__Condition_variable_notify_one, + "?notify_one(a)_Condition_variable@details(a)Concurrency@@QAEXXZ"); + SET(p__Condition_variable_notify_all, + "?notify_all(a)_Condition_variable@details(a)Concurrency@@QAEXXZ"); #endif } @@ -758,6 +811,77 @@ static void test__wcreate_locale(void) ok(errno == -1, "expected errno -1, but got %i\n", e); } +struct wait_thread_arg +{ + critical_section *cs; + _Condition_variable *cv; + HANDLE thread_initialized; +}; + +static DWORD WINAPI condition_variable_wait_thread(void *varg) +{ + struct wait_thread_arg *arg = varg; + + call_func1(p_critical_section_lock, arg->cs); + SetEvent(arg->thread_initialized); + call_func2(p__Condition_variable_wait, arg->cv, arg->cs); + call_func1(p_critical_section_unlock, arg->cs); + return 0; +} + +static void test__Condition_variable(void) +{ + critical_section cs; + _Condition_variable cv; + HANDLE thread_initialized = CreateEventW(NULL, FALSE, FALSE, NULL); + struct wait_thread_arg wait_thread_arg = { &cs, &cv, thread_initialized }; + HANDLE threads[2]; + DWORD ret; + MSVCRT_bool b; + + ok(thread_initialized != NULL, "CreateEvent failed\n"); + + call_func1(p_critical_section_ctor, &cs); + call_func1(p__Condition_variable_ctor, &cv); + + call_func1(p__Condition_variable_notify_one, &cv); + call_func1(p__Condition_variable_notify_all, &cv); + + threads[0] = CreateThread(0, 0, condition_variable_wait_thread, + &wait_thread_arg, 0, 0); + ok(threads[0] != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread_initialized, INFINITE); + call_func1(p_critical_section_lock, &cs); + call_func1(p_critical_section_unlock, &cs); + + threads[1] = CreateThread(0, 0, condition_variable_wait_thread, + &wait_thread_arg, 0, 0); + ok(threads[1] != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread_initialized, INFINITE); + call_func1(p_critical_section_lock, &cs); + call_func1(p_critical_section_unlock, &cs); + + call_func1(p__Condition_variable_notify_one, &cv); + ret = WaitForSingleObject(threads[1], 500); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + call_func1(p__Condition_variable_notify_one, &cv); + ret = WaitForSingleObject(threads[0], 500); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", ret); + + CloseHandle(threads[0]); + CloseHandle(threads[1]); + + call_func1(p_critical_section_lock, &cs); + b = call_func3(p__Condition_variable_wait_for, &cv, &cs, 1); + ok(!b, "_Condition_variable_wait_for returned TRUE\n"); + call_func1(p_critical_section_unlock, &cs); + + call_func1(p_critical_section_dtor, &cs); + call_func1(p__Condition_variable_dtor, &cv); + + CloseHandle(thread_initialized); +} + START_TEST(msvcr120) { if (!init()) return; @@ -773,4 +897,5 @@ START_TEST(msvcr120) test_critical_section(); test_fegetenv(); test__wcreate_locale(); + test__Condition_variable(); }

1 0

Hans Leidekker : webservices/tests: Mark some test results as broken.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: f90f1f88a9a06d8411384715dedad332f9d7bb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90f1f88a9a06d8411384715d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 10:10:40 2016 -0600 webservices/tests: Mark some test results as broken. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 912e944..0affea3 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2595,6 +2595,7 @@ static void test_datetime(void) HRESULT hr; const char *result; const char *result2; + HRESULT hr_broken; } tests[] = { @@ -2617,7 +2618,7 @@ static void test_datetime(void) { 0x11ed178c6c000, WS_DATETIME_FORMAT_NONE, S_OK, "<t>0002-01-01T00:00:00</t>" }, { 0x2bca2875f4373fff, WS_DATETIME_FORMAT_UTC, S_OK, "<t>9999-12-31T23:59:59.9999999Z</t>" }, { 0x2bca2875f4373fff, WS_DATETIME_FORMAT_LOCAL, S_OK, "<t>9999-12-31T15:59:59.9999999-08:00</t>", - "<t>9999-12-31T17:59:59.9999999-06:00</t>" /* win7 */ }, + "<t>9999-12-31T17:59:59.9999999-06:00</t>" /* win7 */, WS_E_INVALID_FORMAT }, { 0x2bca2875f4373fff, WS_DATETIME_FORMAT_NONE, S_OK, "<t>9999-12-31T23:59:59.9999999</t>" }, { 0x2bca2875f4374000, WS_DATETIME_FORMAT_UTC, WS_E_INVALID_FORMAT }, { 0x2bca2875f4374000, WS_DATETIME_FORMAT_LOCAL, WS_E_INVALID_FORMAT }, @@ -2651,7 +2652,8 @@ static void test_datetime(void) hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_DATETIME_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, &date, sizeof(date), NULL ); WsWriteEndElement( writer, NULL ); - ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + ok( hr == tests[i].hr || broken(hr == tests[i].hr_broken), "%u: got %08x\n", i, hr ); + if (hr != tests[i].hr && hr == tests[i].hr_broken) break; if (hr == S_OK) { ok( check_result( writer, tests[i].result ) ||

1 0

Hans Leidekker : webservices/tests: Fix argument order in WsCreateMessage calls (Clang).
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 28f66b2a346564abcdd922ad3729e775a5aa0cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f66b2a346564abcdd922ad3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 10:10:47 2016 -0600 webservices/tests: Fix argument order in WsCreateMessage calls (Clang). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/msg.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 5d0901e..f481948 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -564,7 +564,7 @@ static void test_WsSetHeader(void) hr = WsSetHeader( NULL, 0, 0, 0, NULL, 0, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -628,7 +628,7 @@ static void test_WsRemoveHeader(void) hr = WsSetHeader( NULL, 0, 0, 0, NULL, 0, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -678,7 +678,7 @@ static void test_WsAddMappedHeader(void) hr = WsAddMappedHeader( NULL, NULL, 0, 0, NULL, 0, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsAddMappedHeader( msg, NULL, 0, 0, NULL, 0, NULL ); @@ -712,7 +712,7 @@ static void test_WsRemoveMappedHeader(void) hr = WsRemoveMappedHeader( NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsRemoveMappedHeader( msg, NULL, NULL ); @@ -778,7 +778,7 @@ static void test_WsAddCustomHeader(void) hr = WsAddCustomHeader( NULL, NULL, 0, NULL, 0, 0, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsAddCustomHeader( msg, NULL, 0, NULL, 0, 0, NULL ); @@ -855,7 +855,7 @@ static void test_WsRemoveCustomHeader(void) hr = WsRemoveCustomHeader( NULL, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsRemoveCustomHeader( msg, &localname, &ns, NULL ); @@ -917,7 +917,7 @@ static void test_WsReadEnvelopeStart(void) hr = WsReadEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadEnvelopeStart( msg, NULL, NULL, NULL, NULL ); @@ -932,7 +932,7 @@ static void test_WsReadEnvelopeStart(void) hr = WsReadEnvelopeStart( msg, reader, NULL, NULL, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg2, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg2, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = set_input( reader, xml, strlen(xml) ); @@ -963,7 +963,7 @@ static void test_WsReadEnvelopeEnd(void) hr = WsReadEnvelopeEnd( NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); @@ -972,7 +972,7 @@ static void test_WsReadEnvelopeEnd(void) hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg2, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg2, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = set_input( reader, xml, strlen(xml) ); @@ -1023,7 +1023,7 @@ static void test_WsReadBody(void) hr = WsReadBody( NULL, NULL, 0, NULL, NULL, 0, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsCreateReader( NULL, 0, &reader, NULL ); @@ -1032,7 +1032,7 @@ static void test_WsReadBody(void) hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg2, NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg2, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadBody( msg2, NULL, 0, NULL, NULL, 0, NULL );

1 0

Hans Leidekker : webservices: Fix calculation of the end of a UTF-8 sequence.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 43e213e24ca4a1571df8053431e748425a00a53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e213e24ca4a1571df805343… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 10:10:56 2016 -0600 webservices: Fix calculation of the end of a UTF-8 sequence. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- dlls/webservices/tests/reader.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 5b5dc69..d67c47a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1035,7 +1035,7 @@ static inline unsigned int read_utf8_char( struct reader *reader, unsigned int * } len = utf8_length[ch - 0x80]; if (reader->read_pos + len >= reader->read_size) return 0; - end = reader->read_bufptr + reader->read_pos + len; + end = reader->read_bufptr + reader->read_pos + len + 1; res = ch & utf8_mask[len]; switch (len) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 23c3f10..b19bc8c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1325,6 +1325,8 @@ static void test_WsReadType(void) static const WCHAR testW[] = {'t','e','s','t',0}; static const GUID guid1 = {0,0,0,{0,0,0,0,0,0,0,0}}; static const GUID guid2 = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; + static const char utf8[] = {'<','t','>',0xe2,0x80,0x99,'<','/','t','>'}; + static const WCHAR utf8W[] = {0x2019,0}; HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; @@ -1636,6 +1638,14 @@ static void test_WsReadType(void) WS_READ_REQUIRED_VALUE, heap, &val_bytes, sizeof(val_bytes), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + val_str = NULL; + prepare_type_test( reader, utf8, sizeof(utf8) ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_WSZ_TYPE, NULL, + WS_READ_REQUIRED_POINTER, heap, &val_str, sizeof(val_str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_str != NULL, "pointer not set\n" ); + if (val_str) ok( !lstrcmpW( val_str, utf8W ), "wrong data %s\n", wine_dbgstr_w(val_str) ); + WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0