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

Hans Leidekker : wininet: Only set the content length header if it' s not explicitly set by the user.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: d6a59f755eff0a6f05dc7b4b375ea96c21e7a0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a59f755eff0a6f05dc7b4b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 26 14:09:10 2014 +0200 wininet: Only set the content length header if it's not explicitly set by the user. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 97becd4..c7e3474 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4851,7 +4851,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (dwContentLength || strcmpW(request->verb, szGET)) { sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(request, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_REPLACE); + HTTP_HttpAddRequestHeadersW(request, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD_IF_NEW); request->bytesToWrite = dwContentLength; } if (request->session->appInfo->agent) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 70e82db..41f4c5b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2654,10 +2654,10 @@ static void test_header_handling_order(int port) { static const char authorization[] = "Authorization: Basic dXNlcjpwd2Q="; static const char connection[] = "Connection: Close"; - static const char *types[2] = { "*", NULL }; + char data[32]; HINTERNET session, connect, request; - DWORD size, status; + DWORD size, status, data_len; BOOL ret; session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2693,6 +2693,10 @@ static void test_header_handling_order(int port) ok(status == 200 || status == 400 /* IE6 */, "got status %u, expected 200 or 400\n", status); InternetCloseHandle(request); + InternetCloseHandle(connect); + + connect = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); request = HttpOpenRequestA(connect, "POST", "/test7", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); ok(request != NULL, "HttpOpenRequest failed\n"); @@ -2707,7 +2711,30 @@ static void test_header_handling_order(int port) size = sizeof(status); ret = HttpQueryInfoA( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200 || status == 400 /* IE6 */, "got status %u, expected 200 or 400\n", status); + ok(status == 200, "got status %u, expected 200\n", status); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + + connect = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequestA(connect, "POST", "/test7b", NULL, NULL, types, 0, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(request, "Content-Length: 100\r\n", ~0u, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + ok(ret, "HttpAddRequestHeaders failed\n"); + + data_len = sizeof(data); + memset(data, 'a', sizeof(data)); + ret = HttpSendRequestA(request, connection, ~0u, data, data_len); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfoA( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "got status %u, expected 200\n", status); InternetCloseHandle(request); InternetCloseHandle(connect);

1 0

Francois Gouget : scrrun: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 2b76dfba97825ff7a7f56efd2085d38ef013abdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b76dfba97825ff7a7f56efd2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 24 11:53:48 2014 +0200 scrrun: Fix compilation on systems that don't support nameless unions. --- dlls/scrrun/filesystem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 94b8083..54deb97 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -892,7 +892,7 @@ static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) { HRESULT hr = S_OK; - if (src->HighPart || src->LowPart > INT_MAX) + if (src->u.HighPart || src->u.LowPart > INT_MAX) { V_VT(v) = VT_R8; hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); @@ -900,7 +900,7 @@ static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) else { V_VT(v) = VT_I4; - V_I4(v) = src->LowPart; + V_I4(v) = src->u.LowPart; } return hr; @@ -2649,8 +2649,8 @@ static HRESULT WINAPI file_get_Size(IFile *iface, VARIANT *pvarSize) return create_error(GetLastError()); FindClose(f); - size.LowPart = fd.nFileSizeLow; - size.HighPart = fd.nFileSizeHigh; + size.u.LowPart = fd.nFileSizeLow; + size.u.HighPart = fd.nFileSizeHigh; return variant_from_largeint(&size, pvarSize); }

1 0

Alistair Leslie-Hughes : dpnet/tests: Correct memory leak (valgrind).
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 8c9a145f25831b068a38cb5166f6b7ad762e5cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9a145f25831b068a38cb516… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 22 18:54:43 2014 +1000 dpnet/tests: Correct memory leak (valgrind). --- dlls/dpnet/tests/server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index c4de81e..8279666 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -90,6 +90,8 @@ static void create_server(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(nDestroyPlayer, "No DPN_MSGID_DESTROY_PLAYER Message\n"); + + IDirectPlay8Address_Release(localaddr); } IDirectPlay8Server_Release(server);

1 0

Jacek Caban : oleaut32: Replaced dump_Variant by debugstr_variant.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 04a573a66ef0b108cf589cc2e65c2584986e5da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a573a66ef0b108cf589cc2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 23 15:40:59 2014 +0200 oleaut32: Replaced dump_Variant by debugstr_variant. --- dlls/oleaut32/typelib.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ba1abef..d4fd22e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1537,11 +1537,6 @@ static void dump_TLBImplType(const TLBImplType * impl, UINT n) } } -static void dump_Variant(const VARIANT * pvar) -{ - TRACE("%s\n", debugstr_variant(pvar)); -} - static void dump_DispParms(const DISPPARAMS * pdp) { unsigned int index; @@ -1559,7 +1554,7 @@ static void dump_DispParms(const DISPPARAMS * pdp) { TRACE("args:\n"); for (index = 0; index < pdp->cArgs; index++) - dump_Variant( &pdp->rgvarg[index] ); + TRACE(" [%d] %s\n", index, debugstr_variant(pdp->rgvarg+index)); } } @@ -6748,8 +6743,7 @@ DispCallFunc( args[argspos++] = V_UI4(arg); break; } - TRACE("arg %u: type %d\n",i,prgvt[i]); - dump_Variant(arg); + TRACE("arg %u: type %s %s\n", i, debugstr_vt(prgvt[i]), debugstr_variant(arg)); } switch (vtReturn) @@ -6789,7 +6783,7 @@ DispCallFunc( return DISP_E_BADCALLEE; } if (vtReturn != VT_VARIANT) V_VT(pvargResult) = vtReturn; - TRACE("retval: "); dump_Variant(pvargResult); + TRACE("retval: %s\n", debugstr_variant(pvargResult)); return S_OK; #elif defined(__x86_64__) @@ -6838,8 +6832,7 @@ DispCallFunc( args[argspos++] = V_UI8(arg); break; } - TRACE("arg %u: type %d\n",i,prgvt[i]); - dump_Variant(arg); + TRACE("arg %u: type %s %s\n", i, debugstr_vt(prgvt[i]), debugstr_variant(arg)); } switch (vtReturn) @@ -6866,7 +6859,7 @@ DispCallFunc( } heap_free( args ); if (vtReturn != VT_VARIANT) V_VT(pvargResult) = vtReturn; - TRACE("retval: "); dump_Variant(pvargResult); + TRACE("retval: %s\n", debugstr_variant(pvargResult)); return S_OK; #else @@ -7061,7 +7054,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } else if (src_arg) { - dump_Variant(src_arg); + TRACE("%s\n", debugstr_variant(src_arg)); if(rgvt[i]!=V_VT(src_arg)) { @@ -7231,11 +7224,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( continue; else if (wParamFlags & PARAMFLAG_FRETVAL) { - if (TRACE_ON(ole)) - { - TRACE("[retval] value: "); - dump_Variant(prgpvarg[i]); - } + TRACE("[retval] value: %s\n", debugstr_variant(prgpvarg[i])); if (pVarResult) { @@ -7324,8 +7313,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } if (V_VT(&varresult) != VT_ERROR) { - TRACE("varresult value: "); - dump_Variant(&varresult); + TRACE("varresult value: %s\n", debugstr_variant(&varresult)); if (pVarResult) {

1 0

Jacek Caban : oleaut32: Rewrite debugstr_vt.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 5614770c242834cd9dcbf4f6f4aeacbf2aaac8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5614770c242834cd9dcbf4f6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 23 15:40:16 2014 +0200 oleaut32: Rewrite debugstr_vt. --- dlls/oleaut32/tmarshal.c | 2 +- dlls/oleaut32/typelib.c | 7 +++---- dlls/oleaut32/variant.c | 47 ++++++++++++++++++++++++++++++---------------- dlls/oleaut32/variant.h | 10 +--------- 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0dec7e7..ee2a95b 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -711,7 +711,7 @@ serialize_param( hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; case VT_VARIANT: { - if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(V_VT((VARIANT *)arg)),debugstr_vf(V_VT((VARIANT *)arg))); + if (debugout) TRACE_(olerelay)("%s", debugstr_variant((VARIANT *)arg)); if (writeit) { ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4a16fca..d3ff4e5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1541,7 +1541,7 @@ static void dump_Variant(const VARIANT * pvar) { SYSTEMTIME st; - TRACE("%p->{%s%s", pvar, debugstr_VT(pvar), debugstr_VF(pvar)); + TRACE("%p->{%s", pvar, debugstr_vt(V_VT(pvar))); if (pvar) { @@ -7188,9 +7188,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (FAILED(hres)) { - ERR("failed to convert param %d to %s%s from %s%s\n", i, - debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), - debugstr_VT(src_arg), debugstr_VF(src_arg)); + ERR("failed to convert param %d to %s from %s\n", i, + debugstr_vt(rgvt[i]), debugstr_variant(src_arg)); break; } prgpvarg[i] = &rgvarg[i]; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 562236e..ef3b7bf 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); -const char * const wine_vtypes[VT_CLSID+1] = +static const char * const variant_types[] = { "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", @@ -55,10 +55,11 @@ const char * const wine_vtypes[VT_CLSID+1] = "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", - "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID" + "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", + "VT_VERSIONED_STREAM" }; -const char * const wine_vflags[16] = +static const char * const variant_flags[16] = { "", "|VT_VECTOR", @@ -68,16 +69,30 @@ const char * const wine_vflags[16] = "|VT_VECTOR|VT_ARRAY", "|VT_ARRAY|VT_BYREF", "|VT_VECTOR|VT_ARRAY|VT_BYREF", - "|VT_HARDTYPE", - "|VT_VECTOR|VT_HARDTYPE", - "|VT_ARRAY|VT_HARDTYPE", - "|VT_VECTOR|VT_ARRAY|VT_HARDTYPE", - "|VT_BYREF|VT_HARDTYPE", - "|VT_VECTOR|VT_ARRAY|VT_HARDTYPE", - "|VT_ARRAY|VT_BYREF|VT_HARDTYPE", - "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_HARDTYPE", + "|VT_RESERVED", + "|VT_VECTOR|VT_RESERVED", + "|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_ARRAY|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", }; +const char *debugstr_vt(VARTYPE vt) +{ + if(vt & ~VT_TYPEMASK) + return wine_dbg_sprintf("%s%s", debugstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12]); + + if(vt <= sizeof(variant_types)/sizeof(*variant_types)) + return variant_types[vt]; + + if(vt == VT_BSTR_BLOB) + return "VT_BSTR_BLOB"; + + return wine_dbg_sprintf("vt(invalid %x)", vt); +} + const char *debugstr_variant(const VARIANT *v) { if(!v) @@ -109,7 +124,7 @@ const char *debugstr_variant(const VARIANT *v) case VT_UINT: return wine_dbg_sprintf("%p {VT_UINT: %u}", v, V_UINT(v)); default: - return wine_dbg_sprintf("%p {vt %s%s}", v, debugstr_VT(v), debugstr_VF(v)); + return wine_dbg_sprintf("%p {vt %s}", v, debugstr_vt(V_VT(v))); } } @@ -121,8 +136,8 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARTYPE vtFrom = V_TYPE(ps); DWORD dwFlags = 0; - TRACE("(%s,0x%08x,0x%04x,%s,%s%s)\n", debugstr_variant(pd), lcid, wFlags, - debugstr_variant(ps), debugstr_vt(vt), debugstr_vf(vt)); + TRACE("(%s,0x%08x,0x%04x,%s,%s)\n", debugstr_variant(pd), lcid, wFlags, + debugstr_variant(ps), debugstr_vt(vt)); if (vt == VT_BSTR || vtFrom == VT_BSTR) { @@ -1030,8 +1045,8 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, { HRESULT res = S_OK; - TRACE("(%s,%s,0x%08x,0x%04x,%s%s)\n", debugstr_variant(pvargDest), - debugstr_variant(pvargSrc), lcid, wFlags, debugstr_vt(vt), debugstr_vf(vt)); + TRACE("(%s,%s,0x%08x,0x%04x,%s)\n", debugstr_variant(pvargDest), + debugstr_variant(pvargSrc), lcid, wFlags, debugstr_vt(vt)); if (vt == VT_CLSID) res = DISP_E_BADVARTYPE; diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index e13e56a..a4e3acf 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -48,16 +48,8 @@ #define VTBIT_VARIANT (1 << VT_VARIANT) #define VTBIT_15 (1 << 15) /* no variant type with this number */ -extern const char * const wine_vtypes[] DECLSPEC_HIDDEN; -#define debugstr_vt(v) (((v)&VT_TYPEMASK) <= VT_CLSID ? wine_vtypes[((v)&VT_TYPEMASK)] : \ - ((v)&VT_TYPEMASK) == VT_BSTR_BLOB ? "VT_BSTR_BLOB": "Invalid") -#define debugstr_VT(v) (!(v) ? "(null)" : debugstr_vt(V_TYPE((v)))) - -extern const char * const wine_vflags[] DECLSPEC_HIDDEN; -#define debugstr_vf(v) (wine_vflags[((v)&VT_EXTRA_TYPE)>>12]) -#define debugstr_VF(v) (!(v) ? "(null)" : debugstr_vf(V_EXTRA_TYPE(v))) - const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; +const char *debugstr_vt(VARTYPE) DECLSPEC_HIDDEN; /* Size constraints */ #define I1_MAX 0x7f

1 0

Hans Leidekker : winhttp: Ignore URL components if the buffer length is zero.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 465f85e89dfd6d796317ddadf5f5ab8d74d69ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465f85e89dfd6d796317ddadf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 22 11:36:22 2014 +0200 winhttp: Ignore URL components if the buffer length is zero. --- dlls/winhttp/tests/url.c | 33 +++++++++++++++++++++++++++++++++ dlls/winhttp/url.c | 1 + 2 files changed, 34 insertions(+) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index ad06fc4..f53947c 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -71,6 +71,7 @@ static const WCHAR url13[] = {'h','t','t','p','s',':','/','/','t','o','o','l','s','.','g','o','o','g','l','e','.','c','o','m','/','s','e','r','v','i','c','e','/','u','p','d','a','t','e','2','?','w','=','3',':','B','x','D','H','o','W','y','8','e','z','M',0}; static const WCHAR url14[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o',' ','g','/','p','a','t','h',' ','w','i','t','h',' ','s','p','a','c','e','s',0}; +static const WCHAR url15[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','t','e','s','t',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -625,6 +626,38 @@ static void WinHttpCrackUrl_test( void ) ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); ok( !lstrcmpW( uc.lpszHostName, hostnameW ), "unexpected host name\n" ); ok( !lstrcmpW( uc.lpszUrlPath, pathW ), "unexpected path\n" ); + + uc.dwStructSize = sizeof(uc); + uc.lpszScheme = NULL; + uc.dwSchemeLength = 0; + uc.nScheme = 0; + uc.lpszHostName = NULL; + uc.dwHostNameLength = ~0u; + uc.nPort = 0; + uc.lpszUserName = NULL; + uc.dwUserNameLength = ~0u; + uc.lpszPassword = NULL; + uc.dwPasswordLength = ~0u; + uc.lpszUrlPath = NULL; + uc.dwUrlPathLength = ~0u; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = ~0u; + ret = WinHttpCrackUrl( url15, 0, 0, &uc ); + ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( !uc.lpszScheme, "unexpected scheme %s\n", wine_dbgstr_w(uc.lpszScheme) ); + ok( !uc.dwSchemeLength, "unexpected length %u\n", uc.dwSchemeLength ); + ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme %u\n", uc.nScheme ); + ok( !lstrcmpW( uc.lpszHostName, url15 + 7 ), "unexpected hostname %s\n", wine_dbgstr_w(uc.lpszHostName) ); + ok( uc.dwHostNameLength == 14, "unexpected length %u\n", uc.dwHostNameLength ); + ok( uc.nPort == 80, "unexpected port %u\n", uc.nPort ); + ok( !uc.lpszUserName, "unexpected username\n" ); + ok( !uc.dwUserNameLength, "unexpected length %u\n", uc.dwUserNameLength ); + ok( !uc.lpszPassword, "unexpected password\n" ); + ok( !uc.dwPasswordLength, "unexpected length %u\n", uc.dwPasswordLength ); + ok( !lstrcmpW( uc.lpszUrlPath, url15 + 21 ), "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); + ok( uc.dwUrlPathLength == 5, "unexpected length %u\n", uc.dwUrlPathLength ); + ok( !uc.lpszExtraInfo[0], "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); + ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index d8b423c..9ad6ee5 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -36,6 +36,7 @@ static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, DWORD flags ) { + if (!*str_len) return TRUE; if (!*str) { if (len && *str_len && (flags & (ICU_DECODE|ICU_ESCAPE)))

1 0

Hans Leidekker : winhttp/tests: Mark some test results on Windows 8 as broken.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: fafbb34f1f76126461985029e2cbdc9a0a661383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fafbb34f1f76126461985029e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 22 11:35:36 2014 +0200 winhttp/tests: Mark some test results on Windows 8 as broken. --- dlls/winhttp/tests/url.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 3ac0bec..ad06fc4 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -462,10 +462,13 @@ static void WinHttpCrackUrl_test( void ) reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k9, 0, 0, &uc ); ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); - ok( uc.lpszUrlPath == url_k9 + 14, "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); + ok( uc.lpszUrlPath == url_k9 + 14 || broken(uc.lpszUrlPath == url_k9 + 13) /* win8 */, + "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); ok( uc.dwUrlPathLength == 0, "unexpected path length: %u\n", uc.dwUrlPathLength ); - ok( uc.lpszExtraInfo == url_k9 + 14, "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 0, "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); + ok( uc.lpszExtraInfo == url_k9 + 14 || broken(uc.lpszExtraInfo == url_k9 + 13) /* win8 */, + "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); + ok( uc.dwExtraInfoLength == 0 || broken(uc.dwExtraInfoLength == 1) /* win8 */, + "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k10, 0, 0, &uc );

1 0

Aric Stewart : winemac: Reposition cursor for IME composition.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 20daa8b61ccde0722b53b4d2195455858667b979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20daa8b61ccde0722b53b4d21… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 23 08:04:36 2014 -0500 winemac: Reposition cursor for IME composition. It is more natural for the cursor to be at the end of the selection being composed instead of being at the beginning. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 48d0651..ba1b914 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -431,7 +431,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif event->im_set_text.data = [window imeData]; event->im_set_text.text = (CFStringRef)[[markedText string] copy]; event->im_set_text.complete = FALSE; - event->im_set_text.cursor_pos = markedTextSelection.location; + event->im_set_text.cursor_pos = markedTextSelection.location + markedTextSelection.length; [[window queue] postEvent:event];

1 0

Jacek Caban : oleaut32: Use debugstr_variant for dump_Variant implementation.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 18a42e02117065b08c35f61c06468bb0284ace00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a42e02117065b08c35f61c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 23 15:40:39 2014 +0200 oleaut32: Use debugstr_variant for dump_Variant implementation. --- dlls/oleaut32/typelib.c | 52 +---------------------------------------------- dlls/oleaut32/variant.c | 35 +++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 53 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d3ff4e5..ba1abef 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1539,57 +1539,7 @@ static void dump_TLBImplType(const TLBImplType * impl, UINT n) static void dump_Variant(const VARIANT * pvar) { - SYSTEMTIME st; - - TRACE("%p->{%s", pvar, debugstr_vt(V_VT(pvar))); - - if (pvar) - { - if (V_ISBYREF(pvar) || V_TYPE(pvar) == VT_UNKNOWN || - V_TYPE(pvar) == VT_DISPATCH || V_TYPE(pvar) == VT_RECORD) - { - TRACE(",%p", V_BYREF(pvar)); - } - else if (V_ISARRAY(pvar) || V_ISVECTOR(pvar)) - { - TRACE(",%p", V_ARRAY(pvar)); - } - else switch (V_TYPE(pvar)) - { - case VT_I1: TRACE(",%d", V_I1(pvar)); break; - case VT_UI1: TRACE(",%d", V_UI1(pvar)); break; - case VT_I2: TRACE(",%d", V_I2(pvar)); break; - case VT_UI2: TRACE(",%d", V_UI2(pvar)); break; - case VT_INT: - case VT_I4: TRACE(",%d", V_I4(pvar)); break; - case VT_UINT: - case VT_UI4: TRACE(",%d", V_UI4(pvar)); break; - case VT_I8: TRACE(",0x%08x,0x%08x", (ULONG)(V_I8(pvar) >> 32), - (ULONG)(V_I8(pvar) & 0xffffffff)); break; - case VT_UI8: TRACE(",0x%08x,0x%08x", (ULONG)(V_UI8(pvar) >> 32), - (ULONG)(V_UI8(pvar) & 0xffffffff)); break; - case VT_R4: TRACE(",%3.3e", V_R4(pvar)); break; - case VT_R8: TRACE(",%3.3e", V_R8(pvar)); break; - case VT_BOOL: TRACE(",%s", V_BOOL(pvar) ? "TRUE" : "FALSE"); break; - case VT_BSTR: TRACE(",%s", debugstr_w(V_BSTR(pvar))); break; - case VT_CY: TRACE(",0x%08x,0x%08x", V_CY(pvar).s.Hi, - V_CY(pvar).s.Lo); break; - case VT_DATE: - if(!VariantTimeToSystemTime(V_DATE(pvar), &st)) - TRACE(",<invalid>"); - else - TRACE(",%04d/%02d/%02d %02d:%02d:%02d", st.wYear, st.wMonth, st.wDay, - st.wHour, st.wMinute, st.wSecond); - break; - case VT_ERROR: - case VT_VOID: - case VT_USERDEFINED: - case VT_EMPTY: - case VT_NULL: break; - default: TRACE(",?"); break; - } - } - TRACE("}\n"); + TRACE("%s\n", debugstr_variant(pvar)); } static void dump_DispParms(const DISPPARAMS * pdp) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ef3b7bf..a52c607 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -98,13 +98,20 @@ const char *debugstr_variant(const VARIANT *v) if(!v) return "(null)"; + if(V_VT(v) & VT_BYREF) { + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + return wine_dbg_sprintf("%p {VT_VARIANT|VT_BYREF: %s}", v, debugstr_variant(V_VARIANTREF(v))); + return wine_dbg_sprintf("%p {%s %p}", v, debugstr_vt(V_VT(v)), V_BYREF(v)); + } + + if(V_ISARRAY(v) || V_ISVECTOR(v)) + return wine_dbg_sprintf("%p {%s %p}", v, debugstr_vt(V_VT(v)), V_ARRAY(v)); + switch(V_VT(v)) { case VT_EMPTY: return wine_dbg_sprintf("%p {VT_EMPTY}", v); case VT_NULL: return wine_dbg_sprintf("%p {VT_NULL}", v); - case VT_I1: - return wine_dbg_sprintf("%p {VT_I1: %d}", v, V_I1(v)); case VT_I2: return wine_dbg_sprintf("%p {VT_I2: %d}", v, V_I2(v)); case VT_I4: @@ -113,6 +120,10 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("%p {VT_R4: %f}", v, V_R4(v)); case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, V_R8(v)); + case VT_CY: + return wine_dbg_sprintf("%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64)); + case VT_DATE: + return wine_dbg_sprintf("%p {VT_DATE: %lf}", v, V_DATE(v)); case VT_BSTR: return wine_dbg_sprintf("%p {VT_BSTR: %s}", v, debugstr_w(V_BSTR(v))); case VT_DISPATCH: @@ -121,8 +132,28 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("%p {VT_ERROR: %08x}", v, V_ERROR(v)); case VT_BOOL: return wine_dbg_sprintf("%p {VT_BOOL: %x}", v, V_BOOL(v)); + case VT_UNKNOWN: + return wine_dbg_sprintf("%p {VT_UNKNOWN: %p}", v, V_UNKNOWN(v)); + case VT_I1: + return wine_dbg_sprintf("%p {VT_I1: %d}", v, V_I1(v)); + case VT_UI1: + return wine_dbg_sprintf("%p {VT_UI1: %u}", v, V_UI1(v)); + case VT_UI2: + return wine_dbg_sprintf("%p {VT_UI2: %d}", v, V_UI2(v)); + case VT_UI4: + return wine_dbg_sprintf("%p {VT_UI4: %d}", v, V_UI4(v)); + case VT_I8: + return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v))); + case VT_UI8: + return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(V_UI8(v))); + case VT_INT: + return wine_dbg_sprintf("%p {VT_INT: %d}", v, V_INT(v)); case VT_UINT: return wine_dbg_sprintf("%p {VT_UINT: %u}", v, V_UINT(v)); + case VT_VOID: + return wine_dbg_sprintf("%p {VT_VOID}", v); + case VT_RECORD: + return wine_dbg_sprintf("%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo); default: return wine_dbg_sprintf("%p {vt %s}", v, debugstr_vt(V_VT(v))); }

1 0

Huw Davies : dwrite/tests: U+1cc8 is not an assigned codepoint, use U+1cc7 instead. Fixes test on win 8.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: d3d4e3a9a9c46d418c404883b9959e539be74a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d4e3a9a9c46d418c404883b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 23 12:40:36 2014 +0100 dwrite/tests: U+1cc8 is not an assigned codepoint, use U+1cc7 instead. Fixes test on win 8. --- dlls/dwrite/tests/analyzer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 7a920b2..7ff6e56 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -716,7 +716,7 @@ static struct sa_test sa_tests[] = { }, { /* Sundanese Supplement */ - {0x1cc0,0x1cc5,0x1cc8,0}, 1, + {0x1cc0,0x1cc5,0x1cc7,0}, 1, { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, { @@ -765,7 +765,7 @@ static void test_AnalyzeScript(void) init_expected_sa(expected_seq, ptr); hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource, 0, lstrlenW(g_source), &analysissink); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, ANALYZER_ID, expected_seq[0]->sequence, "AnalyzeScript", FALSE); + ok_sequence(sequences, ANALYZER_ID, expected_seq[0]->sequence, wine_dbgstr_w(ptr->string), FALSE); ptr++; }

1 0

Piotr Caban : msvcrt: Add _wcslwr_s_l implementation.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 31c76cae7c0322d4a235ea57843c73210882a32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c76cae7c0322d4a235ea578… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 22 12:58:50 2014 +0200 msvcrt: Add _wcslwr_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/wcs.c | 28 ++++++++++++++++++++++++++-- 8 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 581ff17..ed40b65 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1490,10 +1490,10 @@ @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l -@ cdecl _wcslwr(wstr) ntdll._wcslwr -@ stub _wcslwr_l +@ cdecl _wcslwr(wstr) MSVCRT__wcslwr +@ cdecl _wcslwr_l(wstr ptr) MSVCRT__wcslwr_l @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s -@ stub _wcslwr_s_l +@ cdecl _wcslwr_s_l(wstr long ptr) MSVCRT__wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9973aa0..8af410c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1849,10 +1849,10 @@ @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l -@ cdecl _wcslwr(wstr) ntdll._wcslwr -@ stub _wcslwr_l +@ cdecl _wcslwr(wstr) MSVCRT__wcslwr +@ cdecl _wcslwr_l(wstr ptr) MSVCRT__wcslwr_l @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s -@ stub _wcslwr_s_l +@ cdecl _wcslwr_s_l(wstr long ptr) MSVCRT__wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index cf3e236..0168359 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -598,7 +598,7 @@ @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll -@ cdecl _wcslwr(wstr) ntdll._wcslwr +@ cdecl _wcslwr(wstr) MSVCRT__wcslwr @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 2912b2d..f5ff608 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -594,7 +594,7 @@ @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll -@ cdecl _wcslwr(wstr) ntdll._wcslwr +@ cdecl _wcslwr(wstr) MSVCRT__wcslwr @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c76465b..1898d11 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1169,10 +1169,10 @@ @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l -@ cdecl _wcslwr(wstr) ntdll._wcslwr -@ stub _wcslwr_l +@ cdecl _wcslwr(wstr) MSVCRT__wcslwr +@ cdecl _wcslwr_l(wstr ptr) MSVCRT__wcslwr_l @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s -@ stub _wcslwr_s_l +@ cdecl _wcslwr_s_l(wstr long ptr) MSVCRT__wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 622b9f4..b4ea4b8 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1145,10 +1145,10 @@ @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l -@ cdecl _wcslwr(wstr) ntdll._wcslwr -@ stub _wcslwr_l +@ cdecl _wcslwr(wstr) MSVCRT__wcslwr +@ cdecl _wcslwr_l(wstr ptr) MSVCRT__wcslwr_l @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s -@ stub _wcslwr_s_l +@ cdecl _wcslwr_s_l(wstr long ptr) MSVCRT__wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cd7a39b..69020f6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1106,10 +1106,10 @@ @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l -@ cdecl _wcslwr(wstr) ntdll._wcslwr -# stub _wcslwr_l(wstr ptr) +@ cdecl _wcslwr(wstr) MSVCRT__wcslwr +@ cdecl _wcslwr_l(wstr ptr) MSVCRT__wcslwr_l @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s -# stub _wcslwr_s_l(wstr long ptr) +@ cdecl _wcslwr_s_l(wstr long ptr) MSVCRT__wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll @ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 60a24a5..548c907 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -235,9 +235,9 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsupr_l( MSVCRT_wchar_t *str, MSVCRT__locale_t lo } /****************************************************************** - * _wcslwr_s (MSVCRT.@) + * _wcslwr_s_l (MSVCRT.@) */ -int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +int CDECL MSVCRT__wcslwr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__locale_t locale ) { MSVCRT_wchar_t* ptr = str; @@ -262,6 +262,30 @@ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) return MSVCRT_EINVAL; } +/****************************************************************** + * _wcslwr_s (MSVCRT.@) + */ +int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +{ + return MSVCRT__wcslwr_s_l(str, n, NULL); +} + +/****************************************************************** + * _wcslwr_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcslwr_l( MSVCRT_wchar_t* str, MSVCRT__locale_t locale ) +{ + return MSVCRT__wcslwr_s_l(str, -1, locale); +} + +/****************************************************************** + * _wcslwr (MSVCRT.@) + */ +int CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) +{ + return MSVCRT__wcslwr_s_l(str, -1, NULL); +} + /********************************************************************* * _wcsncoll_l (MSVCRT.@) */

1 0

Hans Leidekker : wininet/tests: Fix a couple of test failures on Internet Explorer 11.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 4e340c0a7f9010003c63167628f2b79f2e1e327b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e340c0a7f9010003c6316762… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 22 11:37:34 2014 +0200 wininet/tests: Fix a couple of test failures on Internet Explorer 11. --- dlls/wininet/tests/internet.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 837e429..e2ad17a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -189,18 +189,15 @@ static void test_InternetQueryOptionA(void) ok(retval == 0,"Got wrong return value %d\n",retval); ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %d\n",err); - SetLastError(0xdeadbeef); len=strlen(useragent)+1; buffer=HeapAlloc(GetProcessHeap(),0,len); retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); - err=GetLastError(); ok(retval == 1,"Got wrong return value %d\n",retval); if (retval) { ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); ok(len == strlen(useragent),"Got wrong user agent length %d instead of %d\n",len,lstrlenA(useragent)); } - ok(err == 0xdeadbeef, "Got wrong error code %d\n",err); HeapFree(GetProcessHeap(),0,buffer); SetLastError(0xdeadbeef); @@ -594,6 +591,7 @@ static void test_null(void) { HINTERNET hi, hc; static const WCHAR szServer[] = { 's','e','r','v','e','r',0 }; + static const WCHAR szServer2[] = { 's','e','r','v','e','r','=',0 }; static const WCHAR szEmpty[] = { 0 }; static const WCHAR szUrl[] = { 'h','t','t','p',':','/','/','a','.','b','.','c',0 }; static const WCHAR szUrlEmpty[] = { 'h','t','t','p',':','/','/',0 }; @@ -686,8 +684,8 @@ static void test_null(void) r = InternetGetCookieW(szUrl, szServer, NULL, &sz); ok( r == TRUE, "return wrong\n"); - /* sz is 14 on XP SP2 and beyond, 30 on XP SP1 and before */ - ok( sz == 14 || sz == 30, "sz wrong, got %u, expected 14 or 30\n", sz); + /* sz is 14 on XP SP2 and beyond, 30 on XP SP1 and before, 16 on IE11 */ + ok( sz == 14 || sz == 16 || sz == 30, "sz wrong, got %u, expected 14, 16 or 30\n", sz); sz = 0x20; memset(buffer, 0, sizeof buffer); @@ -698,7 +696,8 @@ static void test_null(void) ok( sz == 1 + lstrlenW(buffer) || sz == lstrlenW(buffer), "sz wrong %d\n", sz); /* before XP SP2, buffer is "server; server" */ - ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer), "cookie data wrong\n"); + ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer) || !lstrcmpW(szServer2, buffer), + "cookie data wrong %s\n", wine_dbgstr_w(buffer)); sz = sizeof(buffer); r = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECTED_STATE, buffer, &sz); @@ -1066,11 +1065,9 @@ static void test_InternetSetOption(void) ok(ret == FALSE, "InternetQueryOption should've failed\n"); ok(GetLastError() == ERROR_INTERNET_BAD_OPTION_LENGTH, "GetLastError() = %d\n", GetLastError()); - SetLastError(0xdeadbeef); ulArg = 11; ret = InternetSetOptionA(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); - ok(GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); SetLastError(0xdeadbeef); ulArg = 4;

1 0

Hans Leidekker : winhttp: Only set the scheme if we have a valid URL.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: 069df699006a1e9b7429465f5e1a9e0fa66459e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069df699006a1e9b7429465f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 22 11:37:01 2014 +0200 winhttp: Only set the scheme if we have a valid URL. --- dlls/winhttp/tests/url.c | 35 +++++++++++++++++++++++++++++++++++ dlls/winhttp/url.c | 19 +++++++++++++------ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index f53947c..4af7b9f 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -658,6 +658,41 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwUrlPathLength == 5, "unexpected length %u\n", uc.dwUrlPathLength ); ok( !uc.lpszExtraInfo[0], "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); + + uc.dwStructSize = sizeof(uc); + uc.lpszScheme = scheme; + uc.dwSchemeLength = 0; + uc.nScheme = 0; + uc.lpszHostName = NULL; + uc.dwHostNameLength = 0; + uc.nPort = 0; + uc.lpszUserName = NULL; + uc.dwUserNameLength = ~0u; + uc.lpszPassword = NULL; + uc.dwPasswordLength = ~0u; + uc.lpszUrlPath = NULL; + uc.dwUrlPathLength = 0; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; + SetLastError( 0xdeadbeef ); + ret = WinHttpCrackUrl( url15, 0, 0, &uc ); + error = GetLastError(); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !lstrcmpW( uc.lpszScheme, http ), "unexpected scheme %s\n", wine_dbgstr_w(uc.lpszScheme) ); + ok( !uc.dwSchemeLength, "unexpected length %u\n", uc.dwSchemeLength ); + ok( uc.nScheme == 0, "unexpected scheme %u\n", uc.nScheme ); + ok( !uc.lpszHostName, "unexpected hostname %s\n", wine_dbgstr_w(uc.lpszHostName) ); + ok( uc.dwHostNameLength == 0, "unexpected length %u\n", uc.dwHostNameLength ); + ok( uc.nPort == 0, "unexpected port %u\n", uc.nPort ); + ok( !uc.lpszUserName, "unexpected username\n" ); + ok( uc.dwUserNameLength == ~0u, "unexpected length %u\n", uc.dwUserNameLength ); + ok( !uc.lpszPassword, "unexpected password\n" ); + ok( uc.dwPasswordLength == ~0u, "unexpected length %u\n", uc.dwPasswordLength ); + ok( !uc.lpszUrlPath, "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); + ok( uc.dwUrlPathLength == 0, "unexpected length %u\n", uc.dwUrlPathLength ); + ok( !uc.lpszExtraInfo, "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); + ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 9ad6ee5..2f0cf98 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -36,6 +36,11 @@ static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, DWORD flags ) { + if (*str && !*str_len) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } if (!*str_len) return TRUE; if (!*str) { @@ -174,6 +179,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN { BOOL ret = FALSE; WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; + INTERNET_SCHEME scheme = 0; TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, uc); @@ -207,8 +213,8 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); return FALSE; } - if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) uc->nScheme = INTERNET_SCHEME_HTTP; - else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) uc->nScheme = INTERNET_SCHEME_HTTPS; + if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) scheme = INTERNET_SCHEME_HTTP; + else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) scheme = INTERNET_SCHEME_HTTPS; else { set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); @@ -252,8 +258,8 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN else { if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p, flags ))) goto exit; - if (uc->nScheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (uc->nScheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + if (scheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (scheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((r = memchrW( q, '?', len - (q - url) ))) @@ -278,8 +284,8 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN else { if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url), flags ))) goto exit; - if (uc->nScheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (uc->nScheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + if (scheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (scheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, (WCHAR *)url + len, 0, flags ))) goto exit; if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags ))) goto exit; @@ -295,6 +301,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN debugstr_wn( uc->lpszExtraInfo, uc->dwExtraInfoLength )); exit: + if (ret) uc->nScheme = scheme; heap_free( url_decoded ); heap_free( url_escaped ); return ret;

1 0

Francois Gouget : msvcrt/tests: Make qsort_comp() static.
by Alexandre Julliard May 26, 2014

May 26, 2014

Module: wine Branch: master Commit: df5cd21ff6269272386686193fbace2ce81f87aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5cd21ff6269272386686193… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 22 11:25:13 2014 +0200 msvcrt/tests: Make qsort_comp() static. --- dlls/msvcrt/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 7b940f1..a4c5c8c 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -368,7 +368,7 @@ struct qsort_test } cmp[64]; }; -int __cdecl qsort_comp(void *ctx, const void *l, const void *r) +static int __cdecl qsort_comp(void *ctx, const void *l, const void *r) { struct qsort_test *qt = ctx;

1 0

André Hentschel : Add WWN370
by Jeremy Newman May 24, 2014

May 24, 2014

Module: website Branch: master Commit: 65e28967817f7e74896c5802390869c8be1db966 URL: http://source.winehq.org/git/website.git/?a=commit;h=65e28967817f7e74896c58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 23 22:31:19 2014 +0200 Add WWN370 --- news/de/2014052301.xml | 11 + news/en/2014052301.xml | 11 + wwn/en/wn20140523_370.xml | 718 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 740 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=65e28967817f7e7489…

1 0

Nikolay Sivov : scrrun: Use existing helper to return file size.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: 05a80d0f189c199d13fb23ef8af619c8d701a612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a80d0f189c199d13fb23ef8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 15:27:34 2014 +0400 scrrun: Use existing helper to return file size. --- dlls/scrrun/filesystem.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 6473210..94b8083 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2635,6 +2635,7 @@ static HRESULT WINAPI file_get_DateLastAccessed(IFile *iface, DATE *pdate) static HRESULT WINAPI file_get_Size(IFile *iface, VARIANT *pvarSize) { struct file *This = impl_from_IFile(iface); + ULARGE_INTEGER size; WIN32_FIND_DATAW fd; HANDLE f; @@ -2648,14 +2649,10 @@ static HRESULT WINAPI file_get_Size(IFile *iface, VARIANT *pvarSize) return create_error(GetLastError()); FindClose(f); - if(fd.nFileSizeHigh || fd.nFileSizeLow>INT_MAX) { - V_VT(pvarSize) = VT_R8; - V_R8(pvarSize) = ((ULONGLONG)fd.nFileSizeHigh<<32) + fd.nFileSizeLow; - }else { - V_VT(pvarSize) = VT_I4; - V_I4(pvarSize) = fd.nFileSizeLow; - } - return S_OK; + size.LowPart = fd.nFileSizeLow; + size.HighPart = fd.nFileSizeHigh; + + return variant_from_largeint(&size, pvarSize); } static HRESULT WINAPI file_get_Type(IFile *iface, BSTR *pbstrType)

1 0

Vincent Povirk : ole32: Use a snapshot file when sharing storages for writing.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: 77e3de5828bedbaf0685ceb4350d064d365c1a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e3de5828bedbaf0685ceb43… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 9 15:57:19 2014 -0500 ole32: Use a snapshot file when sharing storages for writing. --- dlls/ole32/storage32.c | 533 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/ole32/storage32.h | 12 +- 2 files changed, 510 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77e3de5828bedbaf0685c…

1 0

Piotr Caban : msvcrt: Add qsort_s tests.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: e95938c2d612e90c18e0772354add1a6949995fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95938c2d612e90c18e077235… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 21 11:57:24 2014 +0200 msvcrt: Add qsort_s tests. --- dlls/msvcrt/tests/misc.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 523d277..7b940f1 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -32,6 +32,8 @@ static int (__cdecl *p_set_doserrno)(int); static int (__cdecl *p_set_errno)(int); static void (__cdecl *p__invalid_parameter)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); +static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, + int (__cdecl*)(void*, const void*, const void*), void*); static void init(void) { @@ -45,6 +47,7 @@ static void init(void) p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno"); p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); p__invalid_parameter = (void *)GetProcAddress(hmod, "_invalid_parameter"); + p_qsort_s = (void *)GetProcAddress(hmod, "qsort_s"); } static void test_rand_s(void) @@ -354,6 +357,126 @@ static void test__invalid_parameter(void) p__invalid_parameter(NULL, NULL, NULL, 0, 0); } +struct qsort_test +{ + int pos; + int *base; + + struct { + int l; + int r; + } cmp[64]; +}; + +int __cdecl qsort_comp(void *ctx, const void *l, const void *r) +{ + struct qsort_test *qt = ctx; + + if(qt) { + ok(qt->pos < 64, "qt->pos = %d\n", qt->pos); + ok(qt->cmp[qt->pos].l == (int*)l-qt->base, + "%d) l on %ld position\n", qt->pos, (long)((int*)l - qt->base)); + ok(qt->cmp[qt->pos].r == (int*)r-qt->base, + "%d) r on %ld position\n", qt->pos, (long)((int*)r - qt->base)); + qt->pos++; + } + + return *(int*)l%1000 - *(int*)r%1000; +} + +static void test_qsort_s(void) +{ + static const int nonstable_test[] = {9000, 8001, 7002, 6003, 1003, 5004, 4005, 3006, 2007}; + int tab[100], i; + + struct qsort_test small_sort = { + 0, tab, { + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 4}, {6, 5}, {7, 6}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 4}, {6, 5}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 4}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, + {1, 0}, {2, 1}, {3, 2}, + {1, 0}, {2, 1}, + {1, 0} + } + }, small_sort2 = { + 0, tab, { + {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}, {7, 0}, + {1, 0}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}, + {1, 0}, {2, 1}, {3, 2}, {4, 2}, {5, 2}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, + {1, 0}, {2, 1}, {3, 2}, + {1, 0}, {2, 1}, + {1, 0} + } + }, quick_sort = { + 0, tab, { + {0, 4}, {0, 8}, {4, 8}, + {1, 4}, {2, 4}, {3, 4}, {5, 4}, {6, 4}, {7, 4}, {7, 4}, {6, 4}, + {6, 4}, + {8, 7}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 4}, {6, 4}, + {1, 0}, {2, 1}, {3, 2}, {4, 3}, {5, 3}, + {1, 0}, {2, 1}, {3, 2}, {4, 2}, + {1, 0}, {2, 1}, {3, 2}, + {1, 0}, {2, 1}, + {1, 0} + } + }; + + if(!p_qsort_s) { + win_skip("qsort_s not available\n"); + return; + } + + for(i=0; i<8; i++) tab[i] = i; + p_qsort_s(tab, 8, sizeof(int), qsort_comp, &small_sort); + ok(small_sort.pos == 28, "small_sort.pos = %d\n", small_sort.pos); + for(i=0; i<8; i++) + ok(tab[i] == i, "tab[%d] = %d\n", i, tab[i]); + + for(i=0; i<8; i++) tab[i] = 7-i; + p_qsort_s(tab, 8, sizeof(int), qsort_comp, &small_sort2); + ok(small_sort2.pos == 28, "small_sort2.pos = %d\n", small_sort2.pos); + for(i=0; i<8; i++) + ok(tab[i] == i, "tab[%d] = %d\n", i, tab[i]); + + for(i=0; i<9; i++) tab[i] = i; + tab[5] = 1; + tab[6] = 2; + p_qsort_s(tab, 9, sizeof(int), qsort_comp, &quick_sort); + ok(quick_sort.pos == 34, "quick_sort.pos = %d\n", quick_sort.pos); + + /* show that qsort is not stable */ + for(i=0; i<9; i++) tab[i] = 8-i + 1000*(i+1); + tab[0] = 1003; + p_qsort_s(tab, 9, sizeof(int), qsort_comp, NULL); + for(i=0; i<9; i++) + ok(tab[i] == nonstable_test[i], "tab[%d] = %d, expected %d\n", i, tab[i], nonstable_test[i]); + + /* check if random data is sorted */ + srand(0); + for(i=0; i<100; i++) tab[i] = rand()%1000; + p_qsort_s(tab, 100, sizeof(int), qsort_comp, NULL); + for(i=1; i<100; i++) + ok(tab[i-1] <= tab[i], "data sorted incorrectly on position %d: %d <= %d\n", i, tab[i-1], tab[i]); + + /* test if random permutation is sorted correctly */ + for(i=0; i<100; i++) tab[i] = i; + for(i=0; i<100; i++) { + int b = rand()%100; + int e = rand()%100; + + if(b == e) continue; + tab[b] ^= tab[e]; + tab[e] ^= tab[b]; + tab[b] ^= tab[e]; + } + p_qsort_s(tab, 100, sizeof(int), qsort_comp, NULL); + for(i=0; i<100; i++) + ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); +} + START_TEST(misc) { int arg_c; @@ -380,4 +503,5 @@ START_TEST(misc) test__set_errno(); test__popen(arg_v[0]); test__invalid_parameter(); + test_qsort_s(); }

1 0

Piotr Caban : msvcrt: Rewrite qsort function.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: b703afda86ef962c617ff33f7b8a552ea550d1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b703afda86ef962c617ff33f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 21 11:57:13 2014 +0200 msvcrt: Rewrite qsort function. --- dlls/msvcrt/misc.c | 145 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 104 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 7bb84c8..36d0608 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -229,41 +229,108 @@ void CDECL _chkesp(void) #endif /* __i386__ */ -/********************************************************************* - * Helper function for MSVCRT_qsort_s. - * - * Based on NTDLL_qsort in dlls/ntdll/misc.c - */ -static void MSVCRT_mergesort( void *arr, void *barr, size_t elemsize, - int (CDECL *compar)(void *, const void *, const void *), - size_t left, size_t right, void *context ) +static inline void swap(char *l, char *r, MSVCRT_size_t size) +{ + char tmp; + + while(size--) { + tmp = *l; + *l++ = *r; + *r++ = tmp; + } +} + +static void small_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (CDECL *compar)(void *, const void *, const void *), void *context) +{ + MSVCRT_size_t e, i; + char *max, *p; + + for(e=nmemb; e>1; e--) { + max = base; + for(i=1; i<e; i++) { + p = (char*)base + i*size; + if(compar(context, p, max) > 0) + max = p; + } + + if(p != max) + swap(p, max, size); + } +} + +static void quick_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (CDECL *compar)(void *, const void *, const void *), void *context) { - if (right>left) { - size_t i, j, k, m; - m=left+(right-left)/2; - MSVCRT_mergesort(arr, barr, elemsize, compar, left, m, context); - MSVCRT_mergesort(arr, barr, elemsize, compar, m+1, right, context); - -#define X(a,i) ((char*)a+elemsize*(i)) - for (i=m+1; i>left; i--) - memcpy (X(barr,(i-1)),X(arr,(i-1)),elemsize); - for (j=m; j<right; j++) - memcpy (X(barr,(right+m-j)),X(arr,(j+1)),elemsize); - - /* i=left; j=right; */ - for (k=left; i<=m && j>m; k++) { - if (i==j || compar(context, X(barr,i),X(barr,j))<=0) { - memcpy(X(arr,k),X(barr,i),elemsize); - i++; - } else { - memcpy(X(arr,k),X(barr,j),elemsize); - j--; + int stack_lo[8*sizeof(MSVCRT_size_t)], stack_hi[8*sizeof(MSVCRT_size_t)], stack_pos; + int beg, end, lo, hi, med; + + stack_pos = 0; + stack_lo[stack_pos] = 0; + stack_hi[stack_pos] = nmemb-1; + +#define X(i) ((char*)base+size*(i)) + while(stack_pos >= 0) { + beg = stack_lo[stack_pos]; + end = stack_hi[stack_pos--]; + + if(end-beg < 8) { + small_sort(X(beg), end-beg+1, size, compar, context); + continue; + } + + lo = beg; + hi = end; + med = (hi+lo+1)/2; + if(compar(context, X(lo), X(med)) > 0) + swap(X(lo), X(med), size); + if(compar(context, X(lo), X(hi)) > 0) + swap(X(lo), X(hi), size); + if(compar(context, X(med), X(hi)) > 0) + swap(X(med), X(hi), size); + + lo++; + hi--; + while(1) { + while(lo <= hi) { + if(lo!=med && compar(context, X(lo), X(med))>0) + break; + lo++; + } + + while(med != hi) { + if(compar(context, X(hi), X(med)) <= 0) + break; + hi--; } + + if(hi < lo) + break; + + swap(X(lo), X(hi), size); + if(hi == med) + med = lo; + lo++; + hi--; + } + + while(hi > beg) { + if(hi!=med && compar(context, X(hi), X(med))!=0) + break; + hi--; + } + + if(hi-beg >= end-lo) { + stack_lo[++stack_pos] = beg; + stack_hi[stack_pos] = hi; + stack_lo[++stack_pos] = lo; + stack_hi[stack_pos] = end; + }else { + stack_lo[++stack_pos] = lo; + stack_hi[stack_pos] = end; + stack_lo[++stack_pos] = beg; + stack_hi[stack_pos] = hi; } - for (; i<=m; i++, k++) - memcpy(X(arr,k),X(barr,i),elemsize); - for (; j>m; j--, k++) - memcpy(X(arr,k),X(barr,j),elemsize); } #undef X } @@ -271,13 +338,13 @@ static void MSVCRT_mergesort( void *arr, void *barr, size_t elemsize, /********************************************************************* * qsort_s (MSVCRT.@) * - * Based on NTDLL_qsort in dlls/ntdll/misc.c + * This function is trying to sort data doing identical comparisons + * as native does. There are still cases where it behaves differently. */ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, int (CDECL *compar)(void *, const void *, const void *), void *context) { - void *secondarr; - const size_t total_size = nmemb*size; + const MSVCRT_size_t total_size = nmemb*size; if (!MSVCRT_CHECK_PMT(base != NULL || (base == NULL && nmemb == 0))) return; if (!MSVCRT_CHECK_PMT(size > 0)) return; @@ -286,11 +353,7 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, if (nmemb < 2) return; - secondarr = MSVCRT_malloc(total_size); - if (!secondarr) - return; - MSVCRT_mergesort(base, secondarr, size, compar, 0, nmemb-1, context); - MSVCRT_free(secondarr); + quick_sort(base, nmemb, size, compar, context); } /********************************************************************* @@ -299,7 +362,7 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, void CDECL MSVCRT_qsort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, int (CDECL *compar)(const void*, const void*)) { - return MSVCRT_qsort_s(base, nmemb, size, compare_wrapper, compar); + MSVCRT_qsort_s(base, nmemb, size, compare_wrapper, compar); } /*********************************************************************

1 0

Nikolay Sivov : xmllite/writer: Initial implementation of WriteElementString().
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: f43a6d46da82c155bbeebded23466db65e836976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43a6d46da82c155bbeebded2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 21 08:59:36 2014 +0400 xmllite/writer: Initial implementation of WriteElementString(). --- dlls/xmllite/tests/writer.c | 61 +++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 79 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 124 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7631b45..c92dce7 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -502,12 +502,41 @@ static void test_bom(void) IUnknown_Release(output); IStream_Release(stream); + /* WriteElementString */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + GlobalUnlock(hglobal); + + IUnknown_Release(output); + IStream_Release(stream); + IXmlWriter_Release(writer); } static void test_writestartelement(void) { + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + static const char *str = "<a><b>value</b>"; static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; char *ptr; IXmlWriter *writer; IStream *stream; @@ -566,6 +595,38 @@ static void test_writestartelement(void) IStream_Release(stream); IXmlWriter_Release(writer); + + /* WriteElementString */ + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, str, strlen(str)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IStream_Release(stream); + IXmlWriter_Release(writer); } START_TEST(writer) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 1a21ef4..4a69474 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); static const WCHAR closepiW[] = {'?','>'}; +static const WCHAR ltW[] = {'<'}; +static const WCHAR gtW[] = {'>'}; struct output_buffer { @@ -52,7 +54,8 @@ typedef enum XmlWriterState_Ready, /* SetOutput() was called, ready to start */ XmlWriterState_PIDocStarted, /* document was started with manually added 'xml' PI */ XmlWriterState_DocStarted, /* document was started with WriteStartDocument() */ - XmlWriterState_ElemStarted /* writing element */ + XmlWriterState_ElemStarted, /* writing element */ + XmlWriterState_Content /* content is accepted at this point */ } XmlWriterState; typedef struct @@ -80,6 +83,7 @@ typedef struct _xmlwriter XmlConformanceLevel conformance; XmlWriterState state; BOOL bomwritten; + BOOL starttagopen; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -226,6 +230,20 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } +/* TODO: test if we need to validate char range */ +static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, const WCHAR *local_name) +{ + if (prefix) { + static const WCHAR colW[] = {':'}; + write_output_buffer(output, prefix, -1); + write_output_buffer(output, colW, 1); + } + + write_output_buffer(output, local_name, -1); + + return S_OK; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -294,6 +312,17 @@ static HRESULT write_encoding_bom(xmlwriter *writer) return S_OK; } +static HRESULT writer_close_starttag(xmlwriter *writer) +{ + HRESULT hr; + + if (!writer->starttagopen) return S_OK; + hr = write_output_buffer(writer->output, gtW, 1); + writer->starttagopen = FALSE; + writer->state = XmlWriterState_Content; + return hr; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -498,16 +527,40 @@ static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName return E_NOTIMPL; } -static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pwszPrefix, - LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri, - LPCWSTR pwszValue) +static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR prefix, + LPCWSTR local_name, LPCWSTR uri, LPCWSTR value) { xmlwriter *This = impl_from_IXmlWriter(iface); + static const WCHAR closeW[] = {'<','/'}; - FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), - wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue)); + TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), + wine_dbgstr_w(uri), wine_dbgstr_w(value)); - return E_NOTIMPL; + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; + default: + ; + } + + write_encoding_bom(This); + write_output_buffer(This->output, ltW, 1); + write_output_qname(This->output, prefix, local_name); + write_output_buffer(This->output, gtW, 1); + + if (value) + write_output_buffer(This->output, value, -1); + + write_output_buffer(This->output, closeW, 2); + write_output_qname(This->output, prefix, local_name); + write_output_buffer(This->output, gtW, 1); + This->state = XmlWriterState_Content; + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) @@ -703,7 +756,6 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri) { xmlwriter *This = impl_from_IXmlWriter(iface); - static const WCHAR ltW[] = {'<'}; TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); @@ -718,16 +770,10 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre write_encoding_bom(This); This->state = XmlWriterState_ElemStarted; + This->starttagopen = TRUE; write_output_buffer(This->output, ltW, 1); - - if (prefix) { - static const WCHAR colW[] = {':'}; - write_output_buffer(This->output, prefix, -1); - write_output_buffer(This->output, colW, 1); - } - - write_output_buffer(This->output, local_name, -1); + write_output_qname(This->output, prefix, local_name); return S_OK; } @@ -892,6 +938,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->conformance = XmlConformanceLevel_Document; writer->state = XmlWriterState_Initial; writer->bomwritten = FALSE; + writer->starttagopen = FALSE; *obj = &writer->IXmlWriter_iface;

1 0

Nikolay Sivov : xmllite/writer: Initial implementation of WriteStartElement().
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: 2177403b8ebefcf8641505f8946e429f9960cb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2177403b8ebefcf8641505f89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 21 00:24:49 2014 +0400 xmllite/writer: Initial implementation of WriteStartElement(). --- dlls/xmllite/tests/writer.c | 92 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 49 ++++++++++++++++++----- 2 files changed, 132 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 6800cd2..7631b45 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -410,6 +410,7 @@ static void test_bom(void) static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; static const WCHAR xmlW[] = {'x','m','l',0}; + static const WCHAR aW[] = {'a',0}; IXmlWriterOutput *output; unsigned char *ptr; IXmlWriter *writer; @@ -473,8 +474,98 @@ static void test_bom(void) GlobalUnlock(hglobal); IUnknown_Release(output); + IStream_Release(stream); + + /* start with element */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + GlobalUnlock(hglobal); + + IUnknown_Release(output); + IStream_Release(stream); + IXmlWriter_Release(writer); +} + +static void test_writestartelement(void) +{ + static const WCHAR aW[] = {'a',0}; + char *ptr; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, aW, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, aW); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, "<a", 2), "got %s\n", ptr); + GlobalUnlock(hglobal); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + /* write another element without closing previous one */ + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + IStream_Release(stream); + IXmlWriter_Release(writer); } START_TEST(writer) @@ -485,6 +576,7 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); test_writestartdocument(); + test_writestartelement(); test_flush(); test_omitxmldeclaration(); test_bom(); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a1f409c..1a21ef4 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -51,7 +51,8 @@ typedef enum XmlWriterState_Initial, /* output is not set yet */ XmlWriterState_Ready, /* SetOutput() was called, ready to start */ XmlWriterState_PIDocStarted, /* document was started with manually added 'xml' PI */ - XmlWriterState_DocStarted /* document was started with WriteStartDocument() */ + XmlWriterState_DocStarted, /* document was started with WriteStartDocument() */ + XmlWriterState_ElemStarted /* writing element */ } XmlWriterState; typedef struct @@ -593,11 +594,19 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_w(name), wine_dbgstr_w(text)); - if (This->state == XmlWriterState_Initial) + switch (This->state) + { + case XmlWriterState_Initial: return E_UNEXPECTED; - - if (This->state == XmlWriterState_DocStarted && !strcmpW(name, xmlW)) + case XmlWriterState_DocStarted: + if (!strcmpW(name, xmlW)) + return WR_E_INVALIDACTION; + break; + case XmlWriterState_ElemStarted: return WR_E_INVALIDACTION; + default: + ; + } write_encoding_bom(This); write_output_buffer(This->output, openpiW, sizeof(openpiW)/sizeof(WCHAR)); @@ -656,6 +665,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal This->state = XmlWriterState_DocStarted; return S_OK; case XmlWriterState_DocStarted: + case XmlWriterState_ElemStarted: return WR_E_INVALIDACTION; default: ; @@ -690,15 +700,36 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal return S_OK; } -static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pwszPrefix, - LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri) +static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri) { xmlwriter *This = impl_from_IXmlWriter(iface); + static const WCHAR ltW[] = {'<'}; - FIXME("%p %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), - wine_dbgstr_w(pwszNamespaceUri)); + TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); - return E_NOTIMPL; + if (This->state == XmlWriterState_Initial) + return E_UNEXPECTED; + + if (!local_name) + return E_INVALIDARG; + + if (This->state == XmlWriterState_ElemStarted) + return WR_E_INVALIDACTION; + + write_encoding_bom(This); + This->state = XmlWriterState_ElemStarted; + + write_output_buffer(This->output, ltW, 1); + + if (prefix) { + static const WCHAR colW[] = {':'}; + write_output_buffer(This->output, prefix, -1); + write_output_buffer(This->output, colW, 1); + } + + write_output_buffer(This->output, local_name, -1); + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, LPCWSTR pwszText)

1 0

Stefan Dösinger : include: Sync an attribute to the Windows 8.1 SDK.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: 98a6b702130bbae3f88380ff92af77cac5066df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a6b702130bbae3f88380ff9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 20 13:09:17 2014 +0200 include: Sync an attribute to the Windows 8.1 SDK. --- include/shobjidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index c9297a8..ae42c2e 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3350,7 +3350,7 @@ interface ITransferAdviseSink : IUnknown HRESULT FileFailure([in] IShellItem *item, [in, unique, string] LPCWSTR itemname, [in] HRESULT hr, - [out, unique, size_is(crename)] LPWSTR rename, + [in, out, unique, size_is(crename)] LPWSTR rename, [in] ULONG crename); HRESULT SubStreamFailure([in] IShellItem *item, [in, string] LPCWSTR stream,

1 0

Vincent Povirk : ole32: Invalidate all caches when the transaction sig changes.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: d89d43648fd55b13bb478903139b2071f0fb8f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89d43648fd55b13bb4789031… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 20 14:30:16 2014 -0500 ole32: Invalidate all caches when the transaction sig changes. --- dlls/ole32/storage32.c | 191 ++++++++++++++++++++++++++++-------------------- 1 file changed, 111 insertions(+), 80 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 39fa68f..a880e2a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -102,6 +102,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl; /* Method definitions for the Storage32InternalImpl class. */ static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* parentStorage, DWORD openFlags, DirRef storageDirEntry); +static HRESULT StorageImpl_Refresh(StorageImpl *This, BOOL new_object, BOOL create); static void StorageImpl_Destroy(StorageBaseImpl* iface); static void StorageImpl_Invalidate(StorageBaseImpl* iface); static HRESULT StorageImpl_Flush(StorageBaseImpl* iface); @@ -2667,6 +2668,7 @@ static HRESULT StorageImpl_GetTransactionSig(StorageBaseImpl *base, { StorageImpl *This = (StorageImpl*)base; HRESULT hr=S_OK; + DWORD oldTransactionSig = This->transactionSig; if (refresh) { @@ -2680,8 +2682,18 @@ static HRESULT StorageImpl_GetTransactionSig(StorageBaseImpl *base, if (SUCCEEDED(hr)) { - /* FIXME: Throw out everything and reload the file if this changed. */ StorageUtl_ReadDWord(data, 0, &This->transactionSig); + + if (oldTransactionSig != This->transactionSig) + { + /* Someone else wrote to this, so toss all cached information. */ + TRACE("signature changed\n"); + + hr = StorageImpl_Refresh(This, FALSE, FALSE); + } + + if (FAILED(hr)) + This->transactionSig = oldTransactionSig; } } @@ -3005,71 +3017,12 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) return hr; } -static HRESULT StorageImpl_Construct( - HANDLE hFile, - LPCOLESTR pwcsName, - ILockBytes* pLkbyt, - DWORD openFlags, - BOOL fileBased, - BOOL create, - ULONG sector_size, - StorageImpl** result) +static HRESULT StorageImpl_Refresh(StorageImpl *This, BOOL new_object, BOOL create) { - StorageImpl* This; - HRESULT hr = S_OK; + HRESULT hr=S_OK; DirEntry currentEntry; DirRef currentEntryRef; - - if ( FAILED( validateSTGM(openFlags) )) - return STG_E_INVALIDFLAG; - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); - if (!This) - return E_OUTOFMEMORY; - - memset(This, 0, sizeof(StorageImpl)); - - list_init(&This->base.strmHead); - - list_init(&This->base.storageHead); - - This->base.IStorage_iface.lpVtbl = &Storage32Impl_Vtbl; - This->base.IPropertySetStorage_iface.lpVtbl = &IPropertySetStorage_Vtbl; - This->base.IDirectWriterLock_iface.lpVtbl = &DirectWriterLockVtbl; - This->base.baseVtbl = &StorageImpl_BaseVtbl; - This->base.openFlags = (openFlags & ~STGM_CREATE); - This->base.ref = 1; - This->base.create = create; - - if (openFlags == (STGM_DIRECT_SWMR|STGM_READWRITE|STGM_SHARE_DENY_WRITE)) - This->base.lockingrole = SWMR_Writer; - else if (openFlags == (STGM_DIRECT_SWMR|STGM_READ|STGM_SHARE_DENY_NONE)) - This->base.lockingrole = SWMR_Reader; - else - This->base.lockingrole = SWMR_None; - - This->base.reverted = FALSE; - - /* - * Initialize the big block cache. - */ - This->bigBlockSize = sector_size; - This->smallBlockSize = DEF_SMALL_BLOCK_SIZE; - if (hFile) - hr = FileLockBytesImpl_Construct(hFile, openFlags, pwcsName, &This->lockBytes); - else - { - This->lockBytes = pLkbyt; - ILockBytes_AddRef(pLkbyt); - } - - if (FAILED(hr)) - goto end; - - hr = StorageImpl_GrabLocks(This, openFlags); - - if (FAILED(hr)) - goto end; + BlockChainStream *blockChainStream; if (create) { @@ -3095,7 +3048,7 @@ static HRESULT StorageImpl_Construct( This->rootStartBlock = 1; This->smallBlockLimit = LIMIT_TO_USE_SMALL_BLOCK; This->smallBlockDepotStart = BLOCK_END_OF_CHAIN; - if (sector_size == 4096) + if (This->bigBlockSize == 4096) This->bigBlockSizeBits = MAX_BIG_BLOCK_SIZE_BITS; else This->bigBlockSizeBits = MIN_BIG_BLOCK_SIZE_BITS; @@ -3129,7 +3082,7 @@ static HRESULT StorageImpl_Construct( if (FAILED(hr)) { - goto end; + return hr; } } @@ -3156,8 +3109,7 @@ static HRESULT StorageImpl_Construct( This->extBigBlockDepotLocations = HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * cache_size); if (!This->extBigBlockDepotLocations) { - hr = E_OUTOFMEMORY; - goto end; + return E_OUTOFMEMORY; } This->extBigBlockDepotLocationsSize = cache_size; @@ -3167,8 +3119,7 @@ static HRESULT StorageImpl_Construct( if (current_block == BLOCK_END_OF_CHAIN) { WARN("File has too few extended big block depot blocks.\n"); - hr = STG_E_DOCFILECORRUPT; - goto end; + return STG_E_DOCFILECORRUPT; } This->extBigBlockDepotLocations[i] = current_block; current_block = Storage32Impl_GetNextExtendedBlock(This, current_block); @@ -3183,20 +3134,24 @@ static HRESULT StorageImpl_Construct( /* * Create the block chain abstractions. */ - if(!(This->rootBlockChain = + if(!(blockChainStream = BlockChainStream_Construct(This, &This->rootStartBlock, DIRENTRY_NULL))) { - hr = STG_E_READFAULT; - goto end; + return STG_E_READFAULT; } + if (!new_object) + BlockChainStream_Destroy(This->rootBlockChain); + This->rootBlockChain = blockChainStream; - if(!(This->smallBlockDepotChain = + if(!(blockChainStream = BlockChainStream_Construct(This, &This->smallBlockDepotStart, DIRENTRY_NULL))) { - hr = STG_E_READFAULT; - goto end; + return STG_E_READFAULT; } + if (!new_object) + BlockChainStream_Destroy(This->smallBlockDepotChain); + This->smallBlockDepotChain = blockChainStream; /* * Write the root storage entry (memory only) @@ -3249,20 +3204,96 @@ static HRESULT StorageImpl_Construct( if (FAILED(hr)) { - hr = STG_E_READFAULT; - goto end; + return STG_E_READFAULT; } /* * Create the block chain abstraction for the small block root chain. */ - if(!(This->smallBlockRootChain = + if(!(blockChainStream = BlockChainStream_Construct(This, NULL, This->base.storageDirEntry))) { - hr = STG_E_READFAULT; + return STG_E_READFAULT; } + if (!new_object) + BlockChainStream_Destroy(This->smallBlockRootChain); + This->smallBlockRootChain = blockChainStream; + + if (!new_object) + { + int i; + for (i=0; i<BLOCKCHAIN_CACHE_SIZE; i++) + { + BlockChainStream_Destroy(This->blockChainCache[i]); + This->blockChainCache[i] = NULL; + } + } + + return hr; +} + +static HRESULT StorageImpl_Construct( + HANDLE hFile, + LPCOLESTR pwcsName, + ILockBytes* pLkbyt, + DWORD openFlags, + BOOL fileBased, + BOOL create, + ULONG sector_size, + StorageImpl** result) +{ + StorageImpl* This; + HRESULT hr = S_OK; + + if ( FAILED( validateSTGM(openFlags) )) + return STG_E_INVALIDFLAG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); + if (!This) + return E_OUTOFMEMORY; + + memset(This, 0, sizeof(StorageImpl)); + + list_init(&This->base.strmHead); + + list_init(&This->base.storageHead); + + This->base.IStorage_iface.lpVtbl = &Storage32Impl_Vtbl; + This->base.IPropertySetStorage_iface.lpVtbl = &IPropertySetStorage_Vtbl; + This->base.IDirectWriterLock_iface.lpVtbl = &DirectWriterLockVtbl; + This->base.baseVtbl = &StorageImpl_BaseVtbl; + This->base.openFlags = (openFlags & ~STGM_CREATE); + This->base.ref = 1; + This->base.create = create; + + if (openFlags == (STGM_DIRECT_SWMR|STGM_READWRITE|STGM_SHARE_DENY_WRITE)) + This->base.lockingrole = SWMR_Writer; + else if (openFlags == (STGM_DIRECT_SWMR|STGM_READ|STGM_SHARE_DENY_NONE)) + This->base.lockingrole = SWMR_Reader; + else + This->base.lockingrole = SWMR_None; + + This->base.reverted = FALSE; + + /* + * Initialize the big block cache. + */ + This->bigBlockSize = sector_size; + This->smallBlockSize = DEF_SMALL_BLOCK_SIZE; + if (hFile) + hr = FileLockBytesImpl_Construct(hFile, openFlags, pwcsName, &This->lockBytes); + else + { + This->lockBytes = pLkbyt; + ILockBytes_AddRef(pLkbyt); + } + + if (SUCCEEDED(hr)) + hr = StorageImpl_GrabLocks(This, openFlags); + + if (SUCCEEDED(hr)) + hr = StorageImpl_Refresh(This, TRUE, create); -end: if (FAILED(hr)) { IStorage_Release(&This->base.IStorage_iface);

1 0

Vincent Povirk : shell32: Fix memory leak.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: wine Branch: master Commit: ee13e10cf6d05c7d08dfebb9f04c70eb3e7a0a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee13e10cf6d05c7d08dfebb9f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 21 11:02:14 2014 -0500 shell32: Fix memory leak. --- dlls/shell32/xdg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 70811f6..1504f1f 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -572,6 +572,7 @@ void XDG_FreeParsedFile(XDG_PARSED_FILE *parsed) SHFree(group); group = next; } + SHFree(parsed->contents); SHFree(parsed); }

1 0

Francois Gouget : testbot: Give a higher priority to wine-patches jobs than to the WineTest runs.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 7e7ae89a6d9cca635a9958c597ec27efe9b17db9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7e7ae89a6d9cca635a9958c5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:31:36 2014 +0200 testbot: Give a higher priority to wine-patches jobs than to the WineTest runs. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/Patches.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index e9f07ac..df3c63e 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -60,7 +60,7 @@ sub AddJob my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); - $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); + $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); $NewJob->Remarks("WineTest: " . ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . " VMs"); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a4aed22..70c47f7 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -192,7 +192,7 @@ sub Submit # Create a new job for this patch my $NewJob = $Jobs->Add(); $NewJob->User($User); - $NewJob->Priority(9); + $NewJob->Priority(6); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); my $Subject = $self->Subject; $Subject =~ s/\[PATCH[^\]]*]//i;

1 0