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

Francois Gouget : testbot: Add prototypes to the Perl utility functions.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 6518eb604c1b118d523b22cc649d8b82cff06f5f URL: http://source.winehq.org/git/tools.git/?a=commit;h=6518eb604c1b118d523b22cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 19 00:05:52 2014 +0200 testbot: Add prototypes to the Perl utility functions. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. Also standardize the way we retrieve their arguments. --- testbot/lib/WineTestBot/Utils.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index acfabb5..1084abd 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,9 +33,9 @@ require Exporter; @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString &BuildEMailRecipient); -sub MakeSecureURL +sub MakeSecureURL($) { - my $URL = shift; + my ($URL) = @_; my $Protocol = "http"; if ($UseSSL || SecureConnection()) @@ -46,14 +46,14 @@ sub MakeSecureURL return $Protocol . "://" . $ENV{"HTTP_HOST"} . $URL; } -sub SecureConnection +sub SecureConnection() { return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } -sub GenerateRandomString +sub GenerateRandomString($) { - my $Len = $_[0]; + my ($Len) = @_; my $RandomString = ""; while (length($RandomString) < $Len) @@ -65,15 +65,15 @@ sub GenerateRandomString return substr($RandomString, 0, $Len); } -sub DateTimeToString +sub DateTimeToString($) { - my $Time = $_[0]; + my ($Time) = @_; # my ($Sec, $Min, $Hour, $MDay, $Mon, $Year, $WDay, $YDay, $IsDst) = localtime($Time); return strftime("%Y/%m/%d %H:%M:%S", localtime($Time)); } -sub BuildEMailRecipient +sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_;

1 0

Francois Gouget : testbot/Janitor: Check and clean up the staging directory.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: cc218ea2c267f2aee508b5d9ed26a9886b29302f URL: http://source.winehq.org/git/tools.git/?a=commit;h=cc218ea2c267f2aee508b5d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:21:36 2014 +0200 testbot/Janitor: Check and clean up the staging directory. Purge unsubmitted jobs (web/Submit.pl) as soon as they are a day old. There should be no file older than $JobPurgeDays. Report them so they are investigated and delete them after a 7 days grace period. Detect unknown files and report them so their source can be investigated. --- testbot/bin/Janitor.pl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index b195dff..24b2b28 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -214,3 +214,54 @@ if (%DeletedUsers or %DeletedVMs) } } } + +# Check the content of the staging directory +if (opendir(my $dh, "$DataDir/staging")) +{ + # We will be deleting files so read the directory in one go + my @Entries = readdir($dh); + close($dh); + foreach my $Entry (@Entries) + { + next if ($Entry eq "." or $Entry eq ".."); + $Entry =~ m%^([^/]+)$%; + my $FileName = "$DataDir/staging/$1"; + my $Age = int((-M $FileName) + 0.5); + + if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) + { + if ($Age >= 1 and !unlink $FileName) + { + # The user abandonned the submit procedure half-way + LogMsg "Could not delete '$FileName': $!\n" if (!unlink($FileName)); + } + } + else + { + if ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) + { + LogMsg "Found a suspicious staging file: $Entry\n"; + } + + if ($JobPurgeDays != 0) + { + if ($Age >= $JobPurgeDays + 7) + { + if ((-d $FileName and !rmtree($FileName)) or + !unlink($FileName)) + { + LogMsg "Could not delete '$FileName': $!\n"; + } + } + elsif ($Age > $JobPurgeDays) + { + LogMsg "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; + } + } + } + } +} +else +{ + LogMsg "0Unable to open '$DataDir/staging': $!"; +}

1 0

Francois Gouget : testbot/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 261fcf10d4d16b2c85ec5bb225733ef1b3ece485 URL: http://source.winehq.org/git/tools.git/?a=commit;h=261fcf10d4d16b2c85ec5bb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 17:44:59 2014 +0200 testbot/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments. Although Item::_initialize() is empty now, it is improper for subclasses to assume so and skip calling it or not pass it the right arguments. Similarly, although Item::InitializeNew() does not currently use its Collection argument, subclasses should not assume so. --- testbot/lib/ObjectModel/Collection.pm | 3 ++- testbot/lib/ObjectModel/Item.pm | 3 ++- testbot/lib/WineTestBot/Branches.pm | 4 ++-- testbot/lib/WineTestBot/CGI/Sessions.pm | 4 ++-- testbot/lib/WineTestBot/Jobs.pm | 8 ++++---- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 6 ++++-- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a356990..7dbcf63 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -102,7 +102,8 @@ sub new sub _initialize { - my ($self) = @_; + # $MasterObject may be required for some Collections. + my ($self, $MasterObject) = @_; $self->{AllScopeItems}->{ref($self)} ||= {}; } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 47aea03..0cc07ab 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -72,11 +72,12 @@ sub new sub _initialize { + #my ($self, $Collection) = @_; } sub InitializeNew { - my $self = shift; + my ($self, $_Collection) = @_; $self->{IsModified} = !1; } diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 0b37e89..f434569 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -35,10 +35,10 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->IsDefault(!1); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } package WineTestBot::Branches; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index a053036..3fbef8a 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -36,9 +36,9 @@ use vars qw(@ISA @EXPORT); sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); $self->Permanent(!1); } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4532d4e..60241e0 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -62,23 +62,23 @@ require Exporter; sub _initialize { - my $self = shift; + my ($self, $Collection) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Collection); $self->{OldStatus} = undef; } sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Archived(!1); $self->Branch(CreateBranches()->GetDefaultBranch()); $self->Status("queued"); $self->Submitted(time()); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } sub Status diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 70c47f7..bb7ea3f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -49,11 +49,11 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Received(time()); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } =pod diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index e937866..2a7ee35 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -53,7 +53,7 @@ sub InitializeNew $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } sub HandleStaging diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 8a29196..a5facda 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -120,7 +120,7 @@ sub _initialize my $self = shift; my $Job = $_[0]; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Job); foreach my $Step (@{$Job->Steps->GetItems()}) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index dd22749..02dd220 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -54,7 +54,7 @@ sub InitializeNew my $Keys = $Collection->GetKeys(); $self->No(scalar @$Keys + 1); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } =pod diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 46828a3..047e5d7 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -40,11 +40,11 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Status('active'); $self->Password("*"); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } sub GeneratePasswordHash diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 0aa06eb..e4a5a59 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -223,6 +223,8 @@ sub _initialize($$) { my ($self, $VMs) = @_; + $self->SUPER::_initialize($VMs); + $self->{Hypervisors} = $VMs->{Hypervisors}; $self->{Hypervisor} = undef; $self->{Domain} = undef; @@ -231,12 +233,12 @@ sub _initialize($$) sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Status("idle"); $self->IdleSnapshot("wtb"); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } sub GetHost($)

1 0

Francois Gouget : testbot/web: Make sure Page::_initialize() is always called, with the right arguments.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: df51375c707cd94119417f68e55cfe9b610ce21a URL: http://source.winehq.org/git/tools.git/?a=commit;h=df51375c707cd94119417f68… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 17:44:40 2014 +0200 testbot/web: Make sure Page::_initialize() is always called, with the right arguments. Although Page::_initialize() is empty now, it is improper for subclasses to assume so and skip calling it or not pass it the right arguments. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 ++--- testbot/lib/ObjectModel/CGI/ItemPage.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 5 +++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/web/Feedback.pl | 4 ++-- testbot/web/ForgotPassword.pl | 4 ++-- testbot/web/Login.pl | 4 ++-- testbot/web/Logout.pl | 4 +++- testbot/web/ResetPassword.pl | 4 ++-- testbot/web/Submit.pl | 4 ++-- testbot/web/index.pl | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c9dfb04..0bf8694 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -36,10 +36,9 @@ require Exporter; sub _initialize { - my $self = shift; - my $PropertyDescriptors = shift; + my ($self, $Request, $RequiredRole, $PropertyDescriptors) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Request, $RequiredRole); $self->{PropertyDescriptors} = $PropertyDescriptors; $self->{HasRequired} = !1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 16736fe..46925f3 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -42,7 +42,7 @@ sub _initialize $self->{Collection} = $Collection; - $self->SUPER::_initialize($Collection->GetPropertyDescriptors(), @_); + $self->SUPER::_initialize($Request, $RequiredRole, $Collection->GetPropertyDescriptors()); if (defined($self->GetParam("Key"))) { diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 331243c..8bbd1ae 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -37,7 +37,7 @@ require Exporter; sub new { my $class = shift; - my $Request = $_[0]; + my ($Request, $RequiredRole) = @_; my $self = {Request => $Request, CGIObj => CGI->new($Request), @@ -45,12 +45,13 @@ sub new ErrField => undef}; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); - $self->_initialize(@_); + $self->_initialize($Request, $RequiredRole); return $self; } sub _initialize { + #my ($self, $Request, $RequiredRole) = @_; } sub GetParam diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 7e12e80..7d75c5e 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -68,6 +68,7 @@ sub new sub _initialize { + #my ($self, $Page, $Request, $RequiredRole) = @_; } sub CheckSecurePage diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index c266ce4..b923c11 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -29,7 +29,7 @@ use WineTestBot::Config; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), @@ -37,7 +37,7 @@ sub _initialize CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "A", 1024), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); my $Session = $self->GetCurrentSession(); if (defined($Session)) diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index a22d441..dc35a2b 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -31,7 +31,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -39,7 +39,7 @@ sub _initialize CreateBasicPropertyDescriptor("Name", "Username or EMail", 1, 1, "A", 40), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 4002948..e6a4945 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -32,7 +32,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -42,7 +42,7 @@ sub _initialize CreateBasicPropertyDescriptor("AutoLogin", "Log me in automatically each visit", !1, !1, "B", 1), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 696bb95..24d3ac3 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -29,7 +29,9 @@ use CGI::Cookie; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; + + $self->SUPER::_initialize($Request, $RequiredRole); $self->{WasLoggedIn} = undef; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index dff05cf..73a7258 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -31,7 +31,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -42,7 +42,7 @@ sub _initialize CreateBasicPropertyDescriptor("Password2", "Password (repeat)", !1, 1, "A", 32), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 695ba76..03b9af2 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -39,7 +39,7 @@ use WineTestBot::VMs; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->{Page} = $self->GetParam("Page") || 1; @@ -62,7 +62,7 @@ sub _initialize $self->{ShowAll} = defined($self->GetParam("ShowAll")); } - $self->SUPER::_initialize(undef); + $self->SUPER::_initialize($Request, $RequiredRole, undef); } sub GetTitle diff --git a/testbot/web/index.pl b/testbot/web/index.pl index d0ba188..25f5e0e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -194,9 +194,9 @@ use WineTestBot::VMs; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Request, $RequiredRole); } sub OutputDot

1 0

Francois Gouget : testbot/web: Make it easier to identify Submit' s temporary staging files.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 79460be9dd65f78183c9291d574cac2313e798f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=79460be9dd65f78183c9291d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:21:15 2014 +0200 testbot/web: Make it easier to identify Submit's temporary staging files. It also ensures that GetTmpStagingFullPath() won't get a collision between the session id and the random part of an existing staging file, no matter what filename the user picks. Finally, this will make it possible to better check the content of the staging directory. --- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/web/Submit.pl | 38 ++++++++++++++++++-------------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0431bc0..e937866 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -67,7 +67,7 @@ sub HandleStaging } my $FileName = $self->FileName; - if ($FileName !~ m/^[0-9a-f]+_(.*)$/) + if ($FileName !~ m/^[0-9a-z-]+_(.*)$/) { return "Can't split staging filename"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 574c160..695ba76 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -24,6 +24,8 @@ use CGI qw(:standard); use Fcntl; use IO::Handle; use POSIX qw(:fcntl_h); +use File::Basename; + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Branches; @@ -430,17 +432,13 @@ sub GetPropertyValue return $self->SUPER::GetPropertyValue(@_); } -sub GetStagingFileName +sub GetTmpStagingFullPath { my $self = shift; my $FileName = $_[0]; - if (! $FileName) - { - return undef; - } - - return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "_$FileName"; + return undef if (!$FileName); + return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "-websubmit_$FileName"; } sub Validate @@ -666,7 +664,7 @@ sub OnPage1Next $self->{ErrMessage} = "File: Name is too long"; return !1; } - my $StagingFile = $self->GetStagingFileName($FileName); + my $StagingFile = $self->GetTmpStagingFullPath($FileName); my $OldUMask = umask(002); if (! open (OUTFILE,">$StagingFile")) { @@ -756,7 +754,7 @@ sub OnPage2Prev { my $self = shift; - my $StagingFileName = $self->GetStagingFileName($self->GetParam("FileName")); + my $StagingFileName = $self->GetTmpStagingFullPath($self->GetParam("FileName")); if ($StagingFileName) { unlink($StagingFileName); @@ -796,20 +794,20 @@ sub OnSubmit # IDs are known and it can be moved to the jobs directory tree. But rename # it so it does not get overwritten if the user submits another one before # the Engine gets around to doing so. + my $BaseName = $self->GetParam("FileName"); my $FileNameRandomPart = GenerateRandomString(32); - while (-e ("$DataDir/staging/${FileNameRandomPart}_" . - $self->GetParam("FileName"))) + while (-e "$DataDir/staging/${FileNameRandomPart}_$BaseName") { $FileNameRandomPart = GenerateRandomString(32); } - if (! rename("$DataDir/staging/" . $self->GetCurrentSession()->Id . "_" . - $self->GetParam("FileName"), - "$DataDir/staging/${FileNameRandomPart}_" . - $self->GetParam("FileName"))) + my $StagingFileName = "${FileNameRandomPart}_$BaseName"; + + my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); + if (!rename($TmpStagingFullPath, "$DataDir/staging/$StagingFileName")) { - # Can't give the file a unique name. Maybe we're lucky and using the - # session id works - $FileNameRandomPart = $self->GetCurrentSession()->Id; + # Use the existing staging file and hope for the best. + $self->{ErrMessage} = "Could not rename '$TmpStagingFullPath' to '$DataDir/staging/$StagingFileName': $!"; + $StagingFileName = basename($TmpStagingFullPath); } # See also Patches::Submit() in lib/WineTestBot/Patches.pm @@ -839,7 +837,7 @@ sub OnSubmit { # This is a patch so add a build step... my $BuildStep = $Steps->Add(); - $BuildStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); + $BuildStep->FileName($StagingFileName); $BuildStep->FileType($FileType); $BuildStep->InStaging(1); $BuildStep->Type("build"); @@ -888,7 +886,7 @@ sub OnSubmit } else { - $TestStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); + $TestStep->FileName($StagingFileName); $TestStep->InStaging(1); } $TestStep->FileType("exe$Bits");

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Improve error handling and plug staging file leaks.
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: ed692db13e0b97d4b535fadae700d51fe45aa695 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ed692db13e0b97d4b535fada… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 16:19:57 2014 +0200 testbot/CheckForWinetestUpdate: Improve error handling and plug staging file leaks. The leaks would happen whenever there was no non-base VM, no 64-bit VM, or CheckForWinetestUpdate would exit prematurely due to an error. Also let AddJob() handle the staging file. This greatly simplifies the calling code. Finally, fix the indentation in a couple of places. --- testbot/bin/CheckForWinetestUpdate.pl | 167 ++++++++++++++++++--------------- 1 file changed, 89 insertions(+), 78 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index df3c63e..4eb2555 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -44,6 +44,7 @@ use LWP::UserAgent; use HTTP::Request; use HTTP::Response; use HTTP::Status; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Users; @@ -52,9 +53,29 @@ use WineTestBot::Utils; use WineTestBot::VMs; use WineTestBot::Engine::Notify; + +my %WineTestUrls = ( + 32 => "http://test.winehq.org/builds/winetest-latest.exe", + 64 => "http://test.winehq.org/builds/winetest64-latest.exe" +); + + sub AddJob { - my ($BaseJob, $FileNameRandomPart, $Bits) = @_; + my ($BaseJob, $LatestBaseName, $Bits) = @_; + + # Create a copy in staging so it can then be moved into the job directory + my $FileNameRandomPart = GenerateRandomString(32); + while (-e "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName") + { + $FileNameRandomPart = GenerateRandomString(32); + } + my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName"; + if (!copy("$DataDir/latest/$LatestBaseName", $StagingFileName)) + { + LogMsg "Could not copy '$DataDir/latest/$LatestBaseName' to '$StagingFileName': $!\n"; + return 0; + } # First create a new job my $Jobs = CreateJobs(); @@ -62,7 +83,7 @@ sub AddJob $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); $NewJob->Remarks("WineTest: " . - ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . + ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other") . " VMs"); # Add a step to the job @@ -70,7 +91,7 @@ sub AddJob my $NewStep = $Steps->Add(); my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); - $NewStep->FileName("${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"); + $NewStep->FileName("${FileNameRandomPart}_$LatestBaseName"); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); $NewStep->InStaging(1); @@ -80,18 +101,18 @@ sub AddJob my $VMs = CreateVMs(); if ($Bits == 64) { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); } elsif ($BaseJob) { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); } else { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { @@ -102,15 +123,21 @@ sub AddJob } # Now save the whole thing - if ($HasTasks) + if (!$HasTasks) + { + unlink($StagingFileName); + return 1; + } + + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) { - (my $ErrKey, my $ErrProperty, my $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - LogMsg "Failed to save job: $ErrMessage\n"; - exit 1; - } + LogMsg "Failed to save job: $ErrMessage\n"; + unlink($StagingFileName); + return 0; } + + return 1; } sub AddReconfigJob @@ -141,22 +168,18 @@ sub AddReconfigJob # Now save the whole thing my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) + if (defined $ErrMessage) { LogMsg "Failed to save reconfig job: $ErrMessage\n"; - exit 1; + return 0; } } -my $WINETEST32_URL = "http://test.winehq.org/builds/winetest-latest.exe"; -my $WINETEST64_URL = "http://test.winehq.org/builds/winetest64-latest.exe"; - my $Bits = $ARGV[0]; -if (! $Bits) +if (!$Bits) { die "Usage: CheckForWinetestUpdate.pl <bits>"; } - if ($Bits =~ m/^(32|64)$/) { $Bits = $1; @@ -165,30 +188,14 @@ else { die "Invalid number of bits $Bits"; } - -my $WinetestUrl = ($Bits == 64 ? $WINETEST64_URL : $WINETEST32_URL); my $BitsSuffix = ($Bits == 64 ? "64" : ""); -umask 002; -mkdir "$DataDir/latest"; -mkdir "$DataDir/staging"; - -# Store the new WineTest executable in the staging directory: -# - So we can compare it to the reference one in the latest directory to -# check that it is truly new. -# - Because we don't know the relevant Job and Step IDs yet and thus cannot -# put it in the jobs directory tree. -my $FileNameRandomPart = GenerateRandomString(32); -while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") -{ - $FileNameRandomPart = GenerateRandomString(32); -} -my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"; - +# Download the winetest executable if new my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); -my $Request = HTTP::Request->new(GET => $WinetestUrl); -my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; +my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); +my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; +my $LatestFileName = "$DataDir/latest/$LatestBaseName"; if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); @@ -202,60 +209,64 @@ if ($Response->code != RC_OK) LogMsg "Unexpected HTTP response code ", $Response->code, "\n"; exit 1; } - exit; + exit 0; } +# Store the new WineTest executable in the staging directory: +# - So we can compare it to the reference one in the latest directory to +# verify that it truly is new. +# - Because we don't know the relevant Job and Step IDs yet and thus cannot +# put it in the jobs directory tree. +umask 002; +mkdir "$DataDir/staging"; +my $FileNameRandomPart = GenerateRandomString(32); +while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") +{ + $FileNameRandomPart = GenerateRandomString(32); +} +my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"; + my $NewFile = 1; -if (! open STAGINGFILE, ">$StagingFileName") +if (open(my $fh, ">", $StagingFileName)) +{ + print $fh $Response->decoded_content(); + close($fh); +} +else { - LogMsg "Can't create staging file $StagingFileName: $!\n"; + LogMsg "Could not create staging file '$StagingFileName': $!\n"; exit 1; } -print STAGINGFILE $Response->decoded_content(); -close STAGINGFILE; if (-r $LatestFileName) { $NewFile = compare($StagingFileName, $LatestFileName) != 0; } -if (! $NewFile) +if (!$NewFile) { - unlink $StagingFileName; - exit; + # Nothing to do + unlink($StagingFileName); + exit 0; } -if (! copy($StagingFileName, $LatestFileName)) + +# Save the WineTest executable in the latest directory for the next round +mkdir "$DataDir/latest"; +if (!move($StagingFileName, $LatestFileName)) { - LogMsg "Can't copy $StagingFileName to $LatestFileName: $!\n"; + LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; } utime time, $Response->last_modified, $LatestFileName; -if ($Bits == 32) -{ - AddReconfigJob(); - AddJob(1, $FileNameRandomPart, $Bits); +# A new executable means there have been commits so update Wine. Create this +# job first purely to make the WineTestBot job queue look nice, and arbitrarily +# do it only for 32-bit executables to avoid redundant updates. +my $rc = 0; +$rc = 1 if ($Bits == 32 and !AddReconfigJob()); - # Create another copy for the non-base VMs Job. - $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe") - { - $FileNameRandomPart = GenerateRandomString(32); - } - $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe"; - if (!copy($LatestFileName, $StagingFileName)) - { - LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n"; - } - else - { - AddJob(!1, $FileNameRandomPart, $Bits); - } -} -else -{ - AddJob(1, $FileNameRandomPart, $Bits); -} +$rc = 1 if (!AddJob(1, $LatestBaseName, $Bits)); +$rc = 1 if ($Bits == 32 and !AddJob(!1, $LatestBaseName, $Bits)); RescheduleJobs(); LogMsg "Submitted jobs\n"; -exit; +exit $rc;

1 0

Francois Gouget : testbot/RevertVM: Always pass the current VM to FatalError().
by Alexandre Julliard May 21, 2014

May 21, 2014

Module: tools Branch: master Commit: 650414651caddff186c348913ee228b8594abbe0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=650414651caddff186c34891… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 19 00:06:17 2014 +0200 testbot/RevertVM: Always pass the current VM to FatalError(). Without this argument it devolves to a two line LogMsg()+exit() combination. --- testbot/bin/RevertVM.pl | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 60a13f8..b2ae902 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -48,16 +48,14 @@ sub FatalError LogMsg $ErrMessage, "\n"; - if ($VM) - { - $VM->Status("offline"); - $VM->ChildPid(undef); - $VM->Save(); - - my $VMKey = $VM->GetKey(); - my $VMSnapshot = $VM->IdleSnapshot; - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; + $VM->Status("offline"); + $VM->ChildPid(undef); + $VM->Save(); + + my $VMKey = $VM->GetKey(); + my $VMSnapshot = $VM->IdleSnapshot; + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + print SENDMAIL <<"EOF"; From: $RobotEMail To: $AdminEMail Subject: VM $VMKey offline @@ -68,8 +66,7 @@ $ErrMessage The VM has been put offline. EOF - close(SENDMAIL); - } + close(SENDMAIL); exit 1; } @@ -86,7 +83,8 @@ if (! $VMKey) my $VM = CreateVMs()->GetItem($VMKey); if (! defined($VM)) { - FatalError "VM $VMKey doesn't exist"; + LogMsg "VM $VMKey doesn't exist\n"; + exit 1; } LogMsg "Reverting $VMKey to ", $VM->IdleSnapshot, "\n"; @@ -146,4 +144,4 @@ if (defined($ErrMessage)) LogMsg "Revert of $VMKey completed\n"; -exit; +exit 0;

1 0

Nikolay Sivov : xmllite/writer: Implement OmitXmlDeclaration property.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 9a2177ff538977d046fd998de03f1188b8669145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2177ff538977d046fd998de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 00:27:16 2014 +0400 xmllite/writer: Implement OmitXmlDeclaration property. --- dlls/xmllite/tests/writer.c | 94 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 20 +++++++-- 2 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index d7cfe44..d617c43 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -312,6 +312,99 @@ static void test_flush(void) ok(g_write_len == 0, "got %d\n", g_write_len); } +static void test_omitxmldeclaration(void) +{ + static const char prologversion[] = "<?xml version=\"1.0\"?>"; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriter *writer; + HGLOBAL hglobal; + IStream *stream; + HRESULT hr; + char *ptr; + + 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_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + 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, "got %p\n", ptr); + GlobalUnlock(hglobal); + + /* one more time */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + IStream_Release(stream); + + /* now add PI manually, and try to start a document */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + 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, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + 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, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + /* another attempt to add 'xml' PI */ + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IXmlWriter_Release(writer); +} + START_TEST(writer) { if (!init_pointers()) @@ -321,4 +414,5 @@ START_TEST(writer) test_writeroutput(); test_writestartdocument(); test_flush(); + test_omitxmldeclaration(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index de5f755..d1834b8 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -392,13 +392,23 @@ static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LO return S_OK; } -static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue) +static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LONG_PTR value) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %u %lu\n", This, nProperty, pValue); + TRACE("(%p)->(%s %lu)\n", This, debugstr_writer_prop(property), value); - return E_NOTIMPL; + switch (property) + { + case XmlWriterProperty_OmitXmlDeclaration: + This->omitxmldecl = !!value; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *pReader, @@ -625,6 +635,9 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal ; } + This->state = XmlWriterState_DocStarted; + if (This->omitxmldecl) return S_OK; + /* version */ write_output_buffer(This->output, versionW, sizeof(versionW)/sizeof(WCHAR)); @@ -647,7 +660,6 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal write_output_buffer(This->output, noW, sizeof(noW)/sizeof(WCHAR)); } - This->state = XmlWriterState_DocStarted; return S_OK; }

1 0

Nikolay Sivov : netprofm: Added IConnectionPointContainer stub for INetworkListManager.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: e0e0af801eca60690aeb280de4fe53287822e18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e0af801eca60690aeb280de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 19 18:51:15 2014 +0400 netprofm: Added IConnectionPointContainer stub for INetworkListManager. --- dlls/netprofm/list.c | 59 +++++++++++++++++++++++++++++++++++++++++++- dlls/netprofm/tests/list.c | 6 +++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d5940f4..b9ab1cc 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" -#define COBJMACROS #include "initguid.h" #include "objbase.h" +#include "ocidl.h" #include "netlistmgr.h" #include "wine/debug.h" @@ -34,9 +36,15 @@ struct list_manager { INetworkListManager INetworkListManager_iface; INetworkCostManager INetworkCostManager_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG refs; }; +static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, struct list_manager, IConnectionPointContainer_iface); +} + static inline struct list_manager *impl_from_INetworkCostManager( INetworkCostManager *iface ) { @@ -147,6 +155,10 @@ static HRESULT WINAPI list_manager_QueryInterface( { *obj = &mgr->INetworkCostManager_iface; } + else if (IsEqualGUID( riid, &IID_IConnectionPointContainer )) + { + *obj = &mgr->IConnectionPointContainer_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -285,6 +297,50 @@ static const INetworkListManagerVtbl list_manager_vtbl = list_manager_GetConnectivity }; +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_QueryInterface(&This->INetworkListManager_iface, riid, ppv); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_AddRef(&This->INetworkListManager_iface); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_Release(&This->INetworkListManager_iface); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + FIXME("(%p)->(%p): stub\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **cp) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), cp); + return E_NOTIMPL; +} + +static const struct IConnectionPointContainerVtbl cpc_vtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + HRESULT list_manager_create( void **obj ) { struct list_manager *mgr; @@ -294,6 +350,7 @@ HRESULT list_manager_create( void **obj ) if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; + mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl; mgr->refs = 1; *obj = &mgr->INetworkListManager_iface; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 1619d06..ce4891a 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -21,11 +21,13 @@ #define COBJMACROS #include "initguid.h" #include "objbase.h" +#include "ocidl.h" #include "netlistmgr.h" #include "wine/test.h" static void test_INetworkListManager( void ) { + IConnectionPointContainer *cpc; INetworkListManager *mgr; INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; @@ -74,6 +76,10 @@ static void test_INetworkListManager( void ) INetworkCostManager_Release( cost_mgr ); } + hr = INetworkListManager_QueryInterface( mgr, &IID_IConnectionPointContainer, (void**)&cpc ); + ok( hr == S_OK, "got %08x\n", hr ); + IConnectionPointContainer_Release( cpc ); + INetworkListManager_Release( mgr ); }

1 0

Vincent Povirk : server: Clear the queue' s QS_SMRESULT bit when sending a new message.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 417585661c26af26bc3251cff8e628e04adbec80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=417585661c26af26bc3251cff… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 13 15:35:20 2014 -0500 server: Clear the queue's QS_SMRESULT bit when sending a new message. --- dlls/user32/tests/win.c | 2 +- server/queue.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a858f6b..cffceb3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7580,7 +7580,7 @@ static LRESULT WINAPI smresult_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARA /* Send another message while we have a reply queued for the current one. */ res = SendMessageA(data->thread_hwnd, WM_APP+2, 0, lparam); - todo_wine ok(res == 0x449b0190, "unexpected result %lx\n", res); + ok(res == 0x449b0190, "unexpected result %lx\n", res); return 0; } diff --git a/server/queue.c b/server/queue.c index 1954886..57603e1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -681,7 +681,11 @@ static struct message_result *alloc_message_result( struct msg_queue *send_queue result->callback_msg = callback_msg; list_add_head( &send_queue->callback_result, &result->sender_entry ); } - else if (send_queue) list_add_head( &send_queue->send_result, &result->sender_entry ); + else if (send_queue) + { + list_add_head( &send_queue->send_result, &result->sender_entry ); + clear_queue_bits( send_queue, QS_SMRESULT ); + } if (timeout != TIMEOUT_INFINITE) result->timeout = add_timeout_user( timeout, result_timeout, result ); @@ -2502,7 +2506,8 @@ DECL_HANDLER(get_message_reply) else { result = LIST_ENTRY( entry, struct message_result, sender_entry ); - if (!result->replied) clear_queue_bits( queue, QS_SMRESULT ); + if (result->replied) set_queue_bits( queue, QS_SMRESULT ); + else clear_queue_bits( queue, QS_SMRESULT ); } } }

1 0

Marcus Meissner : msxml3: Removed unused allocation (Coverity).
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 2c984fc8e2400d6cbe01f720fdf9df9d284669c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c984fc8e2400d6cbe01f720f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 20 08:47:41 2014 +0200 msxml3: Removed unused allocation (Coverity). --- dlls/msxml3/tests/domdoc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2b877a7..881679e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3046,8 +3046,6 @@ static void test_getElementsByTagName(void) ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); - str = SysAllocString( szstar ); - /* null arguments cases */ r = IXMLDOMDocument_getElementsByTagName(doc, NULL, &node_list); ok( r == E_INVALIDARG, "ret %08x\n", r );

1 0

Henri Verbeet : wined3d: Recognize the SM4 discard opcode.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: c81d3b7336e12e0f7031051097e972f5157c4972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81d3b7336e12e0f703105109… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:45 2014 +0200 wined3d: Recognize the SM4 discard opcode. --- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader_sm4.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d0f2b71..bce0097 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4073,6 +4073,8 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); if (ins->ctx->reg_maps->shader_version.major >= 2) { + if (ins->ctx->reg_maps->shader_version.major >= 4) + FIXME("SM4 discard not implemented.\n"); /* 2.0 shaders compare all 4 components in texkill */ shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyzw, vec4(0.0)))) discard;\n", dst_param.reg_name); } else { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9a6131f..b001aad 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -78,6 +78,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DERIV_RTX = 0x0b, WINED3D_SM4_OP_DERIV_RTY = 0x0c, + WINED3D_SM4_OP_DISCARD = 0x0d, WINED3D_SM4_OP_DIV = 0x0e, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, @@ -212,6 +213,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "F", "F"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "F", "F"}, + {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "U"}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "F", "FF"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "F", "FF"}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, "F", "FF"},

1 0

Nikolay Sivov : xmllite/writer: Implement ByteOrderMark property.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 086a1e370906b5cbb5df59edf96019bacd602ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a1e370906b5cbb5df59edf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 01:37:14 2014 +0400 xmllite/writer: Implement ByteOrderMark property. --- dlls/xmllite/tests/writer.c | 73 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 28 +++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index d617c43..6800cd2 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -405,6 +405,78 @@ static void test_omitxmldeclaration(void) IXmlWriter_Release(writer); } +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}; + IXmlWriterOutput *output; + unsigned 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 = pCreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + ok(hr == S_OK, "got %08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* BOM is on by default */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + 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); + + IStream_Release(stream); + IUnknown_Release(output); + + /* start with PI */ + 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_WriteProcessingInstruction(writer, xmlW, versionW); + 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); + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { if (!init_pointers()) @@ -415,4 +487,5 @@ START_TEST(writer) test_writestartdocument(); test_flush(); test_omitxmldeclaration(); + test_bom(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index d1834b8..a1f409c 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -78,6 +78,7 @@ typedef struct _xmlwriter BOOL omitxmldecl; XmlConformanceLevel conformance; XmlWriterState state; + BOOL bomwritten; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -272,6 +273,26 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) return S_OK; } +static HRESULT write_encoding_bom(xmlwriter *writer) +{ + if (!writer->bom || writer->bomwritten) return S_OK; + + if (writer->output->encoding == XmlEncoding_UTF16) { + static const char utf16bom[] = {0xff, 0xfe}; + struct output_buffer *buffer = &writer->output->buffer; + int len = sizeof(utf16bom); + HRESULT hr; + + hr = grow_output_buffer(writer->output, len); + if (FAILED(hr)) return hr; + memcpy(buffer->data + buffer->written, utf16bom, len); + buffer->written += len; + } + + writer->bomwritten = TRUE; + return S_OK; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -329,6 +350,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; + This->bomwritten = FALSE; } /* just reset current output */ @@ -400,6 +422,9 @@ static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LO switch (property) { + case XmlWriterProperty_ByteOrderMark: + This->bom = !!value; + break; case XmlWriterProperty_OmitXmlDeclaration: This->omitxmldecl = !!value; break; @@ -574,6 +599,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP if (This->state == XmlWriterState_DocStarted && !strcmpW(name, xmlW)) return WR_E_INVALIDACTION; + write_encoding_bom(This); write_output_buffer(This->output, openpiW, sizeof(openpiW)/sizeof(WCHAR)); write_output_buffer(This->output, name, -1); write_output_buffer(This->output, spaceW, 1); @@ -635,6 +661,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal ; } + write_encoding_bom(This); This->state = XmlWriterState_DocStarted; if (This->omitxmldecl) return S_OK; @@ -833,6 +860,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->omitxmldecl = FALSE; writer->conformance = XmlConformanceLevel_Document; writer->state = XmlWriterState_Initial; + writer->bomwritten = FALSE; *obj = &writer->IXmlWriter_iface;

1 0

Jacek Caban : urlmon: Fixed some occasionally failing tests.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 1687c5cd3a02adaed341de3d0d1812c38391c28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1687c5cd3a02adaed341de3d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 20 15:11:03 2014 +0200 urlmon: Fixed some occasionally failing tests. --- dlls/urlmon/tests/url.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 8460000..5861127 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2810,6 +2810,7 @@ static BOOL test_RegisterBindStatusCallback(void) #define BINDTEST_ABORT_START 0x0400 #define BINDTEST_ABORT_PROGRESS 0x0800 #define BINDTEST_ASYNC_SWITCH 0x1000 +#define BINDTEST_ALLOW_FINDINGRESOURCE 0x2000 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2885,9 +2886,11 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) MSG msg; IBindStatusCallback *previousclb; IUnknown *unk = (IUnknown*)0x00ff00ff; + BOOL allow_finding_resource; IBinding *bind; init_bind_test(protocol, flags, t); + allow_finding_resource = (flags & BINDTEST_ALLOW_FINDINGRESOURCE) != 0; if(no_callback) { hres = CreateBindCtx(0, &bctx); @@ -2967,7 +2970,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); - if(http_is_first) + if(http_is_first || allow_finding_resource) SET_EXPECT(OnProgress_FINDINGRESOURCE); SET_EXPECT(OnProgress_CONNECTING); } @@ -3125,6 +3128,8 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CLEAR_CALLED(OnProgress_CONNECTING); } }else if(!abort_start) { + if(allow_finding_resource) + CLEAR_CALLED(OnProgress_FINDINGRESOURCE); /* IE7 does call this */ CLEAR_CALLED(OnProgress_CONNECTING); } @@ -3951,7 +3956,7 @@ START_TEST(url) test_BindToObject(HTTP_TEST, 0, S_OK); trace("http test (short response)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_ISTREAM); trace("http test (short response, to object)...\n"); test_BindToObject(HTTP_TEST, 0, S_OK); @@ -3965,7 +3970,7 @@ START_TEST(url) test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE); trace("http test (abort progress)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_FILE); trace("emulated http test...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM);

1 0

Hans Leidekker : wbemprox: Add a partial implementation of CIM_Processor.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: a6374aad413a0e68b5c4b1fb2f2baee532da6fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6374aad413a0e68b5c4b1fb2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 20 15:33:13 2014 +0200 wbemprox: Add a partial implementation of CIM_Processor. --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1ca4137..ea54213 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -84,6 +84,8 @@ static const WCHAR class_process_getowner_outW[] = 'N','E','R','_','O','U','T',0}; static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_processor2W[] = + {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_videocontrollerW[] = @@ -2408,6 +2410,7 @@ static struct table builtin_classes[] = { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, + { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier }, { class_serviceW, SIZEOF(col_service), col_service, 0, 0, NULL, fill_service }, { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice },

1 0

Nikolay Sivov : scrrun: Return float type size when signed I4 limit exceeded.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: f82cb7003338f4614582d429fc68cc1a2ad87bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82cb7003338f4614582d429f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 20 15:17:24 2014 +0400 scrrun: Return float type size when signed I4 limit exceeded. --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 9412491..6473210 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) + if (src->HighPart || src->LowPart > INT_MAX) { V_VT(v) = VT_R8; hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 61cadb9..c06b43d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <stdio.h> +#include <limits.h> #include "windows.h" #include "ole2.h" @@ -1296,7 +1297,7 @@ static void test_DriveCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); if (V_VT(&size) == VT_R8) - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_R8(&size) > (double)INT_MAX, "got %f\n", V_R8(&size)); else ok(V_I4(&size) > 0, "got %d\n", V_I4(&size));

1 0

Piotr Caban : msvcp100: Export basic_istream::gcount function.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 48c9a90a81b44a7c158b2857488eea9870332cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c9a90a81b44a7c158b28574… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 20 10:46:51 2014 +0200 msvcp100: Export basic_istream::gcount function. --- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp110/msvcp110.spec | 12 ++++++------ dlls/msvcp90/ios.c | 10 ++++++++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 1dcbded..ab0b1d0 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1736,11 +1736,11 @@ @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=win32 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump -@ stub -arch=win32 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ stub -arch=win32 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ stub -arch=win32 ?generic_category(a)std@@YAABVerror_category(a)1@XZ @ stub -arch=win64 ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0527936..40f5577 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2433,14 +2433,14 @@ @ cdecl -arch=arm ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=i386 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump -@ stub -arch=arm ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ(ptr) basic_istream_char_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ stub -arch=arm ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=arm ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=arm ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch @ thiscall -arch=i386 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e8d4b06..d8f1e1c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7785,8 +7785,10 @@ static void basic_istream_char_sentry_destroy(basic_istream_char *istr) /* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ */ +/* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_char_gcount, 4) -int __thiscall basic_istream_char_gcount(const basic_istream_char *this) +streamsize __thiscall basic_istream_char_gcount(const basic_istream_char *this) { TRACE("(%p)\n", this); return this->count; @@ -9066,8 +9068,12 @@ static void basic_istream_wchar_sentry_destroy(basic_istream_wchar *istr) /* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ */ /* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ */ +/* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ */ +/* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_gcount, 4) -int __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) +streamsize __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) { TRACE("(%p)\n", this); return this->count;

1 0

Marcus Meissner : jsproxy: Avoid potential NULL dereference (Coverity).
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 0dda8a14db8d83505670f1375966d35ed3c05ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dda8a14db8d83505670f1375… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 20 08:47:38 2014 +0200 jsproxy: Avoid potential NULL dereference (Coverity). --- dlls/jsproxy/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 4d02b07..0399173 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -103,8 +103,11 @@ static inline WCHAR *strdupAW( const char *src, DWORD len ) if (src) { int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); - if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); - dst[dst_len] = 0; + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) + { + len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } } return dst; }

1 0

Henri Verbeet : wined3d: Recognize the SM4 dp2 opcode.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 3555eab8b9d18059ce0cb37b2595460164b4c1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3555eab8b9d18059ce0cb37b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:46 2014 +0200 wined3d: Recognize the SM4 dp2 opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 195c3ae..ecbaec6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5191,6 +5191,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DEFB */ shader_hw_nop, /* WINED3DSIH_DEFI */ shader_hw_nop, /* WINED3DSIH_DIV */ NULL, + /* WINED3DSIH_DP2 */ NULL, /* WINED3DSIH_DP2ADD */ pshader_hw_dp2add, /* WINED3DSIH_DP3 */ shader_hw_map2gl, /* WINED3DSIH_DP4 */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bce0097..84b638e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6650,6 +6650,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, /* WINED3DSIH_DIV */ shader_glsl_binop, + /* WINED3DSIH_DP2 */ shader_glsl_dot, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, /* WINED3DSIH_DP4 */ shader_glsl_dot, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a9b3d9f..05e7168 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -62,6 +62,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DEFB */ "defb", /* WINED3DSIH_DEFI */ "defi", /* WINED3DSIH_DIV */ "div", + /* WINED3DSIH_DP2 */ "dp2", /* WINED3DSIH_DP2ADD */ "dp2add", /* WINED3DSIH_DP3 */ "dp3", /* WINED3DSIH_DP4 */ "dp4", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b001aad..f01463b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -80,6 +80,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DERIV_RTY = 0x0c, WINED3D_SM4_OP_DISCARD = 0x0d, WINED3D_SM4_OP_DIV = 0x0e, + WINED3D_SM4_OP_DP2 = 0x0f, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EMIT = 0x13, @@ -215,6 +216,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "F", "F"}, {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "U"}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "F", "FF"}, + {WINED3D_SM4_OP_DP2, WINED3DSIH_DP2, "F", "FF"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "F", "FF"}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, "F", "FF"}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9233148..6e6534f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -446,6 +446,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DEFB, WINED3DSIH_DEFI, WINED3DSIH_DIV, + WINED3DSIH_DP2, WINED3DSIH_DP2ADD, WINED3DSIH_DP3, WINED3DSIH_DP4,

1 0

Andrew Eikum : riched20/tests: Allow conversions to non-English codepages.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 704d1695f3d0b14e8eee9a5f786dfce55589ecb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704d1695f3d0b14e8eee9a5f7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 20 14:09:45 2014 -0500 riched20/tests: Allow conversions to non-English codepages. --- dlls/riched20/tests/editor.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 309de7a..e14d7f6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5071,7 +5071,7 @@ static void test_EM_STREAMIN(void) DWORD phase; LRESULT result; EDITSTREAM es; - char buffer[1024] = {0}; + char buffer[1024] = {0}, tmp[16]; const char * streamText0 = "{\\rtf1 TestSomeText}"; const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; @@ -5100,6 +5100,9 @@ static void test_EM_STREAMIN(void) "This text just needs to be long enough to cause run to be split onto " "two separate lines and make sure the null terminating character is " "handled properly.\0"; + + const WCHAR UTF8Split_exp[4] = {0xd6, 0xcf, 0xcb, 0}; + int length4 = strlen(streamText4) + 1; struct StringWithLength cookieForStream4 = { length4, @@ -5217,10 +5220,12 @@ static void test_EM_STREAMIN(void) result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); ok(result == 8, "got %ld\n", result); + WideCharToMultiByte(CP_ACP, 0, UTF8Split_exp, -1, tmp, sizeof(tmp), NULL, NULL); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok(result == 3, "EM_STREAMIN: Test UTF8Split returned %ld\n", result); - result = memcmp (buffer,"\xd6\xcf\xcb", 3); + result = memcmp (buffer, tmp, 3); ok(result == 0, "EM_STREAMIN: Test UTF8Split set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8Split set error %d, expected %d\n", es.dwError, 0);

1 0

Henri Verbeet : wined3d: Recognize the SM4 ishl opcode.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 7b8aa8606cd4af99dbeae57584febf8559efb6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8aa8606cd4af99dbeae5758… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:47 2014 +0200 wined3d: Recognize the SM4 ishl opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecbaec6..5d23eed 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5215,6 +5215,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, /* WINED3DSIH_IMUL */ NULL, + /* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84b638e..e5eb685 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2335,6 +2335,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_AND: op = "&"; break; case WINED3DSIH_DIV: op = "/"; break; case WINED3DSIH_IADD: op = "+"; break; + case WINED3DSIH_ISHL: op = "<<"; break; case WINED3DSIH_MUL: op = "*"; break; case WINED3DSIH_SUB: op = "-"; break; case WINED3DSIH_USHR: op = ">>"; break; @@ -6674,6 +6675,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMUL */ shader_glsl_imul, + /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 05e7168..06ed09a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -86,6 +86,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", /* WINED3DSIH_IMUL */ "imul", + /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f01463b..f10969b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -96,6 +96,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_IMUL = 0x26, + WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, WINED3D_SM4_OP_LOG = 0x2f, @@ -232,6 +233,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, + {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "FR"}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e6534f..b3cb884 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -470,6 +470,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IFC, WINED3DSIH_IGE, WINED3DSIH_IMUL, + WINED3DSIH_ISHL, WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD,

1 0

Jacek Caban : ieframe: Added InternetExplore::get_HWND implementation.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 92841b3195276a12a320fa0b3dd854401cbef943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92841b3195276a12a320fa0b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 20 18:30:57 2014 +0200 ieframe: Added InternetExplore::get_HWND implementation. --- dlls/ieframe/ie.c | 7 +++++-- dlls/ieframe/tests/ie.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 454eb0f..5eb1d26 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -358,8 +358,11 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name) static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pHWND); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pHWND); + + *pHWND = (SHANDLE_PTR)This->frame_hwnd; + return S_OK; } static HRESULT WINAPI InternetExplorer_get_FullName(IWebBrowser2 *iface, BSTR *FullName) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index daf47f7..9ddd25c 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -205,6 +205,22 @@ static void test_html_window(IWebBrowser2 *wb) IHTMLWindow2_Release(html_window); } +static void test_window(IWebBrowser2 *wb) +{ + SHANDLE_PTR handle = 0; + HWND hwnd = NULL; + char buf[100]; + HRESULT hres; + + hres = IWebBrowser2_get_HWND(wb, &handle); + ok(hres == S_OK, "get_HWND faile: %08x\n", hres); + ok(handle, "handle == 0\n"); + + hwnd = (HWND)handle; + GetClassNameA(hwnd, buf, sizeof(buf)); + ok(!strcmp(buf, "IEFrame"), "Unexpected class name %s\n", buf); +} + static void test_navigate(IWebBrowser2 *wb, const char *url) { VARIANT urlv, emptyv; @@ -249,6 +265,7 @@ static void test_InternetExplorer(void) test_visible(wb); test_html_window(wb); + test_window(wb); test_navigate(wb, "http://test.winehq.org/tests/hello.html"); advise_cp(unk, FALSE);

1 0

Shuai Meng : vbscript: Implemented CCur.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 14f68a988bda797917f778a748ee8920531b734a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f68a988bda797917f778a74… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue May 20 09:05:07 2014 +0800 vbscript: Implemented CCur. --- dlls/vbscript/global.c | 21 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7c44661..f8c875d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -375,8 +375,25 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_CY); + if(FAILED(hres)) + return hres; + + if(!res) { + VariantClear(&v); + return DISP_E_BADVARTYPE; + } + + *res = v; + return S_OK; } static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d7af8e9..46c80d4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -587,4 +587,51 @@ MyObject.myval = 0 Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +Sub testCCurError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CCur(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CCur(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CCur(Empty) = 0, "CCur(Empty) = " & CCur(Empty)) +Call ok(getVT(CCur(Empty)) = "VT_CY", "getVT(CCur(Empty)) = " & getVT(CCur(Empty))) +Call ok(CCur(-32768) = -32768, "CCur(-32768) = " & CCur(-32768)) +Call ok(getVT(CCur(-32768)) = "VT_CY", "getVT(CCur(-32768)) = " & getVT(CCur(-32768))) +Call ok(CCur(32768) = 32768, "CCur(32768) = " & CCur(32768)) +Call ok(getVT(CCur(32768)) = "VT_CY", "getVT(CCur(32768)) = " & getVT(CCur(32768))) +Call ok(CCur(0.000149) = 0.0001, "CCur(0.000149) = " & CCur(0.000149)) +Call ok(getVT(CCur(0.000149)) = "VT_CY", "getVT(CCur(0.000149)) = " & getVT(CCur(0.000149))) +Call ok(CCur(2147483647.99) = 2147483647.99, "CCur(2147483647.99) = " & CCur(2147483647.99)) +Call ok(getVT(CCur(2147483647.99)) = "VT_CY", "getVT(CCur(2147483647.99)) = " & getVT(CCur(2147483647.99))) +Call ok(CCur("-1") = -1, "CCur(""-1"") = " & CCur("-1")) +Call ok(getVT(CCur("-1")) = "VT_CY", "getVT(CCur(""-1"")) = " & getVT(CCur("-1"))) +If isEnglishLang Then + Call ok(CCur("-0.5") = -0.5, "CCur(""-0.5"") = " & CCur("-0.5")) + Call ok(getVT(CCur("-0.5")) = "VT_CY", "getVT(CCur(""-0.5"")) = " & getVT(CCur("-0.5"))) +End If +Call testCCurError("", 13, 13) +Call testCCurError("-1", 0, 458) +Call testCCurError("TRUE", 13, 13) +Call testCCurError("FALSE", 13, 13) +Call testCCurError("#TRue#", 13, 13) +Call testCCurError("#fAlSE#", 13, 13) +Call testCCurError(1, 0, 458) +Call ok(CCur(True) = -1, "CCur(True) = " & CCur(True)) +Call ok(getVT(CCur(True)) = "VT_CY", "getVT(CCur(True)) = " & getVT(CCur(True))) +Call ok(CCur(False) = 0, "CCur(False) = " & CCur(False)) +Call ok(getVT(CCur(False)) = "VT_CY", "getVT(CCur(False)) = " & getVT(CCur(False))) +MyObject.myval = 0.1 +Call ok(CCur(MyObject) = 0.1, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +MyObject.myval = 0 +Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) +Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9620398..0188c12 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -169,6 +169,8 @@ static const char *vt2a(VARIANT *v) return "VT_I4"; case VT_R8: return "VT_R8"; + case VT_CY: + return "VT_CY"; case VT_DATE: return "VT_DATE"; case VT_BSTR:

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateDxgiSurfaceRenderTarget( ).
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 53d1bbf04186763d00cde8db65efa1f284b8c8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d1bbf04186763d00cde8db6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:44 2014 +0200 d2d1: Implement d2d_factory_CreateDxgiSurfaceRenderTarget(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 36 +++ dlls/d2d1/factory.c | 18 +- dlls/d2d1/render_target.c | 533 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 584 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d1bbf04186763d00cde…

1 0

Bruno Jesus : ws2_32: Avoid memory allocation for simple receives.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 1184fe90b2ba89c40a54ed93b8b991ab13796b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1184fe90b2ba89c40a54ed93b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 19 18:16:39 2014 -0300 ws2_32: Avoid memory allocation for simple receives. --- dlls/ws2_32/socket.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 04c715e..e31f396 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6531,8 +6531,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSABUF lpControlBuffer ) { unsigned int i, options; - int n, fd, err; - struct ws2_async *wsa; + int n, fd, err, overlapped; + struct ws2_async *wsa, localwsa; BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -6547,11 +6547,18 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (fd == -1) return SOCKET_ERROR; - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + overlapped = (lpOverlapped || lpCompletionRoutine) && + !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (overlapped || dwBufferCount > 1) { - err = WSAEFAULT; - goto error; + if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + { + err = WSAEFAULT; + goto error; + } } + else + wsa = &localwsa; wsa->hSocket = SOCKET2HANDLE(s); wsa->flags = *lpFlags; @@ -6588,8 +6595,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else if (lpNumberOfBytesRecvd) *lpNumberOfBytesRecvd = n; - if ((lpOverlapped || lpCompletionRoutine) && - !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (overlapped) { IO_STATUS_BLOCK *iosb = lpOverlapped ? (IO_STATUS_BLOCK *)lpOverlapped : &wsa->local_iosb; @@ -6673,14 +6679,14 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } TRACE(" -> %i bytes\n", n); - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); return 0; error: - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); WSASetLastError( err );

1 0

Bruno Jesus : ws2_32: Avoid memory allocation for simple sends.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 752219396d62b1f9613beef200b21e0ce8470e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=752219396d62b1f9613beef20… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 19 18:16:21 2014 -0300 ws2_32: Avoid memory allocation for simple sends. --- dlls/ws2_32/socket.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 88d3deb..04c715e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4517,10 +4517,9 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { unsigned int i, options; - int n, fd, err; - struct ws2_async *wsa = NULL; + int n, fd, err, overlapped; + struct ws2_async *wsa = NULL, localwsa; int totalLength = 0; - ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; DWORD bytes_sent; BOOL is_blocking; @@ -4538,11 +4537,19 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, err = WSAEFAULT; goto error; } - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + + overlapped = (lpOverlapped || lpCompletionRoutine) && + !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (overlapped || dwBufferCount > 1) { - err = WSAEFAULT; - goto error; + if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + { + err = WSAEFAULT; + goto error; + } } + else + wsa = &localwsa; wsa->hSocket = SOCKET2HANDLE(s); wsa->addr = (struct WS_sockaddr *)to; @@ -4566,10 +4573,10 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto error; } - if ((lpOverlapped || lpCompletionRoutine) && - !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (overlapped) { IO_STATUS_BLOCK *iosb = lpOverlapped ? (IO_STATUS_BLOCK *)lpOverlapped : &wsa->local_iosb; + ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; wsa->user_overlapped = lpOverlapped; wsa->completion_func = lpCompletionRoutine; @@ -4677,13 +4684,13 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, TRACE(" -> %i bytes\n", bytes_sent); if (lpNumberOfBytesSent) *lpNumberOfBytesSent = bytes_sent; - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WSASetLastError(0); return 0; error: - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); WSASetLastError(err);

1 0

Henri Verbeet : d2d1: Implement D2D1CreateFactory().
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 089832e6d5450b86fea87e043ba0bebf763bac6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=089832e6d5450b86fea87e043… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:43 2014 +0200 d2d1: Implement D2D1CreateFactory(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/factory.c | 248 +++++++++++++++++++++++++++++++++ dlls/uuid/Makefile.in | 1 + dlls/{d2d1/d2d1_main.c => uuid/d2d.c} | 19 +-- 4 files changed, 253 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=089832e6d5450b86fea87…

1 0

Andrew Eikum : user32: Remove unused internal menu messages.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: d7f827254e7eebf1dfd505d5c41701e22e3a2fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f827254e7eebf1dfd505d5c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 16 10:50:13 2014 -0500 user32: Remove unused internal menu messages. --- dlls/user32/menu.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab3f73b..0aa7744 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -62,11 +62,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(menu); WINE_DECLARE_DEBUG_CHANNEL(accel); -/* internal popup menu window messages */ - -#define MM_SETMENUHANDLE (WM_USER + 0) -#define MM_GETMENUHANDLE (WM_USER + 1) - /* Menu item structure */ typedef struct { /* ----------- MENUITEMINFO Stuff ----------- */ @@ -127,8 +122,6 @@ typedef struct POINT pt; } MTRACKER; -#define MENU_MAGIC 0x554d /* 'MU' */ - #define ITEM_PREV -1 #define ITEM_NEXT 1 @@ -3567,11 +3560,6 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM SetWindowLongPtrW( hwnd, 0, 0 ); break; - case MM_SETMENUHANDLE: - SetWindowLongPtrW( hwnd, 0, wParam ); - break; - - case MM_GETMENUHANDLE: case MN_GETHMENU: return GetWindowLongPtrW( hwnd, 0 );

1 0

Piotr Caban : vbscript: Support multibyte characters in Global_Chr.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 193de805a1e0ed291d721ad13a5c8cd8494aac4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=193de805a1e0ed291d721ad13… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 19 16:44:02 2014 +0200 vbscript: Support multibyte characters in Global_Chr. --- dlls/vbscript/global.c | 26 ++++++++++++++++++++++---- dlls/vbscript/tests/api.vbs | 14 ++++++++++++-- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 484158f..7c44661 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1129,9 +1129,15 @@ static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA return E_NOTIMPL; } +/* The function supports only single-byte and double-byte character sets. It + * ignores language specified by IActiveScriptSite::GetLCID. The argument needs + * to be in range of short or unsigned short. */ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int c; + int cp, c, len = 0; + CPINFO cpi; + WCHAR ch; + char buf[2]; HRESULT hres; TRACE("%s\n", debugstr_variant(arg)); @@ -1140,14 +1146,26 @@ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA if(FAILED(hres)) return hres; - if(c < 0 || c >= 0x100) { + cp = GetACP(); + if(!GetCPInfo(cp, &cpi)) + cpi.MaxCharSize = 1; + + if((c!=(short)c && c!=(unsigned short)c) || + (unsigned short)c>=(cpi.MaxCharSize>1 ? 0x10000 : 0x100)) { WARN("invalid arg %d\n", c); return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); } - if(res) { - WCHAR ch = c; + if(c>>8) + buf[len++] = c>>8; + if(!len || IsDBCSLeadByteEx(cp, buf[0])) + buf[len++] = c; + if(!MultiByteToWideChar(0, 0, buf, len, &ch, 1)) { + WARN("invalid arg %d, cp %d\n", c, cp); + return E_FAIL; + } + if(res) { V_VT(res) = VT_BSTR; V_BSTR(res) = SysAllocStringLen(&ch, 1); if(!V_BSTR(res)) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8197d6d..d7af8e9 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -140,12 +140,22 @@ Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) sub testChrError on error resume next + if isEnglishLang then + call Err.clear() + call Chr(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + + call Err.clear() + call Chr(256) + call ok(Err.number = 5, "Err.number = " & Err.number) + end if + call Err.clear() - call Chr(-1) + call Chr(65536) call ok(Err.number = 5, "Err.number = " & Err.number) call Err.clear() - call Chr(256) + call Chr(-32769) call ok(Err.number = 5, "Err.number = " & Err.number) end sub

1 0

Vincent Povirk : user32/tests: Add test for SendMessage race condition.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: abea10fa93351f6d3b4e5e0938b84059a429dfe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abea10fa93351f6d3b4e5e093… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 14 13:15:51 2014 -0500 user32/tests: Add test for SendMessage race condition. --- dlls/user32/tests/win.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index aba9359..a858f6b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7533,6 +7533,170 @@ static void test_window_without_child_style(void) DestroyWindow(hwnd); } + +struct smresult_thread_data +{ + HWND main_hwnd; + HWND thread_hwnd; + HANDLE thread_started; + HANDLE thread_got_wm_app; + HANDLE main_in_wm_app_1; + HANDLE thread_replied; +}; + + +static LRESULT WINAPI smresult_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_APP: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + + ok(hwnd == data->thread_hwnd, "unexpected hwnd %p\n", hwnd); + + SendNotifyMessageA(data->main_hwnd, WM_APP+1, 0, lparam); + + /* Don't return until the main thread is processing our sent message. */ + ok(WaitForSingleObject(data->main_in_wm_app_1, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + /* Break the PeekMessage loop so we can notify the main thread after we return. */ + SetEvent(data->thread_got_wm_app); + + return 0x240408ea; + } + case WM_APP+1: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + LRESULT res; + + ok(hwnd == data->main_hwnd, "unexpected hwnd %p\n", hwnd); + + /* Ask the thread to reply to our WM_APP message. */ + SetEvent(data->main_in_wm_app_1); + + /* Wait until the thread has sent a reply. */ + ok(WaitForSingleObject(data->thread_replied, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + /* Send another message while we have a reply queued for the current one. */ + res = SendMessageA(data->thread_hwnd, WM_APP+2, 0, lparam); + todo_wine ok(res == 0x449b0190, "unexpected result %lx\n", res); + + return 0; + } + case WM_APP+2: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + + ok(hwnd == data->thread_hwnd, "unexpected hwnd %p\n", hwnd); + + /* Don't return until we know the main thread is processing sent messages. */ + SendMessageA(data->main_hwnd, WM_NULL, 0, 0); + + return 0x449b0190; + } + case WM_CLOSE: + PostQuitMessage(0); + break; + } + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static DWORD WINAPI smresult_thread_proc(void *param) +{ + MSG msg; + struct smresult_thread_data *data = param; + + data->thread_hwnd = CreateWindowExA(0, "SmresultClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(data->thread_hwnd != 0, "Failed to create overlapped window\n"); + + SetEvent(data->thread_started); + + /* Loop until we've processed WM_APP. */ + while (WaitForSingleObject(data->thread_got_wm_app, 0) != WAIT_OBJECT_0) + { + if (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + else + { + MsgWaitForMultipleObjects(1, &data->thread_got_wm_app, FALSE, INFINITE, QS_SENDMESSAGE); + } + } + + /* Notify the main thread that we replied to its WM_APP message. */ + SetEvent(data->thread_replied); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + return 0; +} + +static void test_smresult(void) +{ + WNDCLASSA cls; + HANDLE hThread; + DWORD tid; + struct smresult_thread_data data; + BOOL ret; + LRESULT res; + + cls.style = CS_DBLCLKS; + cls.lpfnWndProc = smresult_wndproc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "SmresultClass"; + + ret = RegisterClassA(&cls); + ok(ret, "RegisterClassA failed\n"); + + data.thread_started = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_started != NULL, "CreateEventA failed\n"); + + data.thread_got_wm_app = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_got_wm_app != NULL, "CreateEventA failed\n"); + + data.main_in_wm_app_1 = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.main_in_wm_app_1 != NULL, "CreateEventA failed\n"); + + data.thread_replied = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_replied != NULL, "CreateEventA failed\n"); + + data.main_hwnd = CreateWindowExA(0, "SmresultClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + + hThread = CreateThread(NULL, 0, smresult_thread_proc, &data, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(data.thread_started, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + res = SendMessageA(data.thread_hwnd, WM_APP, 0, (LPARAM)&data); + ok(res == 0x240408ea, "unexpected result %lx\n", res); + + SendMessageA(data.thread_hwnd, WM_CLOSE, 0, 0); + + DestroyWindow(data.main_hwnd); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + CloseHandle(data.thread_started); + CloseHandle(data.thread_got_wm_app); + CloseHandle(data.main_in_wm_app_1); + CloseHandle(data.thread_replied); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -7664,6 +7828,7 @@ START_TEST(win) test_map_points(); test_update_region(); test_window_without_child_style(); + test_smresult(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Piotr Caban : msvcrt: Fix __libm_sse2_sqrt_precise implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 153965b627e2ea7a101b5fc1aa46a85478d0dbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=153965b627e2ea7a101b5fc1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 19 18:49:02 2014 +0200 msvcrt: Fix __libm_sse2_sqrt_precise implementation. --- dlls/msvcrt/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2c5a8f3..3a1aa1d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2191,9 +2191,9 @@ void __cdecl __libm_sse2_tanf(void) void __cdecl __libm_sse2_sqrt_precise(void) { double d; - __asm__ __volatile__( "movd %%xmm0,%0" : "=m" (d) ); + __asm__ __volatile__( "movq %%xmm0,%0" : "=m" (d) ); d = sqrt( d ); - __asm__ __volatile__( "movd %0,%%xmm0" : : "m" (d) ); + __asm__ __volatile__( "movq %0,%%xmm0" : : "m" (d) ); } #endif /* __i386__ */

1 0

Andrew Eikum : mmdevapi: Clock rate should be in bytes for shared mode.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 0e84a59d8946a362ad0d017c0d23d7cf62a0fc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e84a59d8946a362ad0d017c0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 19 08:59:26 2014 -0500 mmdevapi: Clock rate should be in bytes for shared mode. --- dlls/mmdevapi/tests/render.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 10 ++++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 8 +++++++- dlls/wineoss.drv/mmdevdrv.c | 8 +++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 3cadcee..91ed029 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -955,7 +955,7 @@ static void test_clock(int share) trace("Clock Frequency %u\n", (UINT)freq); /* MSDN says it's arbitrary units, but shared mode is unlikely to change */ - if (share) todo_wine + if (share) ok(freq == pwfx->nSamplesPerSec * pwfx->nBlockAlign, "Clock Frequency %u\n", (UINT)freq); else diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 30531a8..5e40d6e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2822,7 +2822,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - *freq = This->fmt->nSamplesPerSec; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + else + *freq = This->fmt->nSamplesPerSec; return S_OK; } @@ -2879,7 +2882,10 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, TRACE("frames written: %u, held: %u, avail: %ld, delay: %ld state %d, pos: %u\n", (UINT32)(written_frames%1000000000), held_frames, avail_frames, delay_frames, alsa_state, (UINT32)(position%1000000000)); - *pos = position; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *pos = position * This->fmt->nBlockAlign; + else + *pos = position; if(qpctime){ LARGE_INTEGER stamp, freq; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c181713..6603075 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2420,7 +2420,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - *freq = This->fmt->nSamplesPerSec; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + else + *freq = This->fmt->nSamplesPerSec; return S_OK; } @@ -2435,6 +2438,9 @@ static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, else *pos = This->inbuf_frames + This->written_frames; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= This->fmt->nBlockAlign; + if(qpctime){ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e11e6dc..dd45fba 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2145,7 +2145,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - *freq = This->fmt->nSamplesPerSec; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + else + *freq = This->fmt->nSamplesPerSec; return S_OK; } @@ -2195,6 +2198,9 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, This->last_pos_frames = *pos; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= This->fmt->nBlockAlign; + LeaveCriticalSection(&This->lock); if(qpctime){

1 0

Zhenbo Li : mshtml: Added IHTMLLinkElement::media property.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: e6f816c99b9f1aa2438a001ff4d52706a2eb354e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f816c99b9f1aa2438a001ff… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon May 19 21:45:05 2014 +0800 mshtml: Added IHTMLLinkElement::media property. --- dlls/mshtml/htmllink.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 79f0ca9..b5ae29a 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -286,15 +286,35 @@ static HRESULT WINAPI HTMLLinkElement_get_disabled(IHTMLLinkElement *iface, VARI static HRESULT WINAPI HTMLLinkElement_put_media(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsresult nsres; + nsAString str; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&str, v); + + nsres = nsIDOMHTMLLinkElement_SetMedia(This->nslink, &str); + nsAString_Finish(&str); + + if(NS_FAILED(nsres)) { + ERR("Set Media(%s) failed: %08x\n", debugstr_w(v), nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLLinkElement_get_media(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + nsAString str; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLLinkElement_GetMedia(This->nslink, &str); + + return return_nsstr(nsres, &str, p); } static const IHTMLLinkElementVtbl HTMLLinkElementVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0d6c3ac..cb1e7be 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3812,6 +3812,25 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval IHTMLMetaElement_Release(meta); } +#define test_link_media(a,b) _test_link_media(__LINE__,a,b) +static void _test_link_media(unsigned line, IHTMLElement *elem, const char *exval) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + HRESULT hres; + BSTR str; + + str = a2bstr(exval); + hres = IHTMLLinkElement_put_media(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_media(%s) failed: %08x\n", exval, hres); + SysFreeString(str); + + hres = IHTMLLinkElement_get_media(link, &str); + ok_(__FILE__,line)(hres == S_OK, "get_media failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exval), "got %s, expected %s\n", wine_dbgstr_w(str), exval); + SysFreeString(str); + IHTMLLinkElement_Release(link); +} + #define test_link_disabled(a,b) _test_link_disabled(__LINE__,a,b) static void _test_link_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v) { @@ -7182,6 +7201,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_link_rel(elem, "stylesheet"); test_link_type(elem, "text/css"); test_link_href(elem, "about:blank"); + test_link_media(elem, "all"); link_put_disabled(elem, VARIANT_TRUE); link_put_rel(elem, "prev"); link_put_type(elem, "text/plain");

1 0

Zhenbo Li : mshtml: Added nsIDOMHTMLTableCellElement declaration.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: efc6a564cdd6b0af6f7c63094d1a2f6d45dafa71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc6a564cdd6b0af6f7c63094… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 17 21:39:55 2014 +0800 mshtml: Added nsIDOMHTMLTableCellElement declaration. --- dlls/mshtml/htmltablecell.c | 10 ++++++++++ dlls/mshtml/nsiface.idl | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 7bfcf99..7b8d2fc 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -35,6 +36,8 @@ typedef struct { HTMLElement element; IHTMLTableCell IHTMLTableCell_iface; + + nsIDOMHTMLTableCellElement *nscell; } HTMLTableCell; static inline HTMLTableCell *impl_from_IHTMLTableCell(IHTMLTableCell *iface) @@ -362,6 +365,7 @@ static dispex_static_data_t HTMLTableCell_dispex = { HRESULT HTMLTableCell_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLTableCell *ret; + nsresult nsres; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) @@ -372,6 +376,12 @@ HRESULT HTMLTableCell_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, H HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableCell_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableCellElement, (void**)&ret->nscell); + + /* Share nscell reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nscell == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + *elem = &ret->element; return S_OK; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 9182c19..89a9740 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2072,6 +2072,44 @@ interface nsIDOMHTMLTableRowElement : nsIDOMHTMLElement [ object, + uuid(1fb22137-c231-4eae-9ca4-557bb0852d89), + local +] +interface nsIDOMHTMLTableCellElement : nsIDOMHTMLElement +{ + nsresult GetCellIndex(int32_t *aCellIndex); + nsresult GetAbbr(nsAString *aAbbr); + nsresult SetAbbr(const nsAString *aAbbr); + nsresult GetAlign(nsAString *aAlign); + nsresult SetAlign(const nsAString *aAlign); + nsresult GetAxis(nsAString *aAxis); + nsresult SetAxis(const nsAString *aAxis); + nsresult GetBgColor(nsAString *aBgColor); + nsresult SetBgColor(const nsAString *aBgColor); + nsresult GetCh(nsAString *aCh); + nsresult SetCh(const nsAString *aCh); + nsresult GetChOff(nsAString *aChOff); + nsresult SetChOff(const nsAString *aChOff); + nsresult GetColSpan(int32_t *aColSpan); + nsresult SetColSpan(int32_t aColSpan); + nsresult GetHeaders(nsAString *aHeaders); + nsresult SetHeaders(const nsAString *aHeaders); + nsresult GetHeight(nsAString *aHeight); + nsresult SetHeight(const nsAString *aHeight); + nsresult GetNoWrap(bool *aNoWrap); + nsresult SetNoWrap(bool aNoWrap); + nsresult GetRowSpan(int32_t *aRowSpan); + nsresult SetRowSpan(int32_t aRowSpan); + nsresult GetScope(nsAString *aScope); + nsresult SetScope(const nsAString *aScope); + nsresult GetVAlign(nsAString *aVAlign); + nsresult SetVAlign(const nsAString *aVAlign); + nsresult GetWidth(nsAString *aWidth); + nsresult SetWidth(const nsAString *aWidth); +} + +[ + object, uuid(21ffbe98-51f5-499e-8d6f-612ae798c1e1), local ]

1 0

Alexandre Julliard : vbscript: Avoid using bool keyword.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 534394dfa24449640c6d492d3d26826d7412c797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=534394dfa24449640c6d492d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 19 11:38:33 2014 +0200 vbscript: Avoid using bool keyword. --- dlls/vbscript/parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index c5d1c59..681a0c9 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -100,7 +100,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; case_clausule_t *case_clausule; unsigned uint; LONG lng; - BOOL bool; + BOOL boolean; double dbl; } @@ -129,7 +129,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt Step_opt ExpressionList -%type <bool> OptionExplicit_opt DoType +%type <boolean> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf

1 0

Hans Leidekker : wininet: Fix build on Mac OS X 10.5.8.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 654bef8f37e9049554a5cbe3bf335b599fd31a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654bef8f37e9049554a5cbe3b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 19 11:13:25 2014 +0200 wininet: Fix build on Mac OS X 10.5.8. --- dlls/wininet/internet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 8ea2803..4389c98 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2400,7 +2400,8 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) { -#ifdef HAVE_CORESERVICES_CORESERVICES_H +#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); const void *ref; BOOL ret = FALSE;

1 0

Nikolay Sivov : scrrun: Return disk space as VT_I4 if it fits.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 9d95788f121d58c7cde90da8e5debb0bd8ad8b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d95788f121d58c7cde90da8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 20:55:58 2014 +0400 scrrun: Return disk space as VT_I4 if it fits. --- dlls/scrrun/filesystem.c | 27 +++++++++++++++++++++------ dlls/scrrun/tests/filesystem.c | 14 ++++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f5afb91..9412491 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -888,6 +888,24 @@ static HRESULT WINAPI drive_get_RootFolder(IDrive *iface, IFolder **folder) return E_NOTIMPL; } +static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) +{ + HRESULT hr = S_OK; + + if (src->HighPart) + { + V_VT(v) = VT_R8; + hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); + } + else + { + V_VT(v) = VT_I4; + V_I4(v) = src->LowPart; + } + + return hr; +} + static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); @@ -901,8 +919,7 @@ static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, &avail, NULL, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(avail.QuadPart, &V_R8(v)); + return variant_from_largeint(&avail, v); } static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) @@ -918,8 +935,7 @@ static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, &freespace, NULL, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(freespace.QuadPart, &V_R8(v)); + return variant_from_largeint(&freespace, v); } static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) @@ -935,8 +951,7 @@ static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, NULL, &total, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(total.QuadPart, &V_R8(v)); + return variant_from_largeint(&total, v); } static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 531b732..61cadb9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1294,14 +1294,20 @@ static void test_DriveCollection(void) V_VT(&size) = VT_EMPTY; hr = IDrive_get_AvailableSpace(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_FreeSpace(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); } VariantClear(&var); }

1 0

Bruno Jesus : ws2_32: Take care of EINTR inside the helpers.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 25bc6de842dcc9870d2f1df721d30e73ddee478f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bc6de842dcc9870d2f1df72… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat May 17 17:42:11 2014 -0300 ws2_32: Take care of EINTR inside the helpers. --- dlls/ws2_32/socket.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5499753..88d3deb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1921,8 +1921,11 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) hdr.msg_flags = 0; #endif - if ( (n = recvmsg(fd, &hdr, wsa->flags)) == -1 ) - return -1; + while ((n = recvmsg(fd, &hdr, wsa->flags)) == -1) + { + if (errno != EINTR) + return -1; + } #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS if (wsa->control) @@ -1981,7 +1984,7 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat } else { - if (errno == EINTR || errno == EAGAIN) + if (errno == EAGAIN) { status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_READ, 0, 0 ); @@ -2172,17 +2175,19 @@ static int WS2_send( int fd, struct ws2_async *wsa ) hdr.msg_flags = 0; #endif - ret = sendmsg(fd, &hdr, wsa->flags); - if (ret >= 0) + while ((ret = sendmsg(fd, &hdr, wsa->flags)) == -1) { - n = ret; - while (wsa->first_iovec < wsa->n_iovecs && wsa->iovec[wsa->first_iovec].iov_len <= n) - n -= wsa->iovec[wsa->first_iovec++].iov_len; - if (wsa->first_iovec < wsa->n_iovecs) - { - wsa->iovec[wsa->first_iovec].iov_base = (char*)wsa->iovec[wsa->first_iovec].iov_base + n; - wsa->iovec[wsa->first_iovec].iov_len -= n; - } + if (errno != EINTR) + return -1; + } + + n = ret; + while (wsa->first_iovec < wsa->n_iovecs && wsa->iovec[wsa->first_iovec].iov_len <= n) + n -= wsa->iovec[wsa->first_iovec++].iov_len; + if (wsa->first_iovec < wsa->n_iovecs) + { + wsa->iovec[wsa->first_iovec].iov_base = (char*)wsa->iovec[wsa->first_iovec].iov_base + n; + wsa->iovec[wsa->first_iovec].iov_len -= n; } return ret; } @@ -2222,7 +2227,7 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu iosb->Information += result; } - else if (errno == EINTR || errno == EAGAIN) + else if (errno == EAGAIN) { status = STATUS_PENDING; } @@ -4554,11 +4559,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, totalLength += lpBuffers[i].len; } - for (;;) - { - n = WS2_send( fd, wsa ); - if (n != -1 || errno != EINTR) break; - } + n = WS2_send( fd, wsa ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -4651,7 +4652,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } n = WS2_send( fd, wsa ); - if (n == -1 && errno != EAGAIN && errno != EINTR) + if (n == -1 && errno != EAGAIN) { err = wsaErrno(); goto error; @@ -6570,7 +6571,6 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, n = WS2_recv( fd, wsa ); if (n == -1) { - if (errno == EINTR) continue; if (errno != EAGAIN) { int loc_errno = errno;

1 0

Hans Leidekker : winhttp: Fix build on Mac OS X 10.5.8.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 9a25a59dc25bca6060d3be89e5bfc57d117924de URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a25a59dc25bca6060d3be89e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 19 11:13:32 2014 +0200 winhttp: Fix build on Mac OS X 10.5.8. --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f2ed72b..56e776d 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1297,7 +1297,7 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen ) { -#ifdef HAVE_CORESERVICES_CORESERVICES_H +#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); const void *ref; BOOL ret = FALSE;

1 0

Daniel Beitler : msi: Prevent call to memset with a null pointer in get_tablecolumns function.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: deb274226783ab886bdb44876944e156757efe2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb274226783ab886bdb44876… Author: Daniel Beitler <dan(a)dablabs.com> Date: Sun May 18 13:27:42 2014 -0400 msi: Prevent call to memset with a null pointer in get_tablecolumns function. --- dlls/msi/table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 8012369..9ed9421 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -671,7 +671,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF /* Note: _Columns table doesn't have non-persistent data */ /* if maxcount is non-zero, assume it's exactly right for this table */ - memset( colinfo, 0, maxcount * sizeof(*colinfo) ); + if (colinfo) memset( colinfo, 0, maxcount * sizeof(*colinfo) ); count = table->row_count; for (i = 0; i < count; i++) { @@ -684,7 +684,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF /* check the column number is in range */ if (col < 1 || col > maxcount) { - ERR("column %d out of range\n", col); + ERR("column %d out of range (maxcount: %d)\n", col, maxcount); continue; } /* check if this column was already set */

1 0

Piotr Caban : vbscript: Parse doubles with bigger precision in parse_numeric_literal.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 7c7ccc0ef510af4a27144f28e96be63fbebb586e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7ccc0ef510af4a27144f28e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 17:22:37 2014 +0200 vbscript: Parse doubles with bigger precision in parse_numeric_literal. --- dlls/vbscript/lex.c | 43 ++++++++++++++++++++++++++++++++---------- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 65d2334..dc5a9fe 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include "vbscript.h" @@ -258,28 +261,48 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) { - double n = 0; + LONGLONG d = 0, hlp; + int exp = 0; if(*ctx->ptr == '0' && !('0' <= ctx->ptr[1] && ctx->ptr[1] <= '9') && ctx->ptr[1] != '.') return *ctx->ptr++; - do { - n = n*10 + *ctx->ptr++ - '0'; - }while('0' <= *ctx->ptr && *ctx->ptr <= '9'); + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>MAXLONGLONG/10 || hlp<0) { + exp++; + break; + } + else + d = hlp; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + exp++; + ctx->ptr++; + } if(*ctx->ptr != '.') { - if((LONG)n == n) { - LONG l = n; + if(!exp && (LONG)d == d) { + LONG l = d; *(LONG*)ret = l; return (short)l == l ? tShort : tLong; } }else { - double e = 1.0; - while('0' <= *++ctx->ptr && *ctx->ptr <= '9') - n += (e /= 10.0)*(*ctx->ptr-'0'); + ctx->ptr++; + + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>MAXLONGLONG/10 || hlp<0) + break; + + d = hlp; + exp--; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) + ctx->ptr++; } - *(double*)ret = n; + *(double*)ret = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); return tDouble; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c24ffa6..530c5dd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -187,6 +187,7 @@ Call ok(2*3 = 6, "2*3 = " & (2*3)) Call ok(3/2 = 1.5, "3/2 = " & (3/2)) Call ok(5\4/2 = 2, "5\4/2 = " & (5\2/1)) Call ok(12/3\2 = 2, "12/3\2 = " & (12/3\2)) +Call ok(5/1000000 = 0.000005, "5/1000000 = " & (5/1000000)) Call ok(2^3 = 8, "2^3 = " & (2^3)) Call ok(2^3^2 = 64, "2^3^2 = " & (2^3^2))

1 0

Andrew Eikum : mmdevapi: Make buffer size divisible by number of periods.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: b634666e130b93461076d1cded32d98752a67187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b634666e130b93461076d1cde… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 19 08:59:23 2014 -0500 mmdevapi: Make buffer size divisible by number of periods. --- dlls/mmdevapi/tests/render.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 2 ++ dlls/winecoreaudio.drv/mmdevdrv.c | 2 ++ dlls/wineoss.drv/mmdevdrv.c | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 078eab7..3cadcee 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -935,7 +935,7 @@ static void test_clock(int share) if (share) ok(gbsize == bufsize, "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); - else todo_wine + else ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3cfad3a..30531a8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1416,6 +1416,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, * ALSA period 220 vs. 221 frames in mmdevapi and * buffer 883 vs. 2205 frames in mmdevapi! */ This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) + This->bufsize_frames -= This->bufsize_frames % This->mmdev_period_frames; This->hidden_frames = This->alsa_period_frames + This->mmdev_period_frames + MulDiv(fmt->nSamplesPerSec, EXTRA_SAFE_RT, 10000000); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5e32229..c181713 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1235,6 +1235,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_frames = MulDiv(period, This->fmt->nSamplesPerSec, 10000000); This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) + This->bufsize_frames -= This->bufsize_frames % This->period_frames; if(This->dataflow == eCapture){ int i, nbuffs = (This->bufsize_frames / This->period_frames) + 1; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index eab4723..e11e6dc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1099,6 +1099,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_frames = MulDiv(fmt->nSamplesPerSec, period, 10000000); This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) + This->bufsize_frames -= This->bufsize_frames % This->period_frames; This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); if(!This->local_buffer){

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::deleteCell method implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: bff346836022eee669b6849c1c3298bfe70d3521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff346836022eee669b6849c1… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun May 18 16:24:23 2014 +0800 mshtml: Added IHTMLTableRow::deleteCell method implementation. --- dlls/mshtml/htmltablerow.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 331d6c9..731b403 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -315,8 +315,15 @@ static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%d)\n", This, index); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, index); + nsres = nsIDOMHTMLTableRowElement_DeleteCell(This->nsrow, index); + if(NS_FAILED(nsres)) { + ERR("Delete Cell failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static const IHTMLTableRowVtbl HTMLTableRowVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8af98dd..0d6c3ac 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -56,7 +56,7 @@ static const char elem_test_str[] = "<button id=\"btnid\"></button>" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" - "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" + "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td id=\"td1\">td1 text</td><td id=\"td2\">td2 text</td></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\">\n</script>" "<test /><object id=\"objid\" name=\"objname\" vspace=100></object><embed />" "<img id=\"imgid\" name=\"WineImg\"/>" @@ -5679,6 +5679,44 @@ static void test_button_elem(IHTMLElement *elem) set_button_name(elem, "button name"); } +#define test_tr_possess(e,r,l,i) _test_tr_possess(__LINE__,e,r,l,i) +static void _test_tr_possess(unsigned line, IHTMLElement *elem, + IHTMLTableRow *row, LONG len, const char *id) +{ + IHTMLElementCollection *col; + IDispatch *disp; + HRESULT hres; + LONG lval; + VARIANT var; + + hres = IHTMLTableRow_get_cells(row, &col); + ok_(__FILE__, line)(hres == S_OK, "get_cells failed: %08x\n", hres); + ok_(__FILE__, line)(col != NULL, "get_cells returned NULL\n"); + + hres = IHTMLElementCollection_get_length(col, &lval); + ok_(__FILE__, line)(hres == S_OK, "get length failed: %08x\n", hres); + ok_(__FILE__, line)(lval == len, "expected len = %d, got %d\n", len, lval); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = a2bstr(id); + hres = IHTMLElementCollection_tags(col, var, &disp); + ok_(__FILE__, line)(hres == S_OK, "search by tags(%s) failed: %08x\n", id, hres); + ok_(__FILE__, line)(disp != NULL, "disp == NULL\n"); + + VariantClear(&var); + IDispatch_Release(disp); + IHTMLElementCollection_Release(col); +} + +static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) +{ + HRESULT hres; + + hres = IHTMLTableRow_deleteCell(row, 0); + ok(hres == S_OK, "deleteCell failed: %08x\n", hres); + test_tr_possess(elem, row, 1, "td2"); +} + static void test_tr_elem(IHTMLElement *elem) { IHTMLElementCollection *col; @@ -5771,6 +5809,8 @@ static void test_tr_elem(IHTMLElement *elem) ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); + test_tr_modify(elem, row); + IHTMLTableRow_Release(row); }

1 0

Piotr Caban : msvcrt: Add _mbscpy_s implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 9f17544bc9109a992a7b4bdbb5477d210f508a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f17544bc9109a992a7b4bdbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 19 11:43:05 2014 +0200 msvcrt: Add _mbscpy_s implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/mbcs.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/string.c | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4d577e7..581ff17 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1101,8 +1101,8 @@ @ stub _mbscmp_l @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) -@ stub _mbscpy_s -@ stub _mbscpy_s_l +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b2141d6..9973aa0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1459,8 +1459,8 @@ @ stub _mbscmp_l @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) -@ stub _mbscpy_s -@ stub _mbscpy_s_l +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b510e76..c76465b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -773,8 +773,8 @@ @ stub _mbscmp_l @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) -@ stub _mbscpy_s -@ stub _mbscpy_s_l +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 345afe9..622b9f4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -751,8 +751,8 @@ @ stub _mbscmp_l @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) -@ stub _mbscpy_s -@ stub _mbscpy_s_l +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 3f4590e..d2c12d3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -712,6 +712,23 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha } /********************************************************************* + * _mbscpy_s_l(MSVCRT.@) + */ +int CDECL _mbscpy_s_l(unsigned char *dst, MSVCRT_size_t size, + const unsigned char *src, MSVCRT__locale_t locale) +{ + return _mbsnbcpy_s_l(dst, size, src, -1, locale); +} + +/********************************************************************* + * _mbscpy_s(MSVCRT.@) + */ +int CDECL _mbscpy_s(unsigned char *dst, MSVCRT_size_t size, const unsigned char *src) +{ + return _mbscpy_s_l(dst, size, src, NULL); +} + +/********************************************************************* * _mbsnbcpy(MSVCRT.@) * REMARKS * Like strncpy this function doesn't enforce the string to be diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 086bd82..cd7a39b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -722,8 +722,8 @@ @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy(ptr str) -# stub _mbscpy_s(ptr long str) -# stub _mbscpy_s_l(ptr long str ptr) +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) # stub _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 11b5f44..822c952 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -60,6 +60,7 @@ static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); +static int (__cdecl *p__mbscpy_s)(unsigned char*, size_t, const unsigned char*); static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); static int (__cdecl *p_wcsncpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc, size_t count); static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); @@ -774,6 +775,42 @@ static void test__mbsnbcpy_s(void) dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } +static void test__mbscpy_s(void) +{ + const unsigned char src[] = "source string"; + unsigned char dest[16]; + int ret; + + if(!p__mbscpy_s) + { + win_skip("_mbscpy_s not found\n"); + return; + } + + ret = p__mbscpy_s(NULL, 0, src); + ok(ret == EINVAL, "got %d\n", ret); + ret = p__mbscpy_s(NULL, sizeof(dest), src); + ok(ret == EINVAL, "got %d\n", ret); + ret = p__mbscpy_s(dest, 0, src); + ok(ret == EINVAL, "got %d\n", ret); + dest[0] = 'x'; + ret = p__mbscpy_s(dest, sizeof(dest), NULL); + ok(ret == EINVAL, "got %d\n", ret); + ok(!dest[0], "dest buffer was not modified on invalid argument\n"); + + memset(dest, 'X', sizeof(dest)); + ret = p__mbscpy_s(dest, sizeof(dest), src); + ok(!ret, "got %d\n", ret); + ok(!memcmp(dest, src, sizeof(src)), "dest = %s\n", dest); + ok(dest[sizeof(src)] == 'X', "unused part of buffer was modified\n"); + + memset(dest, 'X', sizeof(dest)); + ret = p__mbscpy_s(dest, 4, src); + ok(ret == ERANGE, "got %d\n", ret); + ok(!dest[0], "incorrect dest buffer (%d)\n", dest[0]); + ok(dest[1] == src[1], "incorrect dest buffer (%d)\n", dest[1]); +} + static void test_wcscpy_s(void) { static const WCHAR szLongText[] = { 'T','h','i','s','A','L','o','n','g','s','t','r','i','n','g',0 }; @@ -2632,6 +2669,7 @@ START_TEST(string) pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); + p__mbscpy_s = (void *)GetProcAddress( hMsvcrt,"_mbscpy_s" ); p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); p_wcsncpy_s = (void *)GetProcAddress( hMsvcrt,"wcsncpy_s" ); p_wcsncat_s = (void *)GetProcAddress( hMsvcrt,"wcsncat_s" ); @@ -2679,6 +2717,7 @@ START_TEST(string) test_memmove_s(); test_strcat_s(); test__mbsnbcpy_s(); + test__mbscpy_s(); test_mbcjisjms(); test_mbcjmsjis(); test_mbbtombc();

1 0

Piotr Caban : msvcrt: Add _mbsnbcpy_s_l implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: aebe1c69f9a7e41fbc005365737a00aaa238a332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebe1c69f9a7e41fbc0053657… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 19 11:42:58 2014 +0200 msvcrt: Add _mbsnbcpy_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 15 ++++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 07d50fc..4d577e7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1132,7 +1132,7 @@ @ cdecl _mbsnbcpy(ptr str long) @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -@ stub _mbsnbcpy_s_l +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e6576e0..b2141d6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1490,7 +1490,7 @@ @ cdecl _mbsnbcpy(ptr str long) @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -@ stub _mbsnbcpy_s_l +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9c7f85b..b510e76 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -804,7 +804,7 @@ @ cdecl _mbsnbcpy(ptr str long) @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -@ stub _mbsnbcpy_s_l +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e86541c..345afe9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -782,7 +782,7 @@ @ cdecl _mbsnbcpy(ptr str long) @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -@ stub _mbsnbcpy_s_l +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index dd14abd..3f4590e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -638,12 +638,13 @@ unsigned char* CDECL _mbsncpy(unsigned char* dst, const unsigned char* src, MSVC } /********************************************************************* - * _mbsnbcpy_s(MSVCRT.@) + * _mbsnbcpy_s_l(MSVCRT.@) * REMARKS * Unlike _mbsnbcpy this function does not pad the rest of the dest * string with 0 */ -int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned char* src, MSVCRT_size_t n) +int CDECL _mbsnbcpy_s_l(unsigned char* dst, MSVCRT_size_t size, + const unsigned char* src, MSVCRT_size_t n, MSVCRT__locale_t locale) { MSVCRT_size_t pos = 0; @@ -657,7 +658,7 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha if(!n) return 0; - if(get_mbcinfo()->ismbcodepage) + if((locale ? locale->mbcinfo : get_mbcinfo())->ismbcodepage) { int is_lead = 0; while (*src && n) @@ -703,6 +704,14 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha } /********************************************************************* + * _mbsnbcpy_s(MSVCRT.@) + */ +int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned char* src, MSVCRT_size_t n) +{ + return _mbsnbcpy_s_l(dst, size, src, n, NULL); +} + +/********************************************************************* * _mbsnbcpy(MSVCRT.@) * REMARKS * Like strncpy this function doesn't enforce the string to be diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a7d1a97..086bd82 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -755,7 +755,7 @@ @ cdecl _mbsnbcpy(ptr str long) # stub _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) -# stub _mbsnbcpy_s_l(ptr long str long ptr) +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) # stub _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long)

1 0

Henri Verbeet : wined3d: Increase the SM4 instruction length mask size.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 0fe183c2993dae7364c20f65c46aae0f23366ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe183c2993dae7364c20f65c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:03 2014 +0200 wined3d: Increase the SM4 instruction length mask size. --- dlls/wined3d/shader_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 1159d6e..9a6131f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -27,7 +27,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (1 << 31) #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 -#define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0xf << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) +#define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1f << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT)

1 0

Henri Verbeet : d2d1: Add the ID2D1Factory interface.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: a96135aeaeddb47debce4b5051e3de3e6fe4e0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96135aeaeddb47debce4b505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:02 2014 +0200 d2d1: Add the ID2D1Factory interface. --- include/d2d1.idl | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index b76e51f..a6d0d36 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -34,6 +34,7 @@ interface IDWriteRenderingParams; interface IDWriteTextFormat; interface IDWriteTextLayout; interface IWICBitmapSource; +interface IWICBitmap; typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; @@ -279,6 +280,14 @@ typedef enum D2D1_DC_INITIALIZE_MODE D2D1_DC_INITIALIZE_MODE_FORCE_DWORD = 0xffffffff, } D2D1_DC_INITIALIZE_MODE; +typedef enum D2D1_PRESENT_OPTIONS +{ + D2D1_PRESENT_OPTIONS_NONE = 0x00000000, + D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS = 0x00000001, + D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002, + D2D1_PRESENT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_PRESENT_OPTIONS; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -397,6 +406,24 @@ typedef struct D2D1_RENDER_TARGET_PROPERTIES D2D1_FEATURE_LEVEL minLevel; } D2D1_RENDER_TARGET_PROPERTIES; +typedef struct D2D1_STROKE_STYLE_PROPERTIES +{ + D2D1_CAP_STYLE startCap; + D2D1_CAP_STYLE endCap; + D2D1_CAP_STYLE dashCap; + D2D1_LINE_JOIN lineJoin; + float miterLimit; + D2D1_DASH_STYLE dashStyle; + float dashOffset; +} D2D1_STROKE_STYLE_PROPERTIES; + +typedef struct D2D1_HWND_RENDER_TARGET_PROPERTIES +{ + HWND hwnd; + D2D1_SIZE_U pixelSize; + D2D1_PRESENT_OPTIONS presentOptions; +} D2D1_HWND_RENDER_TARGET_PROPERTIES; + [ local, object, @@ -1149,5 +1176,75 @@ interface ID2D1GdiInteropRenderTarget : IUnknown ); } +[ + local, + object, + uuid(06152247-6f50-465a-9245-118bfd3b6007) +] +interface ID2D1Factory : IUnknown +{ + HRESULT ReloadSystemMetrics(); + void GetDesktopDpi( + [out] float *dpi_x, + [out] float *dpi_y + ); + HRESULT CreateRectangleGeometry( + [in] const D2D1_RECT_F *rect, + [out] ID2D1RectangleGeometry **geometry + ); + HRESULT CreateRoundedRectangleGeometry( + [in] const D2D1_ROUNDED_RECT *rect, + [out] ID2D1RoundedRectangleGeometry **geometry + ); + HRESULT CreateEllipseGeometry( + [in] const D2D1_ELLIPSE *ellipse, + [out] ID2D1EllipseGeometry **geometry + ); + HRESULT CreateGeometryGroup( + [in] D2D1_FILL_MODE fill_mode, + [in, size_is(geometry_count)] ID2D1Geometry *geometry, + [in] UINT32 geometry_count, + [out] ID2D1GeometryGroup **group + ); + HRESULT CreateTransformedGeometry( + [in] ID2D1Geometry *src_geometry, + [in] const D2D1_MATRIX_3X2_F *transform, + [out] ID2D1TransformedGeometry **transformed_geometry + ); + HRESULT CreatePathGeometry( + [out] ID2D1PathGeometry *geometry + ); + HRESULT CreateStrokeStyle( + [in] const D2D1_STROKE_STYLE_PROPERTIES *desc, + [in, size_is(dash_count)] const float *dashes, + [in] UINT32 dash_count, + [out] ID2D1StrokeStyle **stroke_style + ); + HRESULT CreateDrawingStateBlock( + [in] const D2D1_DRAWING_STATE_DESCRIPTION *desc, + [in] IDWriteRenderingParams *text_rendering_params, + [out] ID2D1DrawingStateBlock **state_block + ); + HRESULT CreateWicBitmapRenderTarget( + [in] IWICBitmap *target, + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1RenderTarget **render_target + ); + HRESULT CreateHwndRenderTarget( + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [in] const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc, + [out] ID2D1HwndRenderTarget **render_target + ); + HRESULT CreateDxgiSurfaceRenderTarget( + [in] IDXGISurface *surface, + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1RenderTarget **render_target + ); + HRESULT CreateDCRenderTarget( + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1DCRenderTarget **render_target + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1GdiInteropRenderTarget interface.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: bfcce57b9b9ed59fc648a8996fb1047e9b99af10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcce57b9b9ed59fc648a8996… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:01 2014 +0200 d2d1: Add the ID2D1GdiInteropRenderTarget interface. --- include/d2d1.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2c9db1a..b76e51f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -272,6 +272,13 @@ typedef enum D2D1_WINDOW_STATE D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, } D2D1_WINDOW_STATE; +typedef enum D2D1_DC_INITIALIZE_MODE +{ + D2D1_DC_INITIALIZE_MODE_COPY = 0, + D2D1_DC_INITIALIZE_MODE_CLEAR = 1, + D2D1_DC_INITIALIZE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_DC_INITIALIZE_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -1126,5 +1133,21 @@ interface ID2D1DCRenderTarget : ID2D1RenderTarget ); } +[ + local, + object, + uuid(e0db51c3-6f77-4bae-b3d5-e47509b35838) +] +interface ID2D1GdiInteropRenderTarget : IUnknown +{ + HRESULT GetDC( + [in] D2D1_DC_INITIALIZE_MODE mode, + [out] HDC *dc + ); + HRESULT ReleaseDC( + [in] const RECT *update + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1DCRenderTarget interface.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 60de2d686cac484d1784b14872c7a86f762a0fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60de2d686cac484d1784b1487… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:00 2014 +0200 d2d1: Add the ID2D1DCRenderTarget interface. --- include/d2d1.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 899c1d7..2c9db1a 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1113,5 +1113,18 @@ interface ID2D1HwndRenderTarget : ID2D1RenderTarget HWND GetHwnd(); } +[ + local, + object, + uuid(1c51bc64-de61-46fd-9899-63a5d8f03950) +] +interface ID2D1DCRenderTarget : ID2D1RenderTarget +{ + HRESULT BindDC( + [in] const HDC dc, + [in] const RECT rect + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Nikolay Sivov : scrrun: Implement Count() property for file collection.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 108c27313bc1c5d4c95f1ddc5d7d8ee57a79071c URL: http://source.winehq.org/git/wine.git/?a=commit;h=108c27313bc1c5d4c95f1ddc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 15:15:42 2014 +0400 scrrun: Implement Count() property for file collection. --- dlls/scrrun/filesystem.c | 28 ++++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 4 ---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index aead0d2..f5afb91 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1831,8 +1831,32 @@ static HRESULT WINAPI filecoll_get__NewEnum(IFileCollection *iface, IUnknown **p static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count) { struct filecollection *This = impl_from_IFileCollection(iface); - FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + WIN32_FIND_DATAW data; + WCHAR pathW[MAX_PATH]; + HANDLE handle; + + TRACE("(%p)->(%p)\n", This, count); + + if(!count) + return E_POINTER; + + *count = 0; + + strcpyW(pathW, This->path); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + do + { + if (is_file_data(&data)) + *count += 1; + } while (FindNextFileW(handle, &data)); + FindClose(handle); + + return S_OK; } static const IFileCollectionVtbl filecollectionvtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c004eaf..531b732 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1084,9 +1084,7 @@ static void test_FileCollection(void) count = 0; hr = IFileCollection_get_Count(files, &count); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 2, "got %d\n", count); lstrcpyW(pathW, buffW); @@ -1097,9 +1095,7 @@ todo_wine /* every time property is requested it scans directory */ count = 0; hr = IFileCollection_get_Count(files, &count); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 3, "got %d\n", count); hr = IFileCollection_get__NewEnum(files, NULL);

1 0

Nikolay Sivov : scrrun/tests: Fix tests to depend on current codepage.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 2b628405cd2edaf771399abb8ed34f5891608900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b628405cd2edaf771399abb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 14:42:05 2014 +0400 scrrun/tests: Fix tests to depend on current codepage. --- dlls/scrrun/tests/filesystem.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 409cf4b..c004eaf 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -41,6 +41,7 @@ static inline ULONG get_refcount(IUnknown *iface) } static const WCHAR crlfW[] = {'\r','\n',0}; +static const char utf16bom[] = {0xff,0xfe,0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) @@ -1317,8 +1318,7 @@ static void test_CreateTextFile(void) { static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; - static const WCHAR bomAW[] = {0xff,0xfe,0}; - WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; ITextStream *stream; BSTR nameW, str; HANDLE file; @@ -1365,11 +1365,16 @@ static void test_CreateTextFile(void) ok(hr == S_OK, "got 0x%08x\n", hr); ITextStream_Release(stream); + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, bomAW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); SysFreeString(str); ITextStream_Release(stream); @@ -1506,7 +1511,9 @@ static void test_ReadAll(void) str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1653,7 +1660,11 @@ static void test_Read(void) str = NULL; hr = ITextStream_Read(stream, 2, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream);

1 0

Zhenbo Li : mshtml: Added IHTMLLocation::assign method implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 8d275952875efa268c4034103d6f4e1b9254e8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d275952875efa268c4034103… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri May 16 21:47:41 2014 +0800 mshtml: Added IHTMLLocation::assign method implementation. --- dlls/mshtml/htmllocation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 0c50609..6411eb7 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -575,8 +575,8 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstr)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(bstr)); + return IHTMLLocation_put_href(iface, bstr); } static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String)

1 0

Hans Leidekker : wbemprox: Handle NULL out parameter to object methods.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 464c884542e95399caeaca3204ad4c3289c57ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464c884542e95399caeaca320… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 19 12:30:46 2014 +0200 wbemprox: Handle NULL out parameter to object methods. --- dlls/wbemprox/process.c | 35 ++++++++++------ dlls/wbemprox/reg.c | 105 +++++++++++++++++++++++++++++++---------------- dlls/wbemprox/service.c | 104 +++++++++++++++++++++++++++++++--------------- 3 files changed, 164 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=464c884542e95399caeac…

1 0

Henri Verbeet : d2d1: Add the ID2D1HwndRenderTarget interface.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: d76e60501059a29fd632a7b321da459400c8f10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76e60501059a29fd632a7b32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:20:59 2014 +0200 d2d1: Add the ID2D1HwndRenderTarget interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 722f65f..899c1d7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -265,6 +265,13 @@ typedef enum D2D1_FEATURE_LEVEL D2D1_FEATURE_LEVEL_FORCE_DWORD = 0xffffffff, } D2D1_FEATURE_LEVEL; +typedef enum D2D1_WINDOW_STATE +{ + D2D1_WINDOW_STATE_NONE = 0x0000000, + D2D1_WINDOW_STATE_OCCLUDED = 0x0000001, + D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, +} D2D1_WINDOW_STATE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -1092,5 +1099,19 @@ interface ID2D1BitmapRenderTarget : ID2D1RenderTarget ); } +[ + local, + object, + uuid(2cd90698-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1HwndRenderTarget : ID2D1RenderTarget +{ + D2D1_WINDOW_STATE CheckWindowState(); + HRESULT Resize( + [in] const D2D1_SIZE_U size + ); + HWND GetHwnd(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Andrey Gusev : Ukrainian translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: daeef820ee11bd4f89dc5f88282db10bd20bccce URL: http://source.winehq.org/git/website.git/?a=commit;h=daeef820ee11bd4f89dc5f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 17 00:35:21 2014 +0300 Ukrainian translation for release 1.7.19 --- news/uk/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2014051601.xml b/news/uk/2014051601.xml new file mode 100644 index 0000000..52616e9 --- /dev/null +++ b/news/uk/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>16 травня 2014</date> +<title>Випущено Wine 1.7.19</title> +<body> +<p> Розробницький реліз Wine 1.7.19 наразі доступний.</p> +<p> <a href="{$root}/announce/1.7.19">Що нового</a> в цьому релізі: +<ul> + <li>Додана нова DLL бібліотека JSProxy для автоматичного налаштування проксі.</li> + <li>Покращена підтримка OLE Accessible Object.</li> + <li>Покращення для запису XML.</li> + <li>Виправлення різних проблем з пам'яттю знайдених за допомогою Valgrind.</li> + <li>Додано початкові заголовки для підтримки Direct2D.</li> + <li>Виправлення різних помилок.</li> +</ul> +<p>Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</p></body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 76aaaf217c73961cbe21d504d8f04ccc6ea67077 URL: http://source.winehq.org/git/website.git/?a=commit;h=76aaaf217c73961cbe21d5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 17 07:44:53 2014 +0200 Polish translation for release 1.7.19 --- news/pl/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014051601.xml b/news/pl/2014051601.xml new file mode 100644 index 0000000..0a9709b --- /dev/null +++ b/news/pl/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>Maj 16, 2014</date> +<title>Wydano Wine 1.7.19</title> +<body> +<p> Wydanie rozwojowe Wine 1.7.19 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.7.19">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa biblioteka DLL JSProxy do samoczynnego ustawiania pośrednika.</li> + <li>Większa obsługa Obiektów Dostępu OLE.</li> + <li>Ulepszenia w programie piszącym XML.</li> + <li>Poprawki różnych wycieków do pamięci znalezione przy pomocy Valgrind.</li> + <li>Wstępne nagłówki do obsługi Direct2D.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Julian Rüger : German translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 67544bb8a84a2b53667092b9649f6abce0355c8b URL: http://source.winehq.org/git/website.git/?a=commit;h=67544bb8a84a2b53667092… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat May 17 17:39:51 2014 +0200 German translation for release 1.7.19 --- news/de/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2014051601.xml b/news/de/2014051601.xml new file mode 100644 index 0000000..58ae6e5 --- /dev/null +++ b/news/de/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>16. Mai 2014</date> +<title>Wine 1.7.19 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.19 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.19">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Neue DLL JSProxy für automatische Proxy-Konfiguration.</li> + <li>OLE Accessible Object Unterstützung weiter ausgebaut.</li> + <li>Verbesserungen am XML writer.</li> + <li>Fehlerkorrekturen für verschiedene Speicherprobleme, die mit Valgrind gefunden wurden.</li> + <li>Anfänge der Header für Direct2D-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 2251e68252229bf477b6a79decdbb023ad6583b6 URL: http://source.winehq.org/git/website.git/?a=commit;h=2251e68252229bf477b6a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 16 21:48:24 2014 +0200 French translation for release 1.7.19 --- news/fr/2014051601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014051601.xml b/news/fr/2014051601.xml new file mode 100644 index 0000000..4c8ad2f --- /dev/null +++ b/news/fr/2014051601.xml @@ -0,0 +1,16 @@ +<news> +<date>16 mai 2014</date> +<title>Sortie de Wine 1.7.19</title> +<body> +<p> La version de développement 1.7.19 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.19">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle DLL JSProxy pour une configuration automatique des serveurs mandataires.</li> + <li>Meilleurs prise en charge de l'API OLE Accessible Object.</li> + <li>Améliorations dans le rédacteur XML.</li> + <li>Correctifs pour divers problèmes mémoire détectés par Valgrind.</li> + <li>Fichiers d'en-tête initiaux pour la prise en charge de Direct2D.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.7.19
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: website Branch: master Commit: d5791fde1177363568a886e55e6a64882074e762 URL: http://source.winehq.org/git/website.git/?a=commit;h=d5791fde1177363568a886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:15:53 2014 +0200 Wine release 1.7.19 --- news/en/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2014051601.xml b/news/en/2014051601.xml new file mode 100644 index 0000000..94a5190 --- /dev/null +++ b/news/en/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>May 16, 2014</date> +<title>Wine 1.7.19 Released</title> +<body> +<p> The Wine development release 1.7.19 is now available.</p> +<p> <a href="{$root}/announce/1.7.19">What's new</a> in this release: +<ul> + <li>New JSProxy DLL for automatic proxy configuration.</li> + <li>More OLE Accessible Object support.</li> + <li>Improvements to the XML writer.</li> + <li>Fixes for various memory issues found by Valgrind.</li> + <li>Initial headers for Direct2D support.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.7.19 : Alexandre Julliard : Release 1.7.19
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: refs/tags/wine-1.7.19 Tag: 1098c57e53df5416544991e25cadcb8b01ab1a64 URL: http://source.winehq.org/git/wine.git/?a=tag;h=1098c57e53df5416544991e25cad… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:06:49 2014 +0200 Release 1.7.19

1 0

Alexandre Julliard : Release 1.7.19.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 613c104562b1ee03a902484f93a8da30e89302d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613c104562b1ee03a902484f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:06:48 2014 +0200 Release 1.7.19. --- ANNOUNCE | 718 +++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 396 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=613c104562b1ee03a9024…

1 0

Piotr Caban : oleacc: Add IID_IAccessible, IID_IAccessibleHandler and LIBID_Accessibility exports.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 76302af67e4d7222c8cc18d3b3a308aebebe704e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76302af67e4d7222c8cc18d3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 16:36:56 2014 +0200 oleacc: Add IID_IAccessible, IID_IAccessibleHandler and LIBID_Accessibility exports. --- dlls/oleacc/oleacc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index caeb6d3..9f3a9a0 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -14,9 +14,9 @@ @ stdcall GetRoleTextW(long ptr long) @ stdcall GetStateTextA(long ptr long) @ stdcall GetStateTextW(long ptr long) -@ stub IID_IAccessible -@ stub IID_IAccessibleHandler -@ stub LIBID_Accessibility +@ extern IID_IAccessible +@ extern IID_IAccessibleHandler +@ extern LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) @ stdcall ObjectFromLresult(long ptr long ptr) @ stdcall WindowFromAccessibleObject(ptr ptr)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 8fcb8ea16c4902fdbfe1f9f9acf4e887fb411424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcb8ea16c4902fdbfe1f9f9a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri May 16 16:46:44 2014 +0300 po: Update Finnish translation. --- po/fi.po | 106 +++++++++++++++++++------------------------------------------- 1 file changed, 32 insertions(+), 74 deletions(-) diff --git a/po/fi.po b/po/fi.po index ab30652..8fc4bbb 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7113,206 +7113,164 @@ msgid "outline button" msgstr "rungon painike" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Normaali" +msgstr "normaali" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Ei käytettävissä" +msgstr "ei käytettävissä" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Valitse" +msgstr "valittu" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pysäytetty" +msgstr "kohdistettu" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "Paka&ttu" +msgstr "painettu" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "valittu" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Sekamuotoinen" +msgstr "osittainen" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Vain luku" +msgstr "vain luku" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Aktiivinen elementti" +msgstr "osoitettu" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Oletukset" +msgstr "oletus" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "laajennettu" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "kutistettu" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "varattu" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "kelluva" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "vierivä" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animaatio" +msgstr "animoitu" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "näkymätön" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "poissa ruudulta" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&käytä" +msgstr "koko muutettava" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&käytä" +msgstr "siirrettävä" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "itse puhuva" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pysäytetty" +msgstr "kohdistettava" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "taulukko" +msgstr "valittava" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "linkki" +msgstr "linkitetty" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "käyty" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "taulukko" +msgstr "monivalittava" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Valitse tiedosto." +msgstr "laajentaen valittava" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "hälytys" +msgstr "vähäinen hälytys" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "hälytys" +msgstr "keskitason hälytys" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "hälytys" +msgstr "tärkeä hälytys" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Kirjoitussuojattu.\n" +msgstr "suojattu" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "sisältää ponnahdusvalikon tai -ikkunan" #: oleaut32.rc:30 oleview.rc:147 msgid "True"

1 0

Henri Verbeet : d2d1: Add the ID2D1BitmapRenderTarget interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 7e5bcb0b0b6745bb58b4864764e7b142713c2763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5bcb0b0b6745bb58b486476… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:23 2014 +0200 d2d1: Add the ID2D1BitmapRenderTarget interface. --- include/d2d1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 436f9cc..722f65f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1080,5 +1080,17 @@ interface ID2D1RenderTarget : ID2D1Resource ); } +[ + local, + object, + uuid(2cd90695-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1BitmapRenderTarget : ID2D1RenderTarget +{ + HRESULT GetBitmap( + [out] ID2D1Bitmap **bitmap + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Piotr Caban : oleacc: Prepare CreateStdAccessibleObject to support class specific accessibility objects.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: e73bbd0c810332f0eef93bd3d44149a82115edfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73bbd0c810332f0eef93bd3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 16:37:03 2014 +0200 oleacc: Prepare CreateStdAccessibleObject to support class specific accessibility objects. --- dlls/oleacc/main.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 9d5320e..c7a622b 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "commctrl.h" #include "initguid.h" #include "oleacc_private.h" @@ -36,6 +37,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; +static const WCHAR menuW[] = {'#','3','2','7','6','8',0}; +static const WCHAR desktopW[] = {'#','3','2','7','6','9',0}; +static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; +static const WCHAR winswitchW[] = {'#','3','2','7','7','1',0}; +static const WCHAR mdi_clientW[] = {'M','D','I','C','l','i','e','n','t',0}; +static const WCHAR richeditW[] = {'R','I','C','H','E','D','I','T',0}; +static const WCHAR richedit20aW[] = {'R','i','c','h','E','d','i','t','2','0','A',0}; +static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; + +typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); + +static struct { + const WCHAR *name; + DWORD idx; + accessible_create create_client; + accessible_create create_window; +} builtin_classes[] = { + {WC_LISTBOXW, 0x10000, NULL, NULL}, + {menuW, 0x10001, NULL, NULL}, + {WC_BUTTONW, 0x10002, NULL, NULL}, + {WC_STATICW, 0x10003, NULL, NULL}, + {WC_EDITW, 0x10004, NULL, NULL}, + {WC_COMBOBOXW, 0x10005, NULL, NULL}, + {dialogW, 0x10006, NULL, NULL}, + {winswitchW, 0x10007, NULL, NULL}, + {mdi_clientW, 0x10008, NULL, NULL}, + {desktopW, 0x10009, NULL, NULL}, + {WC_SCROLLBARW, 0x1000a, NULL, NULL}, + {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, + {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, + {PROGRESS_CLASSW, 0x1000d, NULL, NULL}, + {ANIMATE_CLASSW, 0x1000e, NULL, NULL}, + {WC_TABCONTROLW, 0x1000f, NULL, NULL}, + {HOTKEY_CLASSW, 0x10010, NULL, NULL}, + {WC_HEADERW, 0x10011, NULL, NULL}, + {TRACKBAR_CLASSW, 0x10012, NULL, NULL}, + {WC_LISTVIEWW, 0x10013, NULL, NULL}, + {UPDOWN_CLASSW, 0x10016, NULL, NULL}, + {TOOLTIPS_CLASSW, 0x10018, NULL, NULL}, + {WC_TREEVIEWW, 0x10019, NULL, NULL}, + {MONTHCAL_CLASSW, 0, NULL, NULL}, + {DATETIMEPICK_CLASSW, 0, NULL, NULL}, + {WC_IPADDRESSW, 0, NULL, NULL}, + {richeditW, 0x1001c, NULL, NULL}, + {richedit20aW, 0, NULL, NULL}, + {richedit20wW, 0, NULL, NULL}, +}; + static HINSTANCE oleacc_handle = 0; const char *debugstr_variant(const VARIANT *v) @@ -81,20 +130,65 @@ int convert_child_id(VARIANT *v) } } +static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) +{ + WCHAR class_name[64]; + int i, idx; + + if(!RealGetWindowClassW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) + return NULL; + TRACE("got window class: %s\n", debugstr_w(class_name)); + + for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + if(!strcmpiW(class_name, builtin_classes[i].name)) { + accessible_create ret; + + ret = (objid==OBJID_CLIENT ? + builtin_classes[i].create_client : + builtin_classes[i].create_window); + if(!ret) + FIXME("unhandled window class: %s\n", debugstr_w(class_name)); + return ret; + } + } + + idx = SendMessageW(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); + if(idx) { + for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + if(idx == builtin_classes[i].idx) { + accessible_create ret; + + ret = (objid==OBJID_CLIENT ? + builtin_classes[i].create_client : + builtin_classes[i].create_window); + if(!ret) + FIXME("unhandled class name idx: %x\n", idx); + return ret; + } + } + + WARN("unhandled class name idx: %x\n", idx); + } + + return NULL; +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { - WCHAR class_name[64]; + accessible_create create; TRACE("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); - if(GetClassNameW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) - FIXME("unhandled window class: %s\n", debugstr_w(class_name)); switch(idObject) { case OBJID_CLIENT: + create = get_builtin_accessible_obj(hwnd, idObject); + if(create) return create(hwnd, riidInterface, ppvObject); return create_client_object(hwnd, riidInterface, ppvObject); case OBJID_WINDOW: + create = get_builtin_accessible_obj(hwnd, idObject); + if(create) return create(hwnd, riidInterface, ppvObject); return create_window_object(hwnd, riidInterface, ppvObject); default: FIXME("unhandled object id: %d\n", idObject);

1 0

Henri Verbeet : d2d1: Add the ID2D1RenderTarget interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: c68a8f3415e05f823693343e254514cbb312988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68a8f3415e05f823693343e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 12:45:55 2014 +0200 d2d1: Add the ID2D1RenderTarget interface. --- include/d2d1.idl | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68a8f3415e05f8236933…

1 0

Henri Verbeet : d2d1: Add the ID2D1Mesh interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: ff4131128500fb3849c461e6fa1b2322593796f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4131128500fb3849c461e6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:21 2014 +0200 d2d1: Add the ID2D1Mesh interface. --- include/d2d1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index b8d8531..eb44bd6 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -717,5 +717,17 @@ interface ID2D1Layer : ID2D1Resource D2D1_SIZE_F GetSize(); } +[ + local, + object, + uuid(2cd906c2-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Mesh : ID2D1Resource +{ + HRESULT Open( + [out] ID2D1TessellationSink **sink + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 4a06f84b9f6108ef5bc1a2fbb69f0332fdcbebb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a06f84b9f6108ef5bc1a2fbb… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri May 16 08:21:22 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 110 +++++++++++++++++++------------------------------------------- 1 file changed, 34 insertions(+), 76 deletions(-) diff --git a/po/lt.po b/po/lt.po index e142410..a3a2e51 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-04-03 21:16+0300\n" +"PO-Revision-Date: 2014-05-16 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7124,206 +7124,164 @@ msgid "outline button" msgstr "plano mygtukas" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "&Normalus" +msgstr "normalus" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Nepasiekiamas" +msgstr "nepasiekiamas" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Iš&rinkti" +msgstr "pasirinktas" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pristabdyta" +msgstr "židinyje" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "Su&glaudintas" +msgstr "paspaustas" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "pažymėtas" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Maišytas" +msgstr "mišrus" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Tik skaitymui" +msgstr "tik skaitymui" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Pažymėtas elementas" +msgstr "sekamas" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Numatytosios reikšmės" +msgstr "numatytasis" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "išplėstas" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "sutrauktas" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "užimtas" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "slankus" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "grupėje" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animacija" +msgstr "animuotas" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "nematomas" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "ne ekrane" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "įjun&gti" +msgstr "didinamas" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "įjun&gti" +msgstr "perkeliamas" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "save įgarsina" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pristabdyta" +msgstr "fokusuojamas" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "lentelė" +msgstr "pasirenkamas" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "nuoroda" +msgstr "susietas" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "pereitas" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "lentelė" +msgstr "pasirenkama daug" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Išrinkite failą." +msgstr "pasirenkama išplėstai" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "įspėjimas" +msgstr "žemas įspėjimas" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "įspėjimas" +msgstr "vidutinis įspėjimas" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "įspėjimas" +msgstr "aukštas įspėjimas" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Apsaugotas nuo rašymo.\n" +msgstr "apsaugotas" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "turi iškylantį langą" #: oleaut32.rc:30 oleview.rc:147 msgid "True" @@ -13435,7 +13393,7 @@ msgstr "Valdiklių alternatyvus fonas" #: winecfg.rc:120 msgid "Hot Tracked Item" -msgstr "Pažymėtas elementas" +msgstr "Sekamas elementas" #: winecfg.rc:121 msgid "Active Title Bar Gradient"

1 0

Nikolay Sivov : ntdll: Implement non-blocking mode for LdrLockLoaderLock() .
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 97e2af1f73b6985bd9c91fce18d0de1a1d95dc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e2af1f73b6985bd9c91fce1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 09:03:27 2014 +0400 ntdll: Implement non-blocking mode for LdrLockLoaderLock(). --- dlls/ntdll/loader.c | 26 +++++++++++++++++----- dlls/ntdll/tests/rtl.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d458a31..6471290 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1337,17 +1337,33 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * - * Note: flags are not implemented. + * Note: some flags are not implemented. * Flag 0x01 is used to raise exceptions on errors. - * Flag 0x02 is used to avoid waiting on the section (does RtlTryEnterCriticalSection instead). */ NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) { - if (flags) FIXME( "flags %x not supported\n", flags ); + if (flags & ~0x2) FIXME( "flags %x not supported\n", flags ); - if (result) *result = 1; + if (result) *result = 0; + if (magic) *magic = 0; + if (flags & ~0x3) return STATUS_INVALID_PARAMETER_1; + if (!result && (flags & 0x2)) return STATUS_INVALID_PARAMETER_2; if (!magic) return STATUS_INVALID_PARAMETER_3; - RtlEnterCriticalSection( &loader_section ); + + if (flags & 0x2) + { + if (!RtlTryEnterCriticalSection( &loader_section )) + { + *result = 2; + return STATUS_SUCCESS; + } + *result = 1; + } + else + { + RtlEnterCriticalSection( &loader_section ); + if (result) *result = 1; + } *magic = GetCurrentThreadId(); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 6eb6de3..72cee05 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -90,6 +90,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG*); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -135,6 +137,8 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); + pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); + pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1543,6 +1547,57 @@ static void test_LdrAddRefDll(void) ok(mod2 != NULL, "got %p\n", mod2); } +static void test_LdrLockLoaderLock(void) +{ + ULONG result, magic; + NTSTATUS status; + + if (!pLdrLockLoaderLock) + { + win_skip("LdrLockLoaderLock() is not available\n"); + return; + } + + /* invalid flags */ + result = 10; + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x10, &result, &magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + ok(magic == 0, "got 0x%08x\n", magic); + + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x10, NULL, &magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(magic == 0, "got 0x%08x\n", magic); + + result = 10; + status = pLdrLockLoaderLock(0x10, &result, NULL); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + + /* non-blocking mode, result is null */ + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x2, NULL, &magic); + ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08x\n", status); + ok(magic == 0, "got 0x%08x\n", magic); + + /* magic pointer is null */ + result = 10; + status = pLdrLockLoaderLock(0, &result, NULL); + ok(status == STATUS_INVALID_PARAMETER_3, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + + /* lock in non-blocking mode */ + result = 0; + magic = 0; + status = pLdrLockLoaderLock(0x2, &result, &magic); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(result == 1, "got %d\n", result); + ok(magic != 0, "got 0x%08x\n", magic); + pLdrUnlockLoaderLock(0, magic); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1568,4 +1623,5 @@ START_TEST(rtl) test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); test_LdrAddRefDll(); + test_LdrLockLoaderLock(); }

1 0

Alexandre Julliard : wnaspi32: Remove unnecessary DllMain implementation on non-Linux.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 9222e4e0ea83e782f9b6e33134fe00b3cd518fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9222e4e0ea83e782f9b6e3313… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:51 2014 +0200 wnaspi32: Remove unnecessary DllMain implementation on non-Linux. --- dlls/wnaspi32/winaspi32.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 68bda01..0ce72aa 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -63,12 +63,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION ASPI_CritSection = { &critsect_debug, -1, 0, 0, 0, 0 }; -#endif /* defined(linux) */ - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { -#ifdef linux switch( fdwReason ) { case DLL_PROCESS_ATTACH: @@ -80,13 +77,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) DeleteCriticalSection( &ASPI_CritSection ); break; } -#endif /* defined(linux) */ return TRUE; } -#ifdef linux - static int ASPI_OpenDevice(SRB_ExecSCSICmd *prb) {

1 0

Alexandre Julliard : d2d1: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: ddfaafc16d59771dcc4d3ad472448fcc774177b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfaafc16d59771dcc4d3ad47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:40 2014 +0200 d2d1: Remove unnecessary DllMain implementation. --- dlls/d2d1/d2d1_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d2d1/d2d1_main.c b/dlls/d2d1/d2d1_main.c index 9a389a2..f438de9 100644 --- a/dlls/d2d1/d2d1_main.c +++ b/dlls/d2d1/d2d1_main.c @@ -26,18 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory) {

1 0

Henri Verbeet : d2d1: Add the ID2D1RadialGradientBrush interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 7d30886296ef74e9e998effd872482b1d1874d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d30886296ef74e9e998effd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:19 2014 +0200 d2d1: Add the ID2D1RadialGradientBrush interface. --- include/d2d1.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 3a7901f..c96b67e 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -679,5 +679,33 @@ interface ID2D1LinearGradientBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd906ac-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1RadialGradientBrush : ID2D1Brush +{ + void SetCenter( + [in] D2D1_POINT_2F center + ); + void SetGradientOriginOffset( + [in] D2D1_POINT_2F offset + ); + void SetRadiusX( + [in] float radius + ); + void SetRadiusY( + [in] float radius + ); + D2D1_POINT_2F GetCenter(); + D2D1_POINT_2F GetGradientOriginOffset(); + float GetRadiusX(); + float GetRadiusY(); + void GetGradientStopCollection( + [out] ID2D1GradientStopCollection **gradient + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Alexandre Julliard : bcrypt: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: cf40121ed67c65e83999bc04a1e86aae724c5fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf40121ed67c65e83999bc04a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:29 2014 +0200 bcrypt: Remove unnecessary DllMain implementation. --- dlls/bcrypt/bcrypt_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fcad58c..ee203a6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -31,20 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - - return TRUE; -} - NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) {

1 0

Michael Stefaniuc : dmusic: Move a struct to the .c file it is used.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 176b7aa8423ada08261d26ca6343ce6687984c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=176b7aa8423ada08261d26ca6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 15 23:55:43 2014 +0200 dmusic: Move a struct to the .c file it is used. --- dlls/dmusic/collection.c | 25 ++++++++++++++++++++++--- dlls/dmusic/dmusic_private.h | 25 ------------------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 90a7918..acbc2a5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -23,6 +23,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +/***************************************************************************** + * IDirectMusicCollectionImpl implementation + */ +typedef struct IDirectMusicCollectionImpl { + IDirectMusicCollection IDirectMusicCollection_iface; + IDirectMusicObject IDirectMusicObject_iface; + IPersistStream IPersistStream_iface; + LONG ref; + /* IDirectMusicCollectionImpl fields */ + IStream *pStm; /* stream from which we load collection and later instruments */ + LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ + LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ + DMUS_OBJECTDESC *pDesc; + CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ + DLSHEADER *pHeader; + /* pool table */ + POOLTABLE *pPoolTable; + POOLCUE *pPoolCues; + /* instruments */ + struct list Instruments; +} IDirectMusicCollectionImpl; + static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface) { return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface); @@ -38,9 +60,6 @@ static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStrea return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IPersistStream_iface); } -/***************************************************************************** - * IDirectMusicCollectionImpl implementation - */ /* IDirectMusicCollectionImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface) { diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index badc2df..6a87bee 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -51,7 +51,6 @@ typedef struct IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstru typedef struct IDirectMusicDownloadImpl IDirectMusicDownloadImpl; typedef struct IReferenceClockImpl IReferenceClockImpl; -typedef struct IDirectMusicCollectionImpl IDirectMusicCollectionImpl; typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; typedef struct SynthPortImpl SynthPortImpl; @@ -210,30 +209,6 @@ typedef struct _DMUS_PRIVATE_POOLCUE { } DMUS_PRIVATE_POOLCUE, *LPDMUS_PRIVATE_POOLCUE; /***************************************************************************** - * IDirectMusicCollectionImpl implementation structure - */ -struct IDirectMusicCollectionImpl { - /* IUnknown fields */ - IDirectMusicCollection IDirectMusicCollection_iface; - IDirectMusicObject IDirectMusicObject_iface; - IPersistStream IPersistStream_iface; - LONG ref; - - /* IDirectMusicCollectionImpl fields */ - IStream *pStm; /* stream from which we load collection and later instruments */ - LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ - LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - LPDMUS_OBJECTDESC pDesc; - CHAR* szCopyright; /* FIXME: should probably placed somewhere else */ - LPDLSHEADER pHeader; - /* pool table */ - LPPOOLTABLE pPoolTable; - LPPOOLCUE pPoolCues; - /* instruments */ - struct list Instruments; -}; - -/***************************************************************************** * IDirectMusicInstrumentImpl implementation structure */ struct IDirectMusicInstrumentImpl {

1 0

Alexandre Julliard : sane.ds: Remove unnecessary DllMain implementation when SANE is missing.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 3f6c6dbbb3d44fe72388b03bd49a0daad6463f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6c6dbbb3d44fe72388b03bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:37 2014 +0200 sane.ds: Remove unnecessary DllMain implementation when SANE is missing. --- dlls/sane.ds/sane_main.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index c01baeb..7484ca5 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,10 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); -HINSTANCE SANE_instance; - #ifdef SONAME_LIBSANE +HINSTANCE SANE_instance; + static void *libsane_handle; static void close_libsane(void *h) @@ -79,8 +79,6 @@ static void *open_libsane(void) return h; } -#endif /* SONAME_LIBSANE */ - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -88,7 +86,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: { -#ifdef SONAME_LIBSANE SANE_Int version_code; libsane_handle = open_libsane(); @@ -96,28 +93,25 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; psane_init (&version_code, NULL); -#endif SANE_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; } case DLL_PROCESS_DETACH: if (lpvReserved) break; -#ifdef SONAME_LIBSANE TRACE("calling sane_exit()\n"); psane_exit (); close_libsane(libsane_handle); -#endif break; } return TRUE; } -#ifdef SONAME_LIBSANE static TW_UINT16 SANE_GetIdentity( pTW_IDENTITY, pTW_IDENTITY); static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); -#endif + +#endif /* SONAME_LIBSANE */ static TW_UINT16 SANE_SourceControlHandler ( pTW_IDENTITY pOrigin,

1 0

Henri Verbeet : d2d1: Add the ID2D1Layer interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 66cca10d568a1977f28bd944e296663f3fa016df URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cca10d568a1977f28bd944e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:20 2014 +0200 d2d1: Add the ID2D1Layer interface. --- include/d2d1.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index c96b67e..b8d8531 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -707,5 +707,15 @@ interface ID2D1RadialGradientBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd9069b-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Layer : ID2D1Resource +{ + D2D1_SIZE_F GetSize(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Alexandre Julliard : winemapi: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 78cf6059bc320aa983daa2fd02d7babb49081c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cf6059bc320aa983daa2fd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:04 2014 +0200 winemapi: Remove unnecessary DllMain implementation. --- dlls/winemapi/main.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index 0627aa2..8cd6b6d 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -31,14 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemapi); -/*********************************************************************** - * DllMain (MAPI32.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) -{ - TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad); - return TRUE; -} ULONG WINAPI MAPIAddress(LHANDLE session, ULONG_PTR uiparam, LPSTR caption, ULONG editfields, LPSTR labels, ULONG nRecips, lpMapiRecipDesc lpRecips,

1 0

Alexandre Julliard : d3d10core: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: a3ab118b1e3eeea214a8d9b8e9dd26781625d07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab118b1e3eeea214a8d9b8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:45 2014 +0200 d3d10core: Remove unnecessary DllMain implementation. --- dlls/d3d10core/d3d10core_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index abc8434..9006d95 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -25,18 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - static HRESULT WINAPI layer_init(enum dxgi_device_layer_id id, DWORD *count, DWORD *values) { TRACE("id %#x, count %p, values %p\n", id, count, values);

1 0

Nikolay Sivov : xmllite/writer: Fix Flush() behaviour on partial writes.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 81d2516449f0c2df39d76b493230853e8afa7a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d2516449f0c2df39d76b493… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 12:42:52 2014 +0400 xmllite/writer: Fix Flush() behaviour on partial writes. --- dlls/xmllite/tests/writer.c | 78 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 33 +++++++++--------- 2 files changed, 93 insertions(+), 18 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b6b8fe3..d7cfe44 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -67,6 +67,53 @@ static const IUnknownVtbl testoutputvtbl = { static IUnknown testoutput = { &testoutputvtbl }; +static HRESULT WINAPI teststream_QueryInterface(ISequentialStream *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ISequentialStream)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI teststream_AddRef(ISequentialStream *iface) +{ + return 2; +} + +static ULONG WINAPI teststream_Release(ISequentialStream *iface) +{ + return 1; +} + +static HRESULT WINAPI teststream_Read(ISequentialStream *iface, void *pv, ULONG cb, ULONG *pread) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG g_write_len; +static HRESULT WINAPI teststream_Write(ISequentialStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + g_write_len = cb; + *written = cb; + return S_OK; +} + +static const ISequentialStreamVtbl teststreamvtbl = +{ + teststream_QueryInterface, + teststream_AddRef, + teststream_Release, + teststream_Read, + teststream_Write +}; + +static ISequentialStream teststream = { &teststreamvtbl }; + static void test_writer_create(void) { HRESULT hr; @@ -235,6 +282,36 @@ static void test_writestartdocument(void) IXmlWriter_Release(writer); } +static void test_flush(void) +{ + IXmlWriter *writer; + HRESULT hr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)&teststream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_write_len = 0; + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(g_write_len > 0, "got %d\n", g_write_len); + + g_write_len = 1; + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(g_write_len == 0, "got %d\n", g_write_len); + + /* Release() flushes too */ + g_write_len = 1; + IXmlWriter_Release(writer); + ok(g_write_len == 0, "got %d\n", g_write_len); +} + START_TEST(writer) { if (!init_pointers()) @@ -243,4 +320,5 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); test_writestartdocument(); + test_flush(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 0a1d361..de5f755 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -63,7 +63,6 @@ typedef struct IMalloc *imalloc; xml_encoding encoding; struct output_buffer buffer; - ULONG stream_written; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -225,11 +224,6 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } -static inline void reset_output_buffer(xmlwriteroutput *output) -{ - output->stream_written = 0; -} - static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -253,7 +247,7 @@ static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutpu static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) { struct output_buffer *buffer; - ULONG written = 0, len; + ULONG written, offset = 0; HRESULT hr; if (!output || !output->stream) @@ -261,17 +255,20 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) buffer = &output->buffer; - len = buffer->written - output->stream_written; - if (!len) - return S_OK; + /* It will loop forever until everything is written or an error occured. */ + do { + written = 0; + hr = ISequentialStream_Write(output->stream, buffer->data + offset, buffer->written, &written); + if (FAILED(hr)) { + WARN("write to stream failed (0x%08x)\n", hr); + buffer->written = 0; + return hr; + } - hr = ISequentialStream_Write(output->stream, buffer->data + output->stream_written, len, &written); - if (FAILED(hr)) { - WARN("write to stream failed (0x%08x)\n", hr); - return hr; - } + offset += written; + buffer->written -= written; + } while (buffer->written > 0); - output->stream_written += written; return S_OK; } @@ -309,6 +306,8 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { IMalloc *imalloc = This->imalloc; + + IXmlWriter_Flush(iface); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); @@ -327,7 +326,6 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) TRACE("(%p)->(%p)\n", This, output); if (This->output) { - reset_output_buffer(This->output); writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; @@ -858,7 +856,6 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); writeroutput->stream = NULL; - writeroutput->stream_written = 0; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: f54e8527b1cf8e5f641d6bf2f9d30a4642e4ea05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54e8527b1cf8e5f641d6bf2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 10:27:19 2014 +0400 po: Update Russian translation. --- po/ru.po | 106 +++++++++++++++++++------------------------------------------- 1 file changed, 32 insertions(+), 74 deletions(-) diff --git a/po/ru.po b/po/ru.po index 626c596..8b110eb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7125,206 +7125,164 @@ msgid "outline button" msgstr "кнопка структуры" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Обычный" +msgstr "обычный" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Недоступно" +msgstr "сведения отсутствуют" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "&Выбрать" +msgstr "выделенный" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Приостановлена" +msgstr "с фокусом ввода" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "С&жатый" +msgstr "нажато" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "отмечено" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Смешанный" +msgstr "оба типа" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Только для чтения" +msgstr "только чтение" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Ссылка, Подсветка" +msgstr "отслеженное" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "По умолчанию" +msgstr "по умолчанию" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "развернуто" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "свернуто" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "занято" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "перемещаемый" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "бегущая строка" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "анимация" +msgstr "анимировано" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "невидимо" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "за экраном" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&включить" +msgstr "изменяемого размера" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&включить" +msgstr "перемещаемое" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "говорящее" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Приостановлена" +msgstr "фокусируемое" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "таблица" +msgstr "выделяемое" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "ссылка" +msgstr "связанное" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "пройденное" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "таблица" +msgstr "со множественным выделением" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Выберите файл." +msgstr "с расширенным выделением" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "оповещение" +msgstr "низкий уровень оповещений" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "оповещение" +msgstr "средний уровень оповещений" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "оповещение" +msgstr "высокий уровень оповещений" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Защищено от записи.\n" +msgstr "защищенный режим" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "есть всплывающая подсказка" #: oleaut32.rc:30 oleview.rc:147 msgid "True"

1 0

Francois Gouget : testbot/web: Fix the Submit page RescheduleJobs() error reporting.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: tools Branch: master Commit: 1ff23b8408a30138a2d979ff5befb7c20d36fa09 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ff23b8408a30138a2d979ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 16 11:07:06 2014 +0200 testbot/web: Fix the Submit page RescheduleJobs() error reporting. --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d381150..d50a3d9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -922,7 +922,7 @@ sub OnSubmit my $ErrMessage = RescheduleJobs(); if (defined $ErrMessage) { - LogMsg "$ErrMessage\n"; + $self->{ErrMessage} = $ErrMessage; $self->{Page} = 4; $self->{JobKey} = $JobKey; return !1;

1 0

Francois Gouget : testbot/testagentd: Add missing RPC names.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: tools Branch: master Commit: ac7852d5930aad0ceae07796994fecf93c8cf49f URL: http://source.winehq.org/git/tools.git/?a=commit;h=ac7852d5930aad0ceae07796… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 16 15:50:15 2014 +0200 testbot/testagentd: Add missing RPC names. This is just cosmetic: it makes it possible to get RPC names instead of numbers in the debug traces. --- testbot/src/testagentd/testagentd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 3159f16..292b1c7 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -105,6 +105,9 @@ static const char* rpc_name(uint32_t id) "wait", "rm", "wait2", + "settime", + "getproperties", + "upgrade", }; if (id < sizeof(names) / sizeof(*names))

1 0

Francois Gouget : testbot: Make Steps use the real filename for staging files too.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: tools Branch: master Commit: b14902e06b73d7f18adce0cd9d24852cd2ac3a8a URL: http://source.winehq.org/git/tools.git/?a=commit;h=b14902e06b73d7f18adce0cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 16 15:49:58 2014 +0200 testbot: Make Steps use the real filename for staging files too. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 16 ++++++++-------- testbot/web/Submit.pl | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index fc24fb6..e9f07ac 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -70,7 +70,7 @@ sub AddJob my $NewStep = $Steps->Add(); my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); - $NewStep->FileName("${FileNameRandomPart} winetest${BitsSuffix}-latest.exe"); + $NewStep->FileName("${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); $NewStep->InStaging(1); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index f54dc74..a4aed22 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -212,7 +212,7 @@ sub Submit $FileNameRandomPart = GenerateRandomString(32); } link $PatchFileName, "$DataDir/staging/${FileNameRandomPart}_patch.diff"; - $NewStep->FileName($FileNameRandomPart . " patch.diff"); + $NewStep->FileName($FileNameRandomPart . "_patch.diff"); my @Keys = keys %{$Targets{$BaseName}}; $NewStep->FileType($Targets{$BaseName}{$Keys[0]}); $NewStep->InStaging(1); diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0acb3da..bd60ed1 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -67,23 +67,23 @@ sub HandleStaging } my $FileName = $self->FileName; - if (! ($FileName =~ m/^([\da-fA-F]+) (.*)$/)) + if ($FileName !~ m/^[0-9a-f]+_(.*)$/) { - return "Can't split staging file name"; + return "Can't split staging filename"; } - $FileName = $2; - my $StagingFileName = "$DataDir/staging/$1_$FileName"; + my $BaseName = $1; + my $StagingFileName = "$DataDir/staging/$FileName"; my $FinalFileName = "$DataDir/jobs/$JobKey/" . $self->GetKey() . - "/$FileName"; + "/$BaseName"; mkdir "$DataDir/jobs/$JobKey"; mkdir "$DataDir/jobs/$JobKey/" . $self->GetKey(); - if (! copy($StagingFileName, $FinalFileName)) + if (!copy($StagingFileName, $FinalFileName)) { - return "Can't copy file from staging area: $!"; + return "Can't move the staging file: $!"; } unlink($StagingFileName); - $self->FileName($FileName); + $self->FileName($BaseName); $self->InStaging(!1); my ($ErrProperty, $ErrMessage) = $self->Save(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d50a3d9..574c160 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -839,7 +839,7 @@ sub OnSubmit { # This is a patch so add a build step... my $BuildStep = $Steps->Add(); - $BuildStep->FileName($FileNameRandomPart . " " . $self->GetParam("FileName")); + $BuildStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); $BuildStep->FileType($FileType); $BuildStep->InStaging(1); $BuildStep->Type("build"); @@ -888,7 +888,7 @@ sub OnSubmit } else { - $TestStep->FileName($FileNameRandomPart . " " . $self->GetParam("FileName")); + $TestStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); $TestStep->InStaging(1); } $TestStep->FileType("exe$Bits");

1 0

Francois Gouget : testbot/lib: Move staging files into place rather than copying them.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: tools Branch: master Commit: 71b945c8e59daf1139241ffaf1b1882a7b0573ae URL: http://source.winehq.org/git/tools.git/?a=commit;h=71b945c8e59daf1139241ffa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 16 15:50:09 2014 +0200 testbot/lib: Move staging files into place rather than copying them. --- testbot/lib/WineTestBot/Steps.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index bd60ed1..0431bc0 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -77,11 +77,10 @@ sub HandleStaging "/$BaseName"; mkdir "$DataDir/jobs/$JobKey"; mkdir "$DataDir/jobs/$JobKey/" . $self->GetKey(); - if (!copy($StagingFileName, $FinalFileName)) + if (!move($StagingFileName, $FinalFileName)) { - return "Can't move the staging file: $!"; + return "Could not move the staging file: $!"; } - unlink($StagingFileName); $self->FileName($BaseName); $self->InStaging(!1);

1 0

Jacek Caban : ieframe/tests: Fixed tests on IE11.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 5cc72a4522aa16a3f5713cf8fcafc58f840f0739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc72a4522aa16a3f5713cf8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:12:58 2014 +0200 ieframe/tests: Fixed tests on IE11. --- dlls/ieframe/tests/webbrowser.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4bf7949..12b349f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -455,6 +455,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 140: /* TODO (Win7) */ case 144: /* TODO */ case 178: /* IE11 */ + case 179: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -699,15 +700,16 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const V_VT(flags)); ok(V_VARIANTREF(flags) != NULL, "V_VARIANTREF(flags) == NULL)\n"); if(V_VARIANTREF(flags)) { + int f; + ok(V_VT(V_VARIANTREF(flags)) == VT_I4, "V_VT(V_VARIANTREF(flags))=%d, expected VT_I4\n", V_VT(V_VARIANTREF(flags))); - if(is_first_load) { - ok(V_I4(V_VARIANTREF(flags)) == 0, "V_I4(V_VARIANTREF(flags)) = %x, expected 0\n", - V_I4(V_VARIANTREF(flags))); - }else { - ok((V_I4(V_VARIANTREF(flags)) & ~0x40) == 0, "V_I4(V_VARIANTREF(flags)) = %x, expected 0x40 or 0\n", - V_I4(V_VARIANTREF(flags))); - } + f = V_I4(V_VARIANTREF(flags)); + f &= ~0x100; /* IE11 sets this flag */ + if(is_first_load) + ok(!f, "flags = %x, expected 0\n", V_I4(V_VARIANTREF(flags))); + else + ok(!(f & ~0x40), "flags = %x, expected 0x40 or 0\n", V_I4(V_VARIANTREF(flags))); } ok(V_VT(frame) == (VT_BYREF|VT_VARIANT), "V_VT(frame)=%x, expected VT_BYREF|VT_VARIANT\n", @@ -2736,7 +2738,7 @@ static void test_download(DWORD flags) test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0)|DWL_FROM_GOFORWARD)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2780,6 +2782,8 @@ static void test_download(DWORD flags) if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); + else if(flags & DWL_FROM_GOFORWARD) + CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { CHECK_CALLED(Invoke_BEFORENAVIGATE2); @@ -2951,10 +2955,12 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) SET_EXPECT(Invoke_BEFORENAVIGATE2); SET_EXPECT(Invoke_COMMANDSTATECHANGE); + SET_EXPECT(Invoke_PROPERTYCHANGE); hres = IWebBrowser2_GoBack(wb); ok(hres == S_OK, "GoBack failed: %08x\n", hres); CHECK_CALLED(Invoke_BEFORENAVIGATE2); todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); + CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ } static void test_go_forward(IWebBrowser2 *wb, const char *forward_url)

1 0

Piotr Caban : oleacc: Add WindowFromAccessibleObject implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6bd87c6bdbd91fb16fc6db746544adbfe57aa896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd87c6bdbd91fb16fc6db746… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:43 2014 +0200 oleacc: Add WindowFromAccessibleObject implementation. --- dlls/oleacc/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- dlls/oleacc/tests/main.c | 3 +++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 37d2269..9d5320e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -295,6 +295,40 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, return CreateStdAccessibleObject(hwnd, dwObjectID, riid, ppvObject); } +HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) +{ + IDispatch *parent; + IOleWindow *ow; + HRESULT hres; + + TRACE("%p %p\n", acc, phwnd); + + IAccessible_AddRef(acc); + while(1) { + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + IAccessible_Release(acc); + return hres; + } + + hres = IAccessible_get_accParent(acc, &parent); + IAccessible_Release(acc); + if(FAILED(hres)) + return hres; + if(hres!=S_OK || !parent) { + *phwnd = NULL; + return hres; + } + + hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc); + IDispatch_Release(parent); + if(FAILED(hres)) + return hres; + } +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 679ba1a..caeb6d3 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -19,4 +19,4 @@ @ stub LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) @ stdcall ObjectFromLresult(long ptr long ptr) -@ stub WindowFromAccessibleObject +@ stdcall WindowFromAccessibleObject(ptr ptr) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index dde2786..dbe8706 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -410,6 +410,9 @@ static void test_default_client_accessible_object(void) hr = IOleWindow_GetWindow(ow, &hwnd2); ok(hr == S_OK, "got %x\n", hr); ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + hr = WindowFromAccessibleObject(acc, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Jacek Caban : urlmon: Avoid ProtocolHandler being destroyed in Terminate call.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 54bf34f1e7cd916cfee8b4c383d7552296ae9a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bf34f1e7cd916cfee8b4c38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:56:51 2014 +0200 urlmon: Avoid ProtocolHandler being destroyed in Terminate call. --- dlls/urlmon/bindprot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 7f2bea1..1efb74c 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -698,6 +698,9 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD if(!This->reported_result) return E_FAIL; + /* This may get released in Terminate call. */ + IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); + IInternetProtocol_Terminate(This->protocol, 0); set_binding_sink(This, NULL, NULL); @@ -707,6 +710,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->bind_info = NULL; } + IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); return S_OK; }

1 0

Jacek Caban : mshtml/tests: Fixed a few more IE11 test failures.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 810d8c71408686a2deabb9ac07a13a2790372c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=810d8c71408686a2deabb9ac0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:32:32 2014 +0200 mshtml/tests: Fixed a few more IE11 test failures. --- dlls/mshtml/tests/htmldoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 24c6cac..11015e7 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2983,6 +2983,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 143: /* TODO */ case 144: /* TODO */ case 178: + case 179: return E_NOTIMPL; default: @@ -3162,7 +3163,9 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(puArgErr != NULL, "puArgErr == NULL\n"); ok(V_VT(pVarResult) == 0, "V_VT(pVarResult)=%d, expected 0\n", V_VT(pVarResult)); ok(wFlags == DISPATCH_PROPERTYGET, "wFlags=%08x, expected DISPATCH_PROPERTYGET\n", wFlags); - test_readyState(NULL); + + if(dispIdMember != DISPID_AMBIENT_SILENT && dispIdMember != DISPID_AMBIENT_OFFLINEIFNOTCONNECTED) + test_readyState(NULL); switch(dispIdMember) { case DISPID_AMBIENT_USERMODE:

1 0

Piotr Caban : oleacc: Add IOleWindow interface stub to default client accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8c808f3ee90966a86c0f9ca17e78b1fbe4662378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c808f3ee90966a86c0f9ca17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:13 2014 +0200 oleacc: Add IOleWindow interface stub to default client accessible object. --- dlls/oleacc/client.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/oleacc/tests/main.c | 5 ++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 8a48b36..8c3f011 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; + IOleWindow IOleWindow_iface; LONG ref; @@ -48,11 +49,16 @@ static HRESULT WINAPI Client_QueryInterface(IAccessible *iface, REFIID riid, voi IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IAccessible_AddRef(iface); - return S_OK; + }else if(IsEqualIID(riid, &IID_IOleWindow)) { + *ppv = &This->IOleWindow_iface; + }else { + WARN("no interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IAccessible_AddRef(iface); + return S_OK; } static ULONG WINAPI Client_AddRef(IAccessible *iface) @@ -439,6 +445,51 @@ static const IAccessibleVtbl ClientVtbl = { Client_put_accValue }; +static inline Client* impl_from_Client_OleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, Client, IOleWindow_iface); +} + +static HRESULT WINAPI Client_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_OleWindow_AddRef(IOleWindow *iface) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_OleWindow_Release(IOleWindow *iface) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +{ + Client *This = impl_from_Client_OleWindow(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + Client *This = impl_from_Client_OleWindow(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl ClientOleWindowVtbl = { + Client_OleWindow_QueryInterface, + Client_OleWindow_AddRef, + Client_OleWindow_Release, + Client_OleWindow_GetWindow, + Client_OleWindow_ContextSensitiveHelp +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -452,6 +503,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) return E_OUTOFMEMORY; client->IAccessible_iface.lpVtbl = &ClientVtbl; + client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; client->ref = 1; client->hwnd = hwnd; diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index d76dc79..3783d36 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -383,6 +383,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; + IOleWindow *ow; HWND chld, hwnd; HRESULT hr; VARIANT vid, v; @@ -404,6 +405,10 @@ static void test_default_client_accessible_object(void) hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); + hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + IOleWindow_Release(ow); + hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); ok(l == 1, "l = %d\n", l);

1 0

Piotr Caban : oleacc: Disable tests on old oleacc.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 94b721000a371668fcc12f80ebde01260155a943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b721000a371668fcc12f80e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:04 2014 +0200 oleacc: Disable tests on old oleacc. --- dlls/oleacc/tests/main.c | 71 ++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index be30da3..d76dc79 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -26,6 +26,21 @@ #include "initguid.h" #include <oleacc.h> +static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); + +static BOOL init(void) +{ + HMODULE oleacc = GetModuleHandleA("oleacc.dll"); + + pGetProcessHandleFromHwnd = (void*)GetProcAddress(oleacc, "GetProcessHandleFromHwnd"); + if(!pGetProcessHandleFromHwnd) { + win_skip("GetProcessHandleFromHwnd not available\n"); + return FALSE; + } + + return TRUE; +} + static void test_getroletext(void) { INT ret, role; @@ -38,9 +53,7 @@ static void test_getroletext(void) buf[0] = '*'; ret = GetRoleTextA(-1, buf, 2); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); - ok(buf[0] == 0 || - broken(buf[0] == '*'), /* Win98 and WinMe */ - "GetRoleTextA modified buffer on wrong role number\n"); + ok(buf[0] == 0, "GetRoleTextA doesn't return NULL char on wrong role number\n"); buf[0] = '*'; ret = GetRoleTextA(-1, buf, 0); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); @@ -51,9 +64,7 @@ static void test_getroletext(void) bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 2); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); - ok(bufW[0] == '\0' || - broken(bufW[0] == '*'), /* Win98 and WinMe */ - "GetRoleTextW doesn't return NULL char on wrong role number\n"); + ok(bufW[0] == '\0', "GetRoleTextW doesn't return NULL char on wrong role number\n"); bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 0); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); @@ -89,14 +100,9 @@ static void test_getroletext(void) ok(buf[0] == '\0', "GetRoleTextA returned not zero-length buffer\n"); buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 2); - ok(broken(ret == 1) || - ret == 0, /* Vista and W2K8 */ - "GetRoleTextA returned wrong length, got %d, expected 0 or 1\n", ret); - if (ret == 0) { - ok(!buf[0] || - broken(buf[0]!='*') /* WinXP */, - "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); - } + ok(!ret, "GetRoleTextA returned wrong length, got %d, expected 0\n", ret); + ok(!buf[0] || broken(buf[0]!='*') /* WinXP */, + "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); bufW[0] = '*'; ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 1); @@ -131,11 +137,7 @@ static void test_getroletext(void) memset(buff2, 0, sizeof(buff2)); ret = GetRoleTextA(role, NULL, 0); - /* Win98 up to W2K miss some of the roles */ - if (role >= ROLE_SYSTEM_SPLITBUTTON) - ok(ret > 0 || broken(ret == 0), "Expected the role %d to be present\n", role); - else - ok(ret > 0, "Expected the role to be present\n"); + ok(ret > 0, "Expected the role to be present\n"); GetRoleTextA(role, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2), @@ -176,12 +178,10 @@ static void test_GetStateText(void) ok(!ret, "got %d, expected 0\n", ret); ok(!buf[0], "buf[0] = '%c'\n", buf[0]); - for(i=0; i<30; i++) { + for(i=0; i<31; i++) { ret = GetStateTextW(1<<i, buf, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextW(1<<30, buf, 1024); - ok(ret || broken(!ret), "30) GetStateText failed\n"); ret = GetStateTextW(1<<31, buf, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); @@ -211,12 +211,10 @@ static void test_GetStateText(void) ok(!ret, "got %d, expected 0\n", ret); ok(!bufa[0], "bufa[0] = '%c'\n", bufa[0]); - for(i=0; i<30; i++) { + for(i=0; i<31; i++) { ret = GetStateTextA(1<<i, bufa, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextA(1<<30, bufa, 1024); - ok(ret || broken(!ret), "30) GetStateText failed\n"); ret = GetStateTextA(1<<31, bufa, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); } @@ -263,11 +261,9 @@ static void test_LresultFromObject(const char *name) ok(lres == E_INVALIDARG, "got %lx\n", lres); hres = ObjectFromLresult(0, &IID_IUnknown, 0, (void**)&unk); - ok(hres==MAKE_HRESULT(SEVERITY_ERROR,FACILITY_WIN32,ERROR_INVALID_ADDRESS) - || hres==E_FAIL, "got %x\n", hres); + ok(hres == E_FAIL, "got %x\n", hres); hres = ObjectFromLresult(0x10000, &IID_IUnknown, 0, (void**)&unk); - ok(hres==MAKE_HRESULT(SEVERITY_ERROR,FACILITY_WIN32,ERROR_INVALID_ADDRESS) - || hres==E_FAIL, "got %x\n", hres); + ok(hres == E_FAIL, "got %x\n", hres); ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); lres = LresultFromObject(&IID_IUnknown, 0, &Object); @@ -301,7 +297,7 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return 0; } - ok(wparam==0xffffffff || broken(wparam==0x8000), "wparam = %lx\n", wparam); + ok(wparam==0xffffffff, "wparam = %lx\n", wparam); if(lparam == (DWORD)OBJID_CURSOR) return E_UNEXPECTED; if(lparam == (DWORD)OBJID_CLIENT) @@ -364,17 +360,9 @@ static void test_AccessibleObjectFromWindow(void) static void test_GetProcessHandleFromHwnd(void) { - HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); HANDLE proc; HWND hwnd; - pGetProcessHandleFromHwnd = (void*)GetProcAddress( - GetModuleHandleA("oleacc.dll"), "GetProcessHandleFromHwnd"); - if(!pGetProcessHandleFromHwnd) { - win_skip("GetProcessHandleFromHwnd not available\n"); - return; - } - proc = pGetProcessHandleFromHwnd(NULL); ok(!proc, "proc = %p\n", proc); @@ -456,8 +444,8 @@ static void test_default_client_accessible_object(void) hr = IAccessible_get_accState(acc, vid, &v); ok(hr == S_OK, "got %x\n", hr); ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); - ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE) || - broken(V_I4(&v) == STATE_SYSTEM_INVISIBLE), "V_I4(&v) = %x\n", V_I4(&v)); + ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE), + "V_I4(&v) = %x\n", V_I4(&v)); str = (void*)0xdeadbeef; hr = IAccessible_get_accHelp(acc, vid, &str); @@ -580,6 +568,9 @@ START_TEST(main) int argc; char **argv; + if(!init()) + return; + CoInitializeEx(NULL, COINIT_MULTITHREADED); argc = winetest_get_mainargs(&argv);

1 0

Piotr Caban : oleacc: Add IOleWindow interface stub to default window accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 69ab9da0da71e880bf8f7908f575009d0cd65cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ab9da0da71e880bf8f7908f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:24 2014 +0200 oleacc: Add IOleWindow interface stub to default window accessible object. --- dlls/oleacc/window.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 45c53fc..f8090b5 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; + IOleWindow IOleWindow_iface; LONG ref; } Window; @@ -46,11 +47,16 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IAccessible_AddRef(iface); - return S_OK; + }else if(IsEqualIID(riid, &IID_IOleWindow)) { + *ppv = &This->IOleWindow_iface; + }else { + WARN("no interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IAccessible_AddRef(iface); + return S_OK; } static ULONG WINAPI Window_AddRef(IAccessible *iface) @@ -295,6 +301,51 @@ static const IAccessibleVtbl WindowVtbl = { Window_put_accValue }; +static inline Window* impl_from_Window_OleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, Window, IOleWindow_iface); +} + +static HRESULT WINAPI Window_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_OleWindow_AddRef(IOleWindow *iface) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_OleWindow_Release(IOleWindow *iface) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +{ + Window *This = impl_from_Window_OleWindow(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + Window *This = impl_from_Window_OleWindow(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl WindowOleWindowVtbl = { + Window_OleWindow_QueryInterface, + Window_OleWindow_AddRef, + Window_OleWindow_Release, + Window_OleWindow_GetWindow, + Window_OleWindow_ContextSensitiveHelp +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -308,6 +359,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) return E_OUTOFMEMORY; window->IAccessible_iface.lpVtbl = &WindowVtbl; + window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->ref = 1; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj);

1 0

Piotr Caban : oleacc: Add IOleWindow:: GetWindow implementation in default client accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 25312a10d35e9b45c485dba78c9c36fb79abb32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=25312a10d35e9b45c485dba78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:37 2014 +0200 oleacc: Add IOleWindow::GetWindow implementation in default client accessible object. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 8c3f011..cc7b53a 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -471,8 +471,11 @@ static ULONG WINAPI Client_OleWindow_Release(IOleWindow *iface) static HRESULT WINAPI Client_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) { Client *This = impl_from_Client_OleWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI Client_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 3783d36..dde2786 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -384,7 +384,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; IOleWindow *ow; - HWND chld, hwnd; + HWND chld, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -407,6 +407,9 @@ static void test_default_client_accessible_object(void) hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Jacek Caban : msctf: Added IEnumTfInputProcessorProfiles interface stub implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 645cdf9dc31c226caa3b1cb6b7a8d881979e122d URL: http://source.winehq.org/git/wine.git/?a=commit;h=645cdf9dc31c226caa3b1cb6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 16:52:30 2014 +0200 msctf: Added IEnumTfInputProcessorProfiles interface stub implementation. --- dlls/msctf/inputprocessor.c | 113 ++++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 11 +++- 2 files changed, 119 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index f1595f8..89eb746 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -97,9 +97,107 @@ typedef struct tagEnumTfLanguageProfiles { ITfCategoryMgr *catmgr; } EnumTfLanguageProfiles; +typedef struct { + IEnumTfInputProcessorProfiles IEnumTfInputProcessorProfiles_iface; + LONG ref; +} EnumTfInputProcessorProfiles; + static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut); static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut); +static inline EnumTfInputProcessorProfiles *impl_from_IEnumTfInputProcessorProfiles(IEnumTfInputProcessorProfiles *iface) +{ + return CONTAINING_RECORD(iface, EnumTfInputProcessorProfiles, IEnumTfInputProcessorProfiles_iface); +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_QueryInterface(IEnumTfInputProcessorProfiles *iface, + REFIID riid, void **ppv) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumTfInputProcessorProfiles_iface; + }else if(IsEqualGUID(riid, &IID_IEnumTfInputProcessorProfiles)) { + TRACE("(%p)->(IID_IEnumTfInputProcessorProfiles %p)\n", This, ppv); + *ppv = &This->IEnumTfInputProcessorProfiles_iface; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumTfInputProcessorProfiles_AddRef(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumTfInputProcessorProfiles_Release(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Clone(IEnumTfInputProcessorProfiles *iface, + IEnumTfInputProcessorProfiles **ret) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)->(%p)\n", This, ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Next(IEnumTfInputProcessorProfiles *iface, ULONG count, + TF_INPUTPROCESSORPROFILE *profile, ULONG *fetch) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + + FIXME("(%p)->(%u %p %p)\n", This, count, profile, fetch); + + if(fetch) + *fetch = 0; + return S_FALSE; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Reset(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Skip(IEnumTfInputProcessorProfiles *iface, ULONG count) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)->(%u)\n", This, count); + return E_NOTIMPL; +} + +static const IEnumTfInputProcessorProfilesVtbl EnumTfInputProcessorProfilesVtbl = { + EnumTfInputProcessorProfiles_QueryInterface, + EnumTfInputProcessorProfiles_AddRef, + EnumTfInputProcessorProfiles_Release, + EnumTfInputProcessorProfiles_Clone, + EnumTfInputProcessorProfiles_Next, + EnumTfInputProcessorProfiles_Reset, + EnumTfInputProcessorProfiles_Skip +}; + static inline InputProcessorProfiles *impl_from_ITfInputProcessorProfiles(ITfInputProcessorProfiles *iface) { return CONTAINING_RECORD(iface, InputProcessorProfiles, ITfInputProcessorProfiles_iface); @@ -742,8 +840,19 @@ static HRESULT WINAPI InputProcessorProfileMgr_EnumProfiles(ITfInputProcessorPro IEnumTfInputProcessorProfiles **ppEnum) { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); - FIXME("(%p)->(%x %p)\n", This, langid, ppEnum); - return E_NOTIMPL; + EnumTfInputProcessorProfiles *enum_profiles; + + TRACE("(%p)->(%x %p)\n", This, langid, ppEnum); + + enum_profiles = HeapAlloc(GetProcessHeap(), 0, sizeof(*enum_profiles)); + if(!enum_profiles) + return E_OUTOFMEMORY; + + enum_profiles->IEnumTfInputProcessorProfiles_iface.lpVtbl = &EnumTfInputProcessorProfilesVtbl; + enum_profiles->ref = 1; + + *ppEnum = &enum_profiles->IEnumTfInputProcessorProfiles_iface; + return S_OK; } static HRESULT WINAPI InputProcessorProfileMgr_ReleaseInputProcessor(ITfInputProcessorProfileMgr *iface, REFCLSID rclsid, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f457dbb..8a052b3 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2186,15 +2186,20 @@ static void test_AssociateFocus(void) sink_check_ok(&test_OnPopContext,"OnPopContext"); } -static void test_QI(void) +static void test_profile_mgr(void) { + IEnumTfInputProcessorProfiles *enum_profiles; ITfInputProcessorProfileMgr *ipp_mgr; HRESULT hres; - /* A trivial test, probably worth moving once more will be added. */ hres = ITfInputProcessorProfiles_QueryInterface(g_ipp, &IID_ITfInputProcessorProfileMgr, (void**)&ipp_mgr); ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08x\n", hres); + hres = ITfInputProcessorProfileMgr_EnumProfiles(ipp_mgr, 0, &enum_profiles); + ok(hres == S_OK, "EnumProfiles failed: %08x\n", hres); + + IEnumTfInputProcessorProfiles_Release(enum_profiles); + ITfInputProcessorProfileMgr_Release(ipp_mgr); } @@ -2224,7 +2229,7 @@ START_TEST(inputprocessor) test_ThreadMgrUnadviseSinks(); test_UnregisterCategory(); test_Unregister(); - test_QI(); + test_profile_mgr(); } else skip("Unable to create InputProcessor\n");

1 0

Martin Storsjo : ntdll: Align FILE_*_DIRECTORY_INFORMATION structs to 8 bytes.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8cb42d41351377415749008de2b6f00593309b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb42d41351377415749008de… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 15 15:25:05 2014 +0300 ntdll: Align FILE_*_DIRECTORY_INFORMATION structs to 8 bytes. --- dlls/ntdll/directory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 50bf66a..04a5b75 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -228,15 +228,15 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned switch (class) { case FileDirectoryInformation: - return (FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileBothDirectoryInformation: - return (FIELD_OFFSET( FILE_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileFullDirectoryInformation: - return (FIELD_OFFSET( FILE_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileIdBothDirectoryInformation: - return (FIELD_OFFSET( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileIdFullDirectoryInformation: - return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; default: assert(0); return 0;

1 0

Alexandre Julliard : d3d10: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 29fcb82b94d584939c11f757c4514f8d5e8074c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fcb82b94d584939c11f757c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:23 2014 +0200 d3d10: Remove unnecessary DllMain implementation. --- dlls/d3d10/d3d10_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6d4d626..12c97ce 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,18 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) {

1 0

Alexandre Julliard : d3d9: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 64082aebc5d3124e7248eb9e53f09f26065cc470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64082aebc5d3124e7248eb9e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:16 2014 +0200 d3d9: Remove unnecessary DllMain implementation. --- dlls/d3d9/d3d9_main.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 8796733..0afdc04 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -90,17 +90,6 @@ void* WINAPI Direct3DShaderValidatorCreate9(void) return NULL; } -/******************************************************************* - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - if (reason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(inst); - - return TRUE; -} - /*********************************************************************** * D3DPERF_BeginEvent (D3D9.@) */

1 0

Hans Leidekker : winhttp: Add support for retrieving the proxy automatic configuration URL on Mac OS X.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 50c710bd914ee7197f234472523f86cd6c651a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c710bd914ee7197f2344725… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:06:02 2014 +0200 winhttp: Add support for retrieving the proxy automatic configuration URL on Mac OS X. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/session.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 948e0ed..7fbe2a7 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -2,7 +2,7 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 -EXTRALIBS = $(SOCKET_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e773f05..f2ed72b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -23,6 +23,15 @@ #include <stdarg.h> #include <stdlib.h> +#ifdef HAVE_CORESERVICES_CORESERVICES_H +#define GetCurrentThread MacGetCurrentThread +#define LoadResource MacLoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource +#undef DPRINTF +#endif + #include "windef.h" #include "winbase.h" #ifndef __MINGW32__ @@ -1286,12 +1295,42 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) return ret; } +static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen ) +{ +#ifdef HAVE_CORESERVICES_CORESERVICES_H + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + const void *ref; + BOOL ret = FALSE; + + if (!settings) return FALSE; + + if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) + { + CFRelease( settings ); + return FALSE; + } + if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + { + TRACE( "returning %s\n", debugstr_a(buf) ); + ret = TRUE; + } + CFRelease( settings ); + return ret; +#else + FIXME( "no support on this platform\n" ); + return FALSE; +#endif +} + +#define INTERNET_MAX_URL_LENGTH 2084 + /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) { BOOL ret = FALSE; + char system_url[INTERNET_MAX_URL_LENGTH + 1]; TRACE("0x%08x, %p\n", flags, url); @@ -1300,6 +1339,14 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } + if (get_system_proxy_autoconfig_url( system_url, sizeof(system_url) )) + { + WCHAR *urlW; + + if (!(urlW = strdupAW( system_url ))) return FALSE; + *url = urlW; + return TRUE; + } if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) { static int fixme_shown;

1 0

Piotr Caban : oleacc: Modify output buffer on incorrect role in GetRoleTextA.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 1f6ade45c1f7546e4f66378793af2feb79824c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6ade45c1f7546e4f6637879… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:52:33 2014 +0200 oleacc: Modify output buffer on incorrect role in GetRoleTextA. --- dlls/oleacc/main.c | 8 +++++++- dlls/oleacc/tests/main.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 89c0142..3634991 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -373,9 +373,15 @@ UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax) TRACE("%u %p %u\n", role, lpRole, rolemax); + if(lpRole && !rolemax) + return 0; + length = GetRoleTextW(role, NULL, 0); - if((length == 0) || (lpRole && !rolemax)) + if(!length) { + if(lpRole && rolemax) + lpRole[0] = 0; return 0; + } roletextW = HeapAlloc(GetProcessHeap(), 0, (length + 1)*sizeof(WCHAR)); if(!roletextW) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 76ea969..121a5d7 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -38,8 +38,8 @@ static void test_getroletext(void) buf[0] = '*'; ret = GetRoleTextA(-1, buf, 2); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); - ok(buf[0] == '*' || - broken(buf[0] == 0), /* Win98 and WinMe */ + ok(buf[0] == 0 || + broken(buf[0] == '*'), /* Win98 and WinMe */ "GetRoleTextA modified buffer on wrong role number\n"); buf[0] = '*'; ret = GetRoleTextA(-1, buf, 0); @@ -75,6 +75,14 @@ static void test_getroletext(void) ok(ret > 0, "GetRoleTextW doesn't return length on NULL buffer, got %d\n", ret); /* use a smaller buffer */ + bufW[0] = '*'; + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 0); + ok(!ret, "GetRoleTextA doesn't return 0, got %d\n", ret); + ok(buf[0] == '*', "GetRoleTextA modified buffer\n"); + buffW = NULL; + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, (WCHAR*)&buffW, 0); + ok(ret, "GetRoleTextW doesn't return length\n"); + ok(buffW != NULL, "GetRoleTextW doesn't modify buffer\n"); buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 1); ok(ret == 0, "GetRoleTextA returned wrong length\n");

1 0

Piotr Caban : oleacc: Don' t return partial data in GetRoleTextA if buffer is too small.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: dccc4283a7848eafc53d99512bc39d1d8bacb018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dccc4283a7848eafc53d99512… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:52:52 2014 +0200 oleacc: Don't return partial data in GetRoleTextA if buffer is too small. --- dlls/oleacc/main.c | 6 ++++++ dlls/oleacc/tests/main.c | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 3634991..37d2269 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -396,6 +396,12 @@ UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax) return length - 1; } + if(rolemax < length) { + HeapFree(GetProcessHeap(), 0, roletextW); + lpRole[0] = 0; + return 0; + } + WideCharToMultiByte( CP_ACP, 0, roletextW, -1, lpRole, rolemax, NULL, NULL ); if(rolemax < length){ diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 121a5d7..be30da3 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -87,13 +87,16 @@ static void test_getroletext(void) ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 1); ok(ret == 0, "GetRoleTextA returned wrong length\n"); ok(buf[0] == '\0', "GetRoleTextA returned not zero-length buffer\n"); - buf[1] = '*'; + buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 2); - ok(ret == 1 || + ok(broken(ret == 1) || ret == 0, /* Vista and W2K8 */ "GetRoleTextA returned wrong length, got %d, expected 0 or 1\n", ret); - if (ret == 1) - ok(buf[1] == '\0', "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[1]); + if (ret == 0) { + ok(!buf[0] || + broken(buf[0]!='*') /* WinXP */, + "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); + } bufW[0] = '*'; ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 1);

1 0

Stefan Dösinger : wined3d: Fix indentation in d3dfmt_p8_init_palette.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: bdc396e4f5115b9f01037b37fac943bf81c8f8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc396e4f5115b9f01037b37f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 15 14:33:14 2014 +0200 wined3d: Fix indentation in d3dfmt_p8_init_palette. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 023439d..f198bf0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3380,7 +3380,8 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 FIXME("No palette set.\n"); /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if * there's no palette at this time. */ - for (i = 0; i < 256; i++) table[i][3] = i; + for (i = 0; i < 256; i++) + table[i][3] = i; } else {

1 0

Nikolay Sivov : xmllite/reader: Create reader input with same IMalloc as reader.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 0ae578b71cb1319f61415ef5644f2c1fbe8e9159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae578b71cb1319f61415ef56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 14 21:53:55 2014 +0400 xmllite/reader: Create reader input with same IMalloc as reader. --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index deb2d2e..d8b81ea 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2517,7 +2517,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) { /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, - NULL, NULL, FALSE, NULL, &readerinput); + This->imalloc, NULL, FALSE, NULL, &readerinput); if (hr != S_OK) return hr; This->input = impl_from_IXmlReaderInput(readerinput); }

1 0

Martin Storsjo : ntdll: Don' t write uninitialized bytes at the end of filenames.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 114444ca9cc1f855febfd6ae9c28cc8b69172f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114444ca9cc1f855febfd6ae9… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 15 15:25:04 2014 +0300 ntdll: Don't write uninitialized bytes at the end of filenames. --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 890fb71..50bf66a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1484,7 +1484,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK assert(0); return NULL; } - memcpy( filename, long_nameW, total_len - ((char *)filename - (char *)info) ); + memcpy( filename, long_nameW, long_len * sizeof(WCHAR) ); io->Information += total_len; return info; }

1 0

Jacek Caban : oleaut32: Use debugstr_variant in variant.c where appropriate.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 9677454f7d80483be6e6d8297d9f01f99d70217e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9677454f7d80483be6e6d8297… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 14:55:36 2014 +0200 oleaut32: Use debugstr_variant in variant.c where appropriate. --- dlls/oleaut32/variant.c | 110 ++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9677454f7d80483be6e6d…

1 0

Huw Davies : wininet/tests: Don't test GetLastError() on success.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: fec1ed454ce4ccc136c66511404975b9fcb1d503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec1ed454ce4ccc136c665114… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 14:06:05 2014 +0100 wininet/tests: Don't test GetLastError() on success. --- dlls/wininet/tests/url.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index e1f8612..3e9a1d4 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -851,12 +851,9 @@ static void InternetCreateUrlA_test(void) /* alloc-ed szUrl, NULL lpszScheme * shows that it uses nScheme instead */ - SetLastError(0xdeadbeef); urlComp.lpszScheme = NULL; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); @@ -864,48 +861,36 @@ static void InternetCreateUrlA_test(void) * any nScheme out of range seems ignored */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.nScheme = -3; len++; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); /* test valid lpUrlComponents, alloc-ed szUrl */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(strstr(szUrl, "80") == NULL, "Didn't expect to find 80 in szUrl\n"); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); /* valid username, NULL password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszPassword = NULL; len = 42; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 41, "Expected len 41, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL2), "Expected %s, got %s\n", CREATE_URL2, szUrl); /* valid username, empty password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszPassword = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL3, szUrl); @@ -927,39 +912,30 @@ static void InternetCreateUrlA_test(void) * if password is provided, username has to exist */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl); /* NULL username, NULL password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = NULL; urlComp.lpszPassword = NULL; len = 42; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 32, "Expected len 32, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL4, szUrl); /* empty username, empty password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = empty; urlComp.lpszPassword = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl);

1 0

Alexandre Julliard : d3d10_1: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: c5b19d4ad0e9000f5479c174c8e63e3fd7408cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b19d4ad0e9000f5479c174c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:28 2014 +0200 d3d10_1: Remove unnecessary DllMain implementation. --- dlls/d3d10_1/d3d10_1_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index 721fe7d..a619004 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -63,18 +63,6 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) {

1 0

Alexandre Julliard : d3d8: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 4df26c56d832e94d138009bc28bb87701f1822c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df26c56d832e94d138009bc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:12 2014 +0200 d3d8: Remove unnecessary DllMain implementation. --- dlls/d3d8/d3d8_main.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 2b6ada4..8ac704c 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -56,15 +56,6 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) return &object->IDirect3D8_iface; } -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - if (reason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(inst); - - return TRUE; -} - /*********************************************************************** * ValidateVertexShader (D3D8.@) *

1 0

Alexandre Julliard : dciman32: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 16352f0aeeb4a5429a9b9b78f75baa20cefd564d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16352f0aeeb4a5429a9b9b78f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:14 2014 +0200 dciman32: Remove unnecessary DllMain implementation. --- dlls/dciman32/dciman_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/dciman32/dciman_main.c b/dlls/dciman32/dciman_main.c index 2287c78..c693492 100644 --- a/dlls/dciman32/dciman_main.c +++ b/dlls/dciman32/dciman_main.c @@ -31,18 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dciman); /*********************************************************************** - * DllEntryPoint (DCIMAN32.@) - * - * DCIMAN32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - -/*********************************************************************** * DCIOpenProvider (DCIMAN32.@) */ HDC WINAPI

1 0

Alexandre Julliard : advpack: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 0289ea0e43ad099db86642e1776313c8b5ac36c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0289ea0e43ad099db86642e17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:03 2014 +0200 advpack: Remove unnecessary DllMain implementation. --- dlls/advpack/advpack.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 296abb5..83dda08 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -208,19 +208,6 @@ HRESULT WINAPI CloseINFEngine(HINF hInf) } /*********************************************************************** - * DllMain (ADVPACK.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -} - -/*********************************************************************** * IsNTAdmin (ADVPACK.@) * * Checks if the user has admin privileges.

1 0

Alexandre Julliard : msimg32: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 693faf2a7d47f1886cdb005e0f7ca296a71e05c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693faf2a7d47f1886cdb005e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:20 2014 +0200 msimg32: Remove unnecessary DllMain implementation. --- dlls/msimg32/msimg32_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/msimg32/msimg32_main.c b/dlls/msimg32/msimg32_main.c index 9e859c8..34beb3c 100644 --- a/dlls/msimg32/msimg32_main.c +++ b/dlls/msimg32/msimg32_main.c @@ -26,18 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimg32); -/*********************************************************************** - * DllInitialize (MSIMG32.@) - * - * MSIMG32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - /****************************************************************************** * vSetDdrawflag (MSIMG32.@) */

1 0

Alexandre Julliard : wintrust: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6eb922f1d461d0afcc5e3d4e547e4a4bd6e512d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb922f1d461d0afcc5e3d4e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:25 2014 +0200 wintrust: Remove unnecessary DllMain implementation. --- dlls/wintrust/wintrust_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 9b8dd85..58e3ac3 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -59,20 +59,6 @@ void WINAPI WINTRUST_Free(void *p) } /*********************************************************************** - * DllMain (WINTRUST.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - -/*********************************************************************** * TrustIsCertificateSelfSigned (WINTRUST.@) */ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert )

1 0

Stefan Dösinger : wined3d: Move get_dc palette updates to ddraw.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: fd0189bbfa1ccc3832aaf01fb61a15fbc6ee9e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0189bbfa1ccc3832aaf01fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 15 16:13:31 2014 +0200 wined3d: Move get_dc palette updates to ddraw. --- dlls/ddraw/ddraw_private.h | 7 +++++++ dlls/ddraw/device.c | 5 +---- dlls/ddraw/surface.c | 19 +++++++++++++++++-- dlls/wined3d/palette.c | 6 ++++++ dlls/wined3d/surface.c | 27 +-------------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2bf8132..8cc5201 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -575,6 +575,13 @@ void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN void multiply_matrix(D3DMATRIX *dst, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; +static inline BOOL format_is_paletteindexed(const DDPIXELFORMAT *fmt) +{ + DWORD flags = DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 + | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8; + return !!(fmt->dwFlags & flags); +} + /* Used for generic dumping */ struct flag_info { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e184cfd..4f270fd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1798,10 +1798,7 @@ static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, ID static BOOL validate_surface_palette(struct ddraw_surface *surface) { - return !(surface->surface_desc.u4.ddpfPixelFormat.dwFlags - & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 - | DDPF_PALETTEINDEXEDTO8)) + return !format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat) || surface->palette; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2efc98c..3f230a2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -461,8 +461,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD return DDERR_INVALIDSURFACETYPE; } - if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) + if (!format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) return DDERR_INVALIDPIXELFORMAT; wined3d_mutex_lock(); @@ -2017,6 +2016,22 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc) hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) hr = wined3d_surface_getdc(surface->wined3d_surface, hdc); + + if (SUCCEEDED(hr) && format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) + { + const struct ddraw_palette *palette; + + if (surface->palette) + palette = surface->palette; + else if (surface->ddraw->primary) + palette = surface->ddraw->primary->palette; + else + palette = NULL; + + if (palette) + wined3d_palette_apply_to_dc(palette->wineD3DPalette, *hdc); + } + wined3d_mutex_unlock(); switch(hr) { diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index e103b5b..24b344c 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -83,6 +83,12 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, return WINED3D_OK; } +void CDECL wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc) +{ + if (SetDIBColorTable(dc, 0, 256, palette->colors) != 256) + ERR("Failed to set DIB color table.\n"); +} + HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dea27ab..023439d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1378,7 +1378,7 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) /* Tell the swapchain to update the screen. */ if (surface->swapchain && surface == surface->swapchain->front_buffer) { - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); + wined3d_palette_apply_to_dc(palette, surface->hDC); x11_copy_to_screen(surface->swapchain, NULL); } } @@ -3122,31 +3122,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) surface_load_location(surface, WINED3D_LOCATION_DIB); surface_invalidate_location(surface, ~WINED3D_LOCATION_DIB); - if (surface->resource.format->id == WINED3DFMT_P8_UINT - || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) - { - /* GetDC on palettized formats is unsupported in D3D9, and the method - * is missing in D3D8, so this should only be used for DX <=7 - * surfaces (with non-device palettes). */ - const RGBQUAD *colors = NULL; - - if (surface->palette) - { - colors = surface->palette->colors; - } - else - { - struct wined3d_swapchain *swapchain = surface->resource.device->swapchains[0]; - struct wined3d_surface *dds_primary = swapchain->front_buffer; - - if (dds_primary && dds_primary->palette) - colors = dds_primary->palette->colors; - } - - if (colors) - SetDIBColorTable(surface->hDC, 0, 256, colors); - } - surface->flags |= SFLAG_DCINUSE; surface->resource.map_count++; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 41b3158..f1a45dd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -160,6 +160,7 @@ @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) +@ cdecl wined3d_palette_apply_to_dc(ptr ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db36fbf..328b595 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2261,6 +2261,7 @@ HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flag ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries); +void __cdecl wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries);

1 0

Nikolay Sivov : xmllite/writer: Implement Flush() method.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: caeecfa223013941f44e9974a51f9bb3bd2b2a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caeecfa223013941f44e9974a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:50:31 2014 +0400 xmllite/writer: Implement Flush() method. --- dlls/xmllite/tests/writer.c | 14 +++++++------- dlls/xmllite/writer.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2fcd5f2..b6b8fe3 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -170,24 +170,24 @@ static void test_writestartdocument(void) hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); ok(hr == S_OK, "got 0x%08x\n", hr); + /* nothing written yet */ + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_Flush(writer); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == E_NOTIMPL) - { - IStream_Release(stream); - IXmlWriter_Release(writer); - return; - } hr = GetHGlobalFromStream(stream, &hglobal); ok(hr == S_OK, "got 0x%08x\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 745da79..0a1d361 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -2,6 +2,7 @@ * IXmlWriter implementation * * Copyright 2011 Alistair Leslie-Hughes + * Copyright 2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -62,6 +63,7 @@ typedef struct IMalloc *imalloc; xml_encoding encoding; struct output_buffer buffer; + ULONG stream_written; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -223,6 +225,11 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } +static inline void reset_output_buffer(xmlwriteroutput *output) +{ + output->stream_written = 0; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -243,6 +250,31 @@ static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutpu return hr; } +static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) +{ + struct output_buffer *buffer; + ULONG written = 0, len; + HRESULT hr; + + if (!output || !output->stream) + return S_OK; + + buffer = &output->buffer; + + len = buffer->written - output->stream_written; + if (!len) + return S_OK; + + hr = ISequentialStream_Write(output->stream, buffer->data + output->stream_written, len, &written); + if (FAILED(hr)) { + WARN("write to stream failed (0x%08x)\n", hr); + return hr; + } + + output->stream_written += written; + return S_OK; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -295,6 +327,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) TRACE("(%p)->(%p)\n", This, output); if (This->output) { + reset_output_buffer(This->output); writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; @@ -662,9 +695,9 @@ static HRESULT WINAPI xmlwriter_Flush(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p\n", This); + TRACE("%p\n", This); - return E_NOTIMPL; + return writeroutput_flush_stream(This->output); } static const struct IXmlWriterVtbl xmlwriter_vtbl = @@ -825,6 +858,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); writeroutput->stream = NULL; + writeroutput->stream_written = 0; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface);

1 0

Nikolay Sivov : xmllite/writer: Initial support for starting a document.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a0f67c36956dd8998a0e79e675fcc7d7151b2dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f67c36956dd8998a0e79e67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:49:37 2014 +0400 xmllite/writer: Initial support for starting a document. --- dlls/xmllite/reader.c | 13 ++-- dlls/xmllite/tests/writer.c | 20 ++++-- dlls/xmllite/writer.c | 154 +++++++++++++++++++++++++++++++++++++--- dlls/xmllite/xmllite_private.h | 9 +++ 4 files changed, 175 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f67c36956dd8998a0e7…

1 0

Nikolay Sivov : xmllite/writer: Initial support of output buffer creation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 71ab66efa04f80ef788a485295f10dd9e0d48191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ab66efa04f80ef788a48529… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:47:26 2014 +0400 xmllite/writer: Initial support of output buffer creation. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/writer.c | 83 ++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 48 +++++++++++++++++++++++ dlls/xmllite/xmllite_private.h | 3 +- 4 files changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d8b81ea..e772a08 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -554,7 +554,7 @@ static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) readerinput_free(input, buffer->data); } -static HRESULT get_code_page(xml_encoding encoding, UINT *cp) +HRESULT get_code_page(xml_encoding encoding, UINT *cp) { if (encoding == XmlEncoding_Unknown) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 738844f..0f86fb9 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -143,6 +143,88 @@ static void test_writeroutput(void) IUnknown_Release(output); } +static void test_writestartdocument(void) +{ + static const char fullprolog[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; + static const char prologversion[] = "<?xml version=\"1.0\"?>"; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriter *writer; + HGLOBAL hglobal; + IStream *stream; + HRESULT hr; + char *ptr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* output not set */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); +todo_wine + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + if (hr == E_NOTIMPL) { + IXmlWriter_Release(writer); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + 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, fullprolog, strlen(fullprolog)), "got %s, expected %s\n", ptr, fullprolog); + GlobalUnlock(hglobal); + + /* one more time */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + IStream_Release(stream); + + /* now add PI manually, and try to start a document */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + 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); + + /* another attempt to add 'xml' PI */ + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == WR_E_INVALIDACTION, "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, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IStream_Release(stream); + IXmlWriter_Release(writer); +} + START_TEST(writer) { if (!init_pointers()) @@ -150,4 +232,5 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); + test_writestartdocument(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 2432602..10d73cb 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -34,6 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); +struct output_buffer +{ + char *data; + unsigned int allocated; + unsigned int written; + UINT codepage; +}; + typedef struct { IXmlWriterOutput IXmlWriterOutput_iface; @@ -42,6 +50,7 @@ typedef struct ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; + struct output_buffer buffer; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -107,6 +116,36 @@ static inline void writer_free(xmlwriter *writer, void *mem) m_free(writer->imalloc, mem); } +static HRESULT init_output_buffer(xmlwriteroutput *output) +{ + struct output_buffer *buffer = &output->buffer; + const int initial_len = 0x2000; + HRESULT hr; + UINT cp; + + hr = get_code_page(output->encoding, &cp); + if (FAILED(hr)) return hr; + + buffer->data = writeroutput_alloc(output, initial_len); + if (!buffer->data) return E_OUTOFMEMORY; + + memset(buffer->data, 0, 4); + buffer->allocated = initial_len; + buffer->written = 0; + buffer->codepage = cp; + + return S_OK; +} + +static void free_output_buffer(xmlwriteroutput *output) +{ + struct output_buffer *buffer = &output->buffer; + writeroutput_free(output, buffer->data); + buffer->data = NULL; + buffer->allocated = 0; + buffer->written = 0; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -572,6 +611,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) IMalloc *imalloc = This->imalloc; if (This->output) IUnknown_Release(This->output); if (This->stream) ISequentialStream_Release(This->stream); + free_output_buffer(This); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -627,11 +667,14 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IXmlWriterOutput **output) { xmlwriteroutput *writeroutput; + HRESULT hr; TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); if (!stream || !output) return E_INVALIDARG; + *output = NULL; + if (imalloc) writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); else @@ -644,6 +687,11 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding, -1); writeroutput->stream = NULL; + hr = init_output_buffer(writeroutput); + if (FAILED(hr)) { + IUnknown_Release(&writeroutput->IXmlWriterOutput_iface); + return hr; + } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 96a78fa..642aabe 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -60,6 +60,7 @@ typedef enum XmlEncoding_Unknown } xml_encoding; -xml_encoding parse_encoding_name(const WCHAR *name, int len) DECLSPEC_HIDDEN; +xml_encoding parse_encoding_name(const WCHAR*,int) DECLSPEC_HIDDEN; +HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; #endif /* __XMLLITE_PRIVATE__ */

1 0

Hans Leidekker : winhttp: Reimplement WinHttpGetProxyForUrl on top of jsproxy.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 552225632827ffe66a3a8f4045628cc8762b1a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=552225632827ffe66a3a8f404… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:48 2014 +0200 winhttp: Reimplement WinHttpGetProxyForUrl on top of jsproxy. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/pac.js | 244 ----------------------- dlls/winhttp/rsrc.rc | 3 - dlls/winhttp/session.c | 484 ++++++---------------------------------------- 4 files changed, 58 insertions(+), 675 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552225632827ffe66a3a8…

1 0

Frédéric Delanoy : oleacc: Add message context for object state string resources.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d1dbc024b5c8ba0b9d6b539cd1a47562a34e6e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dbc024b5c8ba0b9d6b539cd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 15 09:14:59 2014 +0200 oleacc: Add message context for object state string resources. --- dlls/oleacc/oleacc.rc | 64 ++++++++++++++++++++++++------------------------- po/ar.po | 44 +++++++++++++++++++++++++++++++--- po/bg.po | 45 ++++++++++++++++++++++++++++++---- po/ca.po | 44 +++++++++++++++++++++++++++++++--- po/cs.po | 44 +++++++++++++++++++++++++++++++--- po/da.po | 44 +++++++++++++++++++++++++++++++--- po/de.po | 44 +++++++++++++++++++++++++++++++--- po/el.po | 42 +++++++++++++++++++++++++++++--- po/en.po | 32 +++++++++++++++++++++++++ po/en_US.po | 32 +++++++++++++++++++++++++ po/eo.po | 48 +++++++++++++++++++++++++++++++++---- po/es.po | 44 +++++++++++++++++++++++++++++++--- po/fa.po | 41 ++++++++++++++++++++++++++++--- po/fi.po | 44 +++++++++++++++++++++++++++++++--- po/fr.po | 44 +++++++++++++++++++++++++++++++--- po/he.po | 48 +++++++++++++++++++++++++++++++++---- po/hi.po | 32 +++++++++++++++++++++++++ po/hr.po | 44 +++++++++++++++++++++++++++++++--- po/hu.po | 44 +++++++++++++++++++++++++++++++--- po/it.po | 44 +++++++++++++++++++++++++++++++--- po/ja.po | 44 +++++++++++++++++++++++++++++++--- po/ko.po | 44 +++++++++++++++++++++++++++++++--- po/lt.po | 44 +++++++++++++++++++++++++++++++--- po/ml.po | 32 +++++++++++++++++++++++++ po/nb_NO.po | 44 +++++++++++++++++++++++++++++++--- po/nl.po | 44 +++++++++++++++++++++++++++++++--- po/or.po | 32 +++++++++++++++++++++++++ po/pa.po | 32 +++++++++++++++++++++++++ po/pl.po | 44 +++++++++++++++++++++++++++++++--- po/pt_BR.po | 44 +++++++++++++++++++++++++++++++--- po/pt_PT.po | 44 +++++++++++++++++++++++++++++++--- po/rm.po | 35 ++++++++++++++++++++++++++- po/ro.po | 44 +++++++++++++++++++++++++++++++--- po/ru.po | 44 +++++++++++++++++++++++++++++++--- po/sk.po | 43 ++++++++++++++++++++++++++++++--- po/sl.po | 44 +++++++++++++++++++++++++++++++--- po/sr_RS(a)cyrillic.po | 47 ++++++++++++++++++++++++++++++++---- po/sr_RS(a)latin.po | 47 ++++++++++++++++++++++++++++++++---- po/sv.po | 44 +++++++++++++++++++++++++++++++--- po/te.po | 32 +++++++++++++++++++++++++ po/th.po | 48 +++++++++++++++++++++++++++++++++---- po/tr.po | 44 +++++++++++++++++++++++++++++++--- po/uk.po | 44 +++++++++++++++++++++++++++++++--- po/wa.po | 44 ++++++++++++++++++++++++++++++---- po/wine.pot | 32 +++++++++++++++++++++++++ po/zh_CN.po | 48 +++++++++++++++++++++++++++++++++---- po/zh_TW.po | 44 +++++++++++++++++++++++++++++++--- 47 files changed, 1847 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1dbc024b5c8ba0b9d6b5…

1 0

Hans Leidekker : jsproxy: Implement InternetGetProxyInfo.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: f7c8f5b3e45d688e3facebd80396d10de4a44b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c8f5b3e45d688e3facebd80… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:31 2014 +0200 jsproxy: Implement InternetGetProxyInfo. --- dlls/jsproxy/Makefile.in | 3 + dlls/jsproxy/jsproxy.spec | 2 +- dlls/jsproxy/main.c | 480 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jsproxy/pac.js | 244 +++++++++++++++++++++++ dlls/jsproxy/rsrc.rc | 20 ++ 5 files changed, 748 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7c8f5b3e45d688e3face…

1 0

Hans Leidekker : jsproxy: New dll.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: ae542221a074f7459f28a623498421a59516192c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae542221a074f7459f28a6234… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:07 2014 +0200 jsproxy: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/jsproxy/Makefile.in | 5 +++++ dlls/jsproxy/jsproxy.spec | 5 +++++ dlls/jsproxy/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/configure b/configure index e5a26d1..4bcbfd8 100755 --- a/configure +++ b/configure @@ -1063,6 +1063,7 @@ enable_itircl enable_itss enable_joy_cpl enable_jscript +enable_jsproxy enable_kernel32 enable_ktmw32 enable_loadperf @@ -16937,6 +16938,7 @@ wine_fn_config_test dlls/itss/tests itss_test wine_fn_config_dll joy.cpl enable_joy_cpl po wine_fn_config_dll jscript enable_jscript clean,po wine_fn_config_test dlls/jscript/tests jscript_test +wine_fn_config_dll jsproxy enable_jsproxy implib wine_fn_config_dll kernel32 enable_kernel32 clean,implib,mc wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll keyboard.drv16 enable_win16 diff --git a/configure.ac b/configure.ac index 673323a..de5aa41 100644 --- a/configure.ac +++ b/configure.ac @@ -2914,6 +2914,7 @@ WINE_CONFIG_TEST(dlls/itss/tests) WINE_CONFIG_DLL(joy.cpl,,[po]) WINE_CONFIG_DLL(jscript,,[clean,po]) WINE_CONFIG_TEST(dlls/jscript/tests) +WINE_CONFIG_DLL(jsproxy,,[implib]) WINE_CONFIG_DLL(kernel32,,[clean,implib,mc]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in new file mode 100644 index 0000000..41b59ea --- /dev/null +++ b/dlls/jsproxy/Makefile.in @@ -0,0 +1,5 @@ +MODULE = jsproxy.dll +IMPORTLIB = jsproxy + +C_SRCS = \ + main.c diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec new file mode 100644 index 0000000..21943df --- /dev/null +++ b/dlls/jsproxy/jsproxy.spec @@ -0,0 +1,5 @@ +@ stub InternetInitializeAutoProxyDll +@ stub InternetInitializeExAutoProxyDll +@ stub InternetDeInitializeAutoProxyDll +@ stub InternetDeInitializeExAutoProxyDll +@ stub InternetGetProxyInfo diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c new file mode 100644 index 0000000..fa9703d --- /dev/null +++ b/dlls/jsproxy/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +static HINSTANCE instance; + +WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); + +/****************************************************************** + * DllMain (jsproxy.@) + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Hans Leidekker : include: Add missing proxy definitions.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a8ec0edfa88dde40cdfe50dee34b1752b07b0a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ec0edfa88dde40cdfe50dee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:04:54 2014 +0200 include: Add missing proxy definitions. --- include/wininet.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index 5cc3fd5..331055c 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1720,6 +1720,36 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) +typedef struct AutoProxyHelperVtbl +{ + BOOL (WINAPI *IsResolvable)(LPSTR); + DWORD (WINAPI *GetIPAddress)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostName)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNet)(LPSTR, LPSTR, LPSTR); + BOOL (WINAPI *IsResolvableEx)(LPSTR); + DWORD (WINAPI *GetIPAddressEx)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostNameEx)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNetEx)(LPSTR, LPSTR); + DWORD (WINAPI *SortIpList)(LPSTR, LPSTR, LPDWORD); +} AutoProxyHelperVtbl; + +typedef struct AutoProxyHelperFunctions +{ + const struct AutoProxyHelperVtbl *lpVtbl; +} AutoProxyHelperFunctions; + +typedef struct +{ + DWORD dwStructSize; + LPSTR lpszScriptBuffer; + DWORD dwScriptBufferSize; +} AUTO_PROXY_SCRIPT_BUFFER, *LPAUTO_PROXY_SCRIPT_BUFFER; + +typedef BOOL (CALLBACK *pfnInternetDeInitializeAutoProxyDll)(LPSTR, DWORD); +typedef BOOL (CALLBACK *pfnInternetGetProxyInfo)(LPCSTR, DWORD, LPSTR, DWORD, LPSTR *, LPDWORD); +typedef BOOL (CALLBACK *pfnInternetInitializeAutoProxyDll)(DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, + LPAUTO_PROXY_SCRIPT_BUFFER); + BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD);

1 0

Huw Davies : shell32/tests: Fix tests on win 8.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6f7650aec11f2bc8f10d46a36207ba23f92eeb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7650aec11f2bc8f10d46a36… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 10:27:12 2014 +0100 shell32/tests: Fix tests on win 8. --- dlls/shell32/tests/shlfolder.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3e51c8a..474f605 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -779,7 +779,8 @@ static void test_GetDisplayName(void) if (pidlLast->mkid.cb >= 76) { ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName) || (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)) || /* Vista */ - (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)), /* Win7 */ + (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)) || /* Win7 */ + (pidlLast->mkid.cb >= 102 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[72], wszFileName)), /* Win8 */ "Filename should be stored as wchar-string at this position!\n"); } @@ -1853,8 +1854,9 @@ static void test_ITEMIDLIST_format(void) { } ok (!lstrcmpW(wszFile[i], name) || - !lstrcmpW(wszFile[i], name + 9) || /* Vista */ - !lstrcmpW(wszFile[i], name + 11), /* Win7 */ + !lstrcmpW(wszFile[i], name + 9) || /* Vista */ + !lstrcmpW(wszFile[i], name + 11) || /* Win7 */ + !lstrcmpW(wszFile[i], name + 13), /* Win8 */ "The filename should be stored in unicode at this position!\n"); } } @@ -3969,7 +3971,8 @@ static void test_GetUIObject(void) } max_id_check -= baseItem; ok((max_id_check == max_id) || - (max_id_check == max_id-1 /* Win 7 */), + (max_id_check == max_id-1) || /* Win 7 */ + (max_id_check == max_id-2), /* Win 8 */ "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); #define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA)

1 0

Hans Leidekker : jsproxy: Implement InternetInitializeAutoProxyDll and InternetDeinitializeAutoProxyDll.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8545a971c94358c904a657859aff2fe9c943a49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8545a971c94358c904a657859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:17 2014 +0200 jsproxy: Implement InternetInitializeAutoProxyDll and InternetDeinitializeAutoProxyDll. --- dlls/jsproxy/jsproxy.spec | 4 +- dlls/jsproxy/main.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec index 21943df..f557fe6 100644 --- a/dlls/jsproxy/jsproxy.spec +++ b/dlls/jsproxy/jsproxy.spec @@ -1,5 +1,5 @@ -@ stub InternetInitializeAutoProxyDll +@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll @ stub InternetInitializeExAutoProxyDll -@ stub InternetDeInitializeAutoProxyDll +@ stdcall InternetDeInitializeAutoProxyDll(str long) @ stub InternetDeInitializeExAutoProxyDll @ stub InternetGetProxyInfo diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index fa9703d..9305ff8 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -23,12 +23,23 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" +#include "wininet.h" #include "wine/debug.h" static HINSTANCE instance; WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); +static CRITICAL_SECTION cs_jsproxy; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cs_jsproxy, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_jsproxy") } +}; +static CRITICAL_SECTION cs_jsproxy = { &critsect_debug, -1, 0, 0, 0, 0 }; + /****************************************************************** * DllMain (jsproxy.@) */ @@ -46,3 +57,101 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline WCHAR *strdupAW( const char *src, DWORD len ) +{ + WCHAR *dst = NULL; + if (src) + { + int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } + return dst; +} + +static struct pac_script +{ + WCHAR *text; +} pac_script; +static struct pac_script *global_script = &pac_script; + +/****************************************************************** + * InternetDeInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) +{ + TRACE( "%s, %u\n", debugstr_a(mime), reserved ); + + EnterCriticalSection( &cs_jsproxy ); + + heap_free( global_script->text ); + global_script->text = NULL; + + LeaveCriticalSection( &cs_jsproxy ); + return TRUE; +} + +static WCHAR *load_script( const char *filename ) +{ + HANDLE handle; + DWORD size, bytes_read; + char *buffer; + int len; + WCHAR *script = NULL; + + handle = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return NULL; + + size = GetFileSize( handle, NULL ); + if (!(buffer = heap_alloc( size ))) goto done; + if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done; + + len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 ); + if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len ); + script[len] = 0; + +done: + CloseHandle( handle ); + heap_free( buffer ); + return script; +} + +/****************************************************************** + * InternetInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile, LPSTR mime, + AutoProxyHelperFunctions *callbacks, + LPAUTO_PROXY_SCRIPT_BUFFER buffer ) +{ + BOOL ret = FALSE; + + TRACE( "%u, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer ); + + if (callbacks) FIXME( "callbacks not supported\n" ); + + EnterCriticalSection( &cs_jsproxy ); + + if (global_script->text) + { + LeaveCriticalSection( &cs_jsproxy ); + return FALSE; + } + if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer && + (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; + else if ((global_script->text = load_script( tmpfile ))) ret = TRUE; + + LeaveCriticalSection( &cs_jsproxy ); + return ret; +}

1 0

Huw Davies : shell32/tests: Fix the tests when run from the top directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d87aa43ce56630a5031ce492a8ac475b1ad97b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87aa43ce56630a5031ce492a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 10:27:11 2014 +0100 shell32/tests: Fix the tests when run from the top directory. --- dlls/shell32/tests/shlfolder.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f096476..3e51c8a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -533,12 +533,13 @@ if (0) IShellFolder_Release(psfSystemDir); - GetCurrentDirectoryA(MAX_PATH, buf); - if(!lstrlenA(buf)) + cChars = GetCurrentDirectoryA(MAX_PATH, buf); + if(!cChars) { skip("Failed to get current directory, skipping tests.\n"); return; } + if(buf[cChars-1] != '\\') lstrcatA(buf, "\\"); SHGetDesktopFolder(&psfDesktop); @@ -546,7 +547,6 @@ if (0) /* .html */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_html); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -590,7 +590,6 @@ if (0) /* .txt */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_txt); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -604,6 +603,7 @@ if (0) hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ + hr == E_INVALIDARG || /* W2K item in top dir */ broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); @@ -616,7 +616,6 @@ if (0) /* .foo */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_foo); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -630,6 +629,7 @@ if (0) hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ + hr == E_INVALIDARG || /* W2K item in top dir */ broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild);

1 0

Henri Verbeet : d2d1: Add the ID2D1LinearGradientBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 04af7227da3ba5f0380bb746151861bb9f61864b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04af7227da3ba5f0380bb7461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:35 2014 +0200 d2d1: Add the ID2D1LinearGradientBrush interface. --- include/d2d1.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 21af6a7..3a7901f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -659,5 +659,25 @@ interface ID2D1GradientStopCollection : ID2D1Resource D2D1_EXTEND_MODE GetExtendMode(); } +[ + local, + object, + uuid(2cd906ab-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1LinearGradientBrush : ID2D1Brush +{ + void SetStartPoint( + [in] D2D1_POINT_2F start_point + ); + void SetEndPoint( + [in] D2D1_POINT_2F end_point + ); + D2D1_POINT_2F GetStartPoint(); + D2D1_POINT_2F GetEndPoint(); + void GetGradientStopCollection( + [out] ID2D1GradientStopCollection **gradient + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1GradientStopCollection interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 36c438145d7c4c50dd553b27c7f3867d4618bcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c438145d7c4c50dd553b27c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:34 2014 +0200 d2d1: Add the ID2D1GradientStopCollection interface. --- include/d2d1.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 7f7de1d..21af6a7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -191,6 +191,13 @@ typedef enum D2D1_BITMAP_INTERPOLATION_MODE D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, } D2D1_BITMAP_INTERPOLATION_MODE; +typedef enum D2D1_GAMMA +{ + D2D1_GAMMA_2_2 = 0, + D2D1_GAMMA_1_0 = 1, + D2D1_GAMMA_FORCE_DWORD = 0xffffffff, +} D2D1_GAMMA; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -248,6 +255,12 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION D2D1_MATRIX_3X2_F transform; } D2D1_DRAWING_STATE_DESCRIPTION; +typedef struct D2D1_GRADIENT_STOP +{ + float position; + D2D1_COLOR_F color; +} D2D1_GRADIENT_STOP; + [ local, object, @@ -630,5 +643,21 @@ interface ID2D1SolidColorBrush : ID2D1Brush D2D1_COLOR_F GetColor(); } +[ + local, + object, + uuid(2cd906a7-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GradientStopCollection : ID2D1Resource +{ + UINT32 GetGradientStopCount(); + void GetGradientStops( + [out] D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count + ); + D2D1_GAMMA GetColorInterpolationGamma(); + D2D1_EXTEND_MODE GetExtendMode(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1BitmapBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d156bf03a6bed139e3aaf32f829e07047f6f6f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d156bf03a6bed139e3aaf32f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:32 2014 +0200 d2d1: Add the ID2D1BitmapBrush interface. --- include/d2d1.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2ea05f1..88a733f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -33,6 +33,18 @@ typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +enum +{ + D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0, + D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR = 1, + D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC = 2, + D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR = 3, + D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC = 4, + D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC = 5, + D2D1_INTERPOLATION_MODE_DEFINITION_FANT = 6, + D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR = 7, +}; + typedef enum D2D1_DEBUG_LEVEL { D2D1_DEBUG_LEVEL_NONE = 0, @@ -163,6 +175,21 @@ typedef enum D2D1_TEXT_ANTIALIAS_MODE D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, } D2D1_TEXT_ANTIALIAS_MODE; +typedef enum D2D1_EXTEND_MODE +{ + D2D1_EXTEND_MODE_CLAMP = 0, + D2D1_EXTEND_MODE_WRAP = 1, + D2D1_EXTEND_MODE_MIRROR = 2, + D2D1_EXTEND_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_EXTEND_MODE; + +typedef enum D2D1_BITMAP_INTERPOLATION_MODE +{ + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_BITMAP_INTERPOLATION_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -562,5 +589,32 @@ interface ID2D1Brush : ID2D1Resource ); } +[ + local, + object, + uuid(2cd906aa-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1BitmapBrush : ID2D1Brush +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + void SetInterpolationMode( + [in] D2D1_BITMAP_INTERPOLATION_MODE mode + ); + void SetBitmap( + [in] ID2D1Bitmap *bitmap + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); + D2D1_BITMAP_INTERPOLATION_MODE GetInterpolationMode(); + void GetBitmap( + [out] ID2D1Bitmap **bitmap + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Ken Thomases : winemac: Fix a memory leak if posting WM_DROPFILES fails.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 757c57634e567b816723b67a52529a0863aa6cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=757c57634e567b816723b67a5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 14 20:15:30 2014 -0500 winemac: Fix a memory leak if posting WM_DROPFILES fails. --- dlls/winemac.drv/dragdrop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 612a868..ad0bc8c 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -466,8 +466,8 @@ BOOL query_drag_drop(macdrv_query* query) ret = PostMessageW(hwnd, WM_DROPFILES, (WPARAM)hdrop, 0L); /* hdrop is owned by the message and freed when the recipient calls DragFinish(). */ } - else - GlobalFree(hdrop); + + if (!ret) GlobalFree(hdrop); } }

1 0

Henri Verbeet : d2d1: Add the ID2D1SolidColorBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a4677f8670b0bcebfeec8a6fe1baae5810acc269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4677f8670b0bcebfeec8a6fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:33 2014 +0200 d2d1: Add the ID2D1SolidColorBrush interface. --- include/d2d1.idl | 14 ++++++++++++++ include/d2dbasetypes.h | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 88a733f..7f7de1d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -32,6 +32,7 @@ typedef UINT64 D2D1_TAG; typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +typedef D2D_COLOR_F D2D1_COLOR_F; enum { @@ -616,5 +617,18 @@ interface ID2D1BitmapBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd906a9-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1SolidColorBrush : ID2D1Brush +{ + void SetColor( + [in] const D2D1_COLOR_F *color + ); + D2D1_COLOR_F GetColor(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 61158ac..e5acff2 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -16,6 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef D3DCOLORVALUE_DEFINED +typedef struct D3DCOLORVALUE +{ + float r; + float g; + float b; + float a; +} D3DCOLORVALUE; +#define D3DCOLORVALUE_DEFINED +#endif + +typedef D3DCOLORVALUE D2D_COLOR_F; + typedef struct D2D_POINT_2F { FLOAT x;

1 0

Nikolay Sivov : msxml3: Remove no longer used helper.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8e524667578aca111fc94bb69a4afc05a4b5df1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e524667578aca111fc94bb69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 13:46:48 2014 +0400 msxml3: Remove no longer used helper. --- dlls/msxml3/msxml_private.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 167e74f..a57dc60 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -205,22 +205,6 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } -static inline LPSTR heap_strdupWtoA(LPCWSTR str) -{ - LPSTR ret = NULL; - - if(str) { - DWORD len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = heap_alloc(len+1); - if(!ret) - return NULL; - - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len+1, NULL, NULL); - } - - return ret; -} - /* XSLProcessor parameter list */ struct xslprocessor_par {

1 0

Henri Verbeet : d2d1: Get rid of "optional" attributes.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 71a27809f153e11c719909e35900c807e8712c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a27809f153e11c719909e35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:31 2014 +0200 d2d1: Get rid of "optional" attributes. --- include/d2d1.idl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index ef05f00..2ea05f1 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -291,80 +291,80 @@ interface ID2D1TessellationSink : IUnknown interface ID2D1Geometry : ID2D1Resource { HRESULT GetBounds( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [out] D2D1_RECT_F *bounds ); HRESULT GetWidenedBounds( [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] D2D1_RECT_F *bounds ); HRESULT StrokeContainsPoint( [in] D2D1_POINT_2F point, [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] BOOL *contains ); HRESULT FillContainsPoint( [in] D2D1_POINT_2F point, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] BOOL *contains ); HRESULT CompareWithGeometry( [in] ID2D1Geometry *geometry, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] D2D1_GEOMETRY_RELATION *relation ); HRESULT Simplify( [in] D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT Tessellate( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1TessellationSink *sink ); HRESULT CombineWithGeometry( [in] ID2D1Geometry *geometry, [in] D2D1_COMBINE_MODE combine_mode, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT Outline( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT ComputeArea( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] float *area ); HRESULT ComputeLength( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] float *length ); HRESULT ComputePointAtLength( [in] float length, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, - [out, optional] D2D1_POINT_2F *point, - [out, optional] D2D1_POINT_2F *tangent + [out] D2D1_POINT_2F *point, + [out] D2D1_POINT_2F *tangent ); HRESULT Widen( [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink );

1 0

Ken Thomases : winemac: Add the ability to disable high-resolution scrolling.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 451915100a61a2e5f3e848d0c6ab7fb477b08d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451915100a61a2e5f3e848d0c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 14 20:15:35 2014 -0500 winemac: Add the ability to disable high-resolution scrolling. The Mac driver can generate scroll wheel events with values which are not integral multiples of WHEEL_DELTA. Apps should handle that by scrolling a corresponding non-integral multiple of what they'd do for a WHEEL_DELTA-valued scroll or, if they can't, then at least accumulate scroll distance until its magnitude exceeds WHEEL_DELTA and do a "chunky" scroll. However, many apps don't do that properly. They may scroll way too far/fast or even in the opposite direction. If the registry setting UsePreciseScrolling is set to "n", the Mac driver will do that accumulation and chunking itself to work around such broken app behavior. --- dlls/winemac.drv/cocoa_app.h | 3 ++ dlls/winemac.drv/cocoa_app.m | 81 ++++++++++++++++++++++++++++++--------- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++ 4 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 0f8926d..fc6c1ec 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -66,6 +66,9 @@ enum { double mouseMoveDeltaX, mouseMoveDeltaY; NSUInteger unmatchedMouseDowns; + NSTimeInterval lastScrollTime; + double accumScrollX, accumScrollY; + NSMutableDictionary* originalDisplayModes; NSMutableDictionary* latentDisplayModes; BOOL displaysCapturedForFullscreen; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e5594d1..d454513 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1725,7 +1725,7 @@ int macdrv_err_on; if (process) { macdrv_event* event; - CGFloat x, y; + double x, y; BOOL continuous = FALSE; event = macdrv_create_event(MOUSE_SCROLL, window); @@ -1768,26 +1768,69 @@ int macdrv_err_on; /* The x,y values so far are in pixels. Win32 expects to receive some fraction of WHEEL_DELTA == 120. By my estimation, that's roughly 6 times the pixel value. */ - event->mouse_scroll.x_scroll = 6 * x; - event->mouse_scroll.y_scroll = 6 * y; + x *= 6; + y *= 6; - if (!continuous) + if (use_precise_scrolling) { - /* For non-continuous "clicky" wheels, if there was any motion, make - sure there was at least WHEEL_DELTA motion. This is so, at slow - speeds where the system's acceleration curve is actually reducing the - scroll distance, the user is sure to get some action out of each click. - For example, this is important for rotating though weapons in a - first-person shooter. */ - if (0 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 120) - event->mouse_scroll.x_scroll = 120; - else if (-120 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 0) - event->mouse_scroll.x_scroll = -120; - - if (0 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 120) - event->mouse_scroll.y_scroll = 120; - else if (-120 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 0) - event->mouse_scroll.y_scroll = -120; + event->mouse_scroll.x_scroll = x; + event->mouse_scroll.y_scroll = y; + + if (!continuous) + { + /* For non-continuous "clicky" wheels, if there was any motion, make + sure there was at least WHEEL_DELTA motion. This is so, at slow + speeds where the system's acceleration curve is actually reducing the + scroll distance, the user is sure to get some action out of each click. + For example, this is important for rotating though weapons in a + first-person shooter. */ + if (0 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 120) + event->mouse_scroll.x_scroll = 120; + else if (-120 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 0) + event->mouse_scroll.x_scroll = -120; + + if (0 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 120) + event->mouse_scroll.y_scroll = 120; + else if (-120 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 0) + event->mouse_scroll.y_scroll = -120; + } + } + else + { + /* If it's been a while since the last scroll event or if the scrolling has + reversed direction, reset the accumulated scroll value. */ + if ([theEvent timestamp] - lastScrollTime > 1) + accumScrollX = accumScrollY = 0; + else + { + /* The accumulated scroll value is in the opposite direction/sign of the last + scroll. That's because it's the "debt" resulting from over-scrolling in + that direction. We accumulate by adding in the scroll amount and then, if + it has the same sign as the scroll value, we subtract any whole or partial + WHEEL_DELTAs, leaving it 0 or the opposite sign. So, the user switched + scroll direction if the accumulated debt and the new scroll value have the + same sign. */ + if ((accumScrollX < 0 && x < 0) || (accumScrollX > 0 && x > 0)) + accumScrollX = 0; + if ((accumScrollY < 0 && y < 0) || (accumScrollY > 0 && y > 0)) + accumScrollY = 0; + } + lastScrollTime = [theEvent timestamp]; + + accumScrollX += x; + accumScrollY += y; + + if (accumScrollX > 0 && x > 0) + event->mouse_scroll.x_scroll = 120 * ceil(accumScrollX / 120); + if (accumScrollX < 0 && x < 0) + event->mouse_scroll.x_scroll = 120 * -ceil(-accumScrollX / 120); + if (accumScrollY > 0 && y > 0) + event->mouse_scroll.y_scroll = 120 * ceil(accumScrollY / 120); + if (accumScrollY < 0 && y < 0) + event->mouse_scroll.y_scroll = 120 * -ceil(-accumScrollY / 120); + + accumScrollX -= event->mouse_scroll.x_scroll; + accumScrollY -= event->mouse_scroll.y_scroll; } if (event->mouse_scroll.x_scroll || event->mouse_scroll.y_scroll) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d3d3ffc..30b6b64 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -148,6 +148,7 @@ extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; +extern int use_precise_scrolling DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 300b1a7..38352a8 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -56,6 +56,7 @@ BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; int cursor_clipping_locks_windows = TRUE; +int use_precise_scrolling = TRUE; HMODULE macdrv_module = 0; @@ -179,6 +180,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "CursorClippingLocksWindows", buffer, sizeof(buffer))) cursor_clipping_locks_windows = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "UsePreciseScrolling", buffer, sizeof(buffer))) + use_precise_scrolling = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Francois Gouget : testbot/TestAgent: Typographic fixes for the trace_speed () units.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: cc965a0f79b613f824448427ae7f28e234a4ca92 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cc965a0f79b613f824448427… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:32 2014 +0200 testbot/TestAgent: Typographic fixes for the trace_speed() units. --- testbot/lib/WineTestBot/TestAgent.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index b22fb06..3c84d49 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -77,14 +77,14 @@ sub trace_speed($$) if ($Elapsed) { $Speed = $Bytes * 8 / $Elapsed / 1000; - $Speed = $Speed < 1000 ? sprintf(" (%.1fKb/s)", $Speed) : - sprintf(" (%.1fMb/s)", $Speed / 1000); + $Speed = $Speed < 1000 ? sprintf(" (%.1f kb/s)", $Speed) : + sprintf(" (%.1f Mb/s)", $Speed / 1000); } $Bytes = $Bytes < 8 * 1024 ? "$Bytes bytes" : - $Bytes < 8 * 1024 * 1024 ? sprintf("%.1fKiB", $Bytes / 1024) : - sprintf("%.1fMiB", $Bytes / 1024 / 1024); - $Elapsed = $Elapsed < 1 ? sprintf("%.1fms", $Elapsed * 1000) : - sprintf("%.1fs", $Elapsed); + $Bytes < 8 * 1024 * 1024 ? sprintf("%.1f KiB", $Bytes / 1024) : + sprintf("%.1f MiB", $Bytes / 1024 / 1024); + $Elapsed = $Elapsed < 1 ? sprintf("%.1f ms", $Elapsed * 1000) : + sprintf("%.1f s", $Elapsed); debug("Transferred $Bytes in $Elapsed$Speed\n"); } }

1 0

Francois Gouget : testbot/TestAgent: Retry the Wait RPC if the connection gets broken.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: a3bc1bebd8870d08eb2593609ef72b64ad01b24a URL: http://source.winehq.org/git/tools.git/?a=commit;h=a3bc1bebd8870d08eb259360… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:23 2014 +0200 testbot/TestAgent: Retry the Wait RPC if the connection gets broken. This seems necessary to work around network flakiness. --- testbot/lib/WineTestBot/TestAgent.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index fb14b38..b22fb06 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1232,8 +1232,12 @@ sub Wait($$$;$) # The process has quit last if (defined $Result); - # Retry only if the timeout occurred on the remote end - last if ($self->{err} !~ /timed out waiting/); + # The only 'error' we should be getting here is the TestAgent server + # telling us it timed out waiting for the process. However flaky network + # connections like to break while we're waiting for the reply. So retry + # if that happens and let the automatic reconnection detect real network + # issues. + last if ($self->{err} !~ /(?:timed out waiting|network read timed out)/); } } $self->SetTimeout($OldTimeout);

1 0

Francois Gouget : testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs().
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 8f115fe2bd150ca3b96614e881b3fbf473d2aacb URL: http://source.winehq.org/git/tools.git/?a=commit;h=8f115fe2bd150ca3b96614e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:06 2014 +0200 testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs(). It did not use the $Bits parameter and just calls ScheduleJobs() which is what the RescheduleJobs() notification does already. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/bin/Engine.pl | 20 -------------------- testbot/lib/WineTestBot/Engine/Notify.pm | 19 +------------------ 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 6d33a5c..5d30913 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,7 +251,7 @@ else AddJob(1, $FileNameRandomPart, $Bits); } -FoundWinetestUpdate($Bits); +RescheduleJobs(); LogMsg "Submitted jobs\n"; diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 72e165c..f8b7e1e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -425,25 +425,6 @@ sub HandleVMStatusChange return "1OK"; } -sub HandleFoundWinetestUpdate -{ - my $Bits = $_[0]; - - if ($Bits !~ /^(?:32|64)$/) - { - LogMsg "Invalid number of bits in foundwinetestupdate message\n"; - return "0Invalid number of bits"; - } - - my $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleFoundWinetestUpdate: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleWinePatchMLSubmission { my $dh; @@ -594,7 +575,6 @@ sub HandleGetScreenshot } my %Handlers=( - "foundwinetestupdate" => \&HandleFoundWinetestUpdate, "getscreenshot" => \&HandleGetScreenshot, "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 1f93db4..a241c81 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -34,7 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel - &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate + &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -199,23 +199,6 @@ sub VMStatusChange return substr($Reply, 1); } -sub FoundWinetestUpdate -{ - my $Bits = $_[0]; - - my $Reply = SendCmdReceiveReply("foundwinetestupdate $Bits\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub WinePatchMLSubmission { my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n");

1 0

Francois Gouget : testbot/testagentd: Fix a small comment typo.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 6d0453c6c0159353a60bf9174a067ff07c10f51b URL: http://source.winehq.org/git/tools.git/?a=commit;h=6d0453c6c0159353a60bf917… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:56:32 2014 +0200 testbot/testagentd: Fix a small comment typo. --- testbot/src/testagentd/platform_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 09330cb..75afc81 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -164,7 +164,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child struct timeval tv; int ready; - /* select() blocks until either the client disconnects or until, or + /* select() blocks until either the client disconnects, or * the SIGCHLD signal indicates the child has exited. The recv() call * tells us if it is the former. */

1 0

Francois Gouget : testbot/testagentd: Fix the legacy Wait RPC.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 82ca6524580cffd44a798035a478c31cb9845de6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=82ca6524580cffd44a798035… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:56:12 2014 +0200 testbot/testagentd: Fix the legacy Wait RPC. 0 means return immediately, not wait indefinitely (aka RUN_NOTIMEOUT)! --- testbot/src/testagentd/testagentd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 4bda532..3159f16 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -802,7 +802,7 @@ static void do_wait(SOCKET client) return; } - if (platform_wait(client, pid, 0, &childstatus)) + if (platform_wait(client, pid, RUN_NOTIMEOUT, &childstatus)) { send_list_size(client, 1); send_uint32(client, childstatus);

1 0

Francois Gouget : testbot/Engine: Fix a minor typo in a comment.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 30e3a6d665925d7794f14d39c16d2506412e9ff0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=30e3a6d665925d7794f14d39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:27 2014 +0200 testbot/Engine: Fix a minor typo in a comment. --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 6e2ff1c..ccaadc1 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -590,7 +590,7 @@ through the cracks, possibly because of an Engine restart. Specifically it updates the status of all the current Jobs, Steps and Tasks, then schedules Tasks to be run, checks the staging directory for wine-patches emails dropped by WinePatchesMLSubmit.pl, for notifications of -changes on Wine's Patches web site dropped by WinePatchesWebNotify.pl, and +changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and checks whether any pending patchsets are now complete and thus can be scheduled. =back

1 0

Francois Gouget : testbot/testagentd: Use $(CC) rather than hardcoding gcc as the compiler.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: e9f20ff64423cad602bf04f9c9e42af4f0512e97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9f20ff64423cad602bf04f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:58 2014 +0200 testbot/testagentd: Use $(CC) rather than hardcoding gcc as the compiler. $(CC) is standard and does not require the autoconf machinery. --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 5a7b735..4f16f9c 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -9,11 +9,11 @@ windows: TestAgentd.exe $(builddir)/testagentd: testagentd.o platform_unix.o - gcc -o $@ $^ + $(CC) -o $@ $^ strip $@ .c.o: - gcc -Wall -g -c -o $@ $< + $(CC) -Wall -g -c -o $@ $< TestAgentd.exe: testagentd.obj platform_windows.obj

1 0

Francois Gouget : testbot/TestAgent: Make sure we don't overflow alarm()' s 32-bit limit.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 4f9cf46a80f18139f326d611f3575075d4d22d85 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4f9cf46a80f18139f326d611… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:45 2014 +0200 testbot/TestAgent: Make sure we don't overflow alarm()'s 32-bit limit. --- testbot/lib/WineTestBot/TestAgent.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 3c84d49..1acb0cd 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -174,7 +174,8 @@ sub _SetAlarm($) { my $Timeout = $self->{deadline} - time(); die "timeout" if ($Timeout <= 0); - alarm($Timeout); + # alarm() has a 32-bit limit, even on 64-bit systems + alarm($Timeout <= 0xffffffff ? $Timeout : 0xffffffff); } }

1 0

Francois Gouget : testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: eeed0b5f0f4af7d985e9e72135f6f75ffe1c1d82 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eeed0b5f0f4af7d985e9e721… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:04 2014 +0200 testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory. Otherwise there is a race condition between CheckWinetestUpdate and the Engine. --- testbot/bin/CheckForWinetestUpdate.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 98165a3..fc24fb6 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -110,8 +110,6 @@ sub AddJob LogMsg "Failed to save job: $ErrMessage\n"; exit 1; } - - $NewStep->HandleStaging($NewJob->Id); } }

1 0

Francois Gouget : testbot: Better document the use of the staging directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 7d4c644fccff381619dbc49a48ae644daf7b81b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d4c644fccff381619dbc49a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:45 2014 +0200 testbot: Better document the use of the staging directory. Also remove an unused variable in CheckForWinetestUpdate. --- testbot/bin/CheckForWinetestUpdate.pl | 13 +++++++++---- testbot/web/Submit.pl | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 5d30913..98165a3 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -175,7 +175,11 @@ umask 002; mkdir "$DataDir/latest"; mkdir "$DataDir/staging"; -my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; +# Store the new WineTest executable in the staging directory: +# - So we can compare it to the reference one in the latest directory to +# check that it is truly new. +# - Because we don't know the relevant Job and Step IDs yet and thus cannot +# put it in the jobs directory tree. my $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") { @@ -186,7 +190,7 @@ my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuff my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); my $Request = HTTP::Request->new(GET => $WinetestUrl); -my $NowDate = gmtime; +my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); @@ -230,14 +234,15 @@ if ($Bits == 32) { AddReconfigJob(); AddJob(1, $FileNameRandomPart, $Bits); - + + # Create another copy for the non-base VMs Job. $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe") { $FileNameRandomPart = GenerateRandomString(32); } $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe"; - if (! copy($LatestFileName, $StagingFileName)) + if (!copy($LatestFileName, $StagingFileName)) { LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3bcfad9..d381150 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -792,8 +792,10 @@ sub OnSubmit return !1; } - # Make sure the file has a unique name even when not picked up directly - # by the engine + # Store the file in the staging directory until the relevant Job and Step + # IDs are known and it can be moved to the jobs directory tree. But rename + # it so it does not get overwritten if the user submits another one before + # the Engine gets around to doing so. my $FileNameRandomPart = GenerateRandomString(32); while (-e ("$DataDir/staging/${FileNameRandomPart}_" . $self->GetParam("FileName")))

1 0

Francois Gouget : testbot/Engine: Remove the JobSubmit() notification. It' s redundant with RescheduleJobs().
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: f70cf6ceb4a29d8d041d2e07ca0af04789b8e741 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f70cf6ceb4a29d8d041d2e07… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:11 2014 +0200 testbot/Engine: Remove the JobSubmit() notification. It's redundant with RescheduleJobs(). It does not need to call Step::HandleStaging() since the Job scheduler does that already. So then it's identical to the RescheduleJobs() notification. --- testbot/bin/Engine.pl | 34 ------------------------------ testbot/lib/WineTestBot/Engine/Notify.pm | 19 +---------------- testbot/web/Submit.pl | 8 ++++--- 3 files changed, 6 insertions(+), 55 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f8b7e1e..6e2ff1c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -257,39 +257,6 @@ sub HandlePing return "1pong\n"; } -sub HandleJobSubmit -{ - my $JobKey = $_[0]; - - my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) - { - LogMsg "JobSubmit for nonexistent job $JobKey\n"; - return "0Job $JobKey not found"; - } - # We've already determined that JobKey is valid, untaint it - $JobKey =~ m/^(.*)$/; - $JobKey = $1; - - my $ErrMessage; - foreach my $Step (@{$Job->Steps->GetItems()}) - { - $ErrMessage = $Step->HandleStaging($JobKey); - if (defined($ErrMessage)) - { - LogMsg "Staging problem: $ErrMessage\n"; - } - } - - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobSubmit: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleJobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -579,7 +546,6 @@ my %Handlers=( "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, "jobstatuschange" => \&HandleJobStatusChange, - "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, "reschedulejobs" => \&HandleRescheduleJobs, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index a241c81..d0d4890 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -33,7 +33,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel +(a)EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -99,23 +99,6 @@ sub PingEngine return 1 <= length($Reply) && substr($Reply, 0, 1) eq "1"; } -sub JobSubmit -{ - my $JobKey = $_[0]; - - my $Reply = SendCmdReceiveReply("jobsubmit $JobKey\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub JobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 0d9d0b4..3bcfad9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -917,14 +917,16 @@ sub OnSubmit $Jobs = undef; # Notify engine - if (defined(JobSubmit($JobKey))) + my $ErrMessage = RescheduleJobs(); + if (defined $ErrMessage) { + LogMsg "$ErrMessage\n"; $self->{Page} = 4; - $self->{JobKey} = $NewJob->GetKey(); + $self->{JobKey} = $JobKey; return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $NewJob->Id); + $self->Redirect("/JobDetails.pl?Key=$JobKey"); exit; }

1 0

Shuai Meng : vbscript: Implemented CByte.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: db42703d5ff9eb31130896c9d7d7713b8fe09d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db42703d5ff9eb31130896c9d… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Wed May 14 23:05:02 2014 +0800 vbscript: Implemented CByte. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9aeba34..484158f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -424,8 +424,25 @@ static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_CByte(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_UI1); + if(FAILED(hres)) + return hres; + + if(!res) { + VariantClear(&v); + return DISP_E_BADVARTYPE; + } + + *res = v; + return S_OK; } static HRESULT Global_CDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 12124b7..8197d6d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -533,4 +533,48 @@ MyObject.myval = 0 Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +Sub testCByteError(strings, error_num1,error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CByte(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CByte(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CByte(Empty) = 0, "CByte(Empty) = " & CByte(Empty)) +Call ok(getVT(CByte(Empty)) = "VT_UI1", "getVT(CByte(Empty)) = " & getVT(CByte(Empty))) +Call ok(CByte(255) = 255, "CByte(255) = " & CByte(255)) +Call ok(getVT(CByte(255)) = "VT_UI1", "getVT(CByte(255)) = " & getVT(CByte(255))) +Call ok(CByte(255.49) = 255, "CByte(255.49) = " & CByte(255.49)) +Call ok(getVT(CByte(255.49)) = "VT_UI1", "getVT(CByte(255.49)) = " & getVT(CByte(255.49))) +Call testCByteError(1, 0, 458) +Call testCByteError("", 13, 13) +Call testCByteError("-1", 6, 6) +Call testCByteError("258", 6, 6) +Call testCByteError("TRUE", 13, 13) +Call testCByteError("FALSE", 13, 13) +Call testCByteError("#TRue#", 13, 13) +Call testCByteError("#fAlSE#", 13, 13) +If isEnglishLang Then + Call ok(CByte("-0.5") = 0, "CByte(""-0.5"") = " & CByte("-0.5")) + Call ok(getVT(CByte("-0.5")) = "VT_UI1", "getVT(CByte(""-0.5"")) = " & getVT(CByte("-0.5"))) +End If +Call ok(CByte(True) = 255, "CByte(True) = " & CByte(True)) +Call ok(getVT(CByte(True)) = "VT_UI1", "getVT(CByte(True)) = " & getVT(CByte(True))) +Call ok(CByte(False) = 0, "CByte(False) = " & CByte(False)) +Call ok(getVT(CByte(False)) = "VT_UI1", "getVT(CByte(False)) = " & getVT(CByte(False))) +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 1 +Call ok(CByte(MyObject) = 1, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 0 +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 53ead45..9620398 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -181,6 +181,8 @@ static const char *vt2a(VARIANT *v) return "VT_ARRAY|VT_VARIANT"; case VT_ARRAY|VT_BYREF|VT_VARIANT: return "VT_ARRAY|VT_BYREF|VT_VARIANT"; + case VT_UI1: + return "VT_UI1"; default: ok(0, "unknown vt %d\n", V_VT(v)); return NULL;

1 0

Jacek Caban : wmvcore: Added IWMReader interface stub implementation.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c0247ab291f11c92bba43e51633bb8adee52e290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0247ab291f11c92bba43e516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 14 18:43:09 2014 +0200 wmvcore: Added IWMReader interface stub implementation. --- dlls/wmvcore/wmvcore_main.c | 161 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 3 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 5903bf8..3382542 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -72,12 +72,167 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) +typedef struct { + IWMReader IWMReader_iface; + LONG ref; +} WMReader; + +static inline WMReader *impl_from_IWMReader(IWMReader *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReader_iface); +} + +static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReader(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMReader)) { + TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMReader_AddRef(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMReader_Release(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Close(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%p)\n", This, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) { - FIXME("(%p, %x, %p): stub\n", reserved, rights, reader); + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Stop(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Pause(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Resume(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMReaderVtbl WMReaderVtbl = { + WMReader_QueryInterface, + WMReader_AddRef, + WMReader_Release, + WMReader_Open, + WMReader_Close, + WMReader_GetOutputCount, + WMReader_GetOutputProps, + WMReader_SetOutputProps, + WMReader_GetOutputFormatCount, + WMReader_GetOutputFormat, + WMReader_Start, + WMReader_Stop, + WMReader_Pause, + WMReader_Resume +}; + +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) +{ + WMReader *reader; + + TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); + + reader = heap_alloc(sizeof(*reader)); + if(!reader) + return E_OUTOFMEMORY; - *reader = NULL; + reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; + reader->ref = 1; + *ret_reader = &reader->IWMReader_iface; return E_NOTIMPL; }

1 0

Jacek Caban : oleaut32: Added debugstr_variant helper for better debug traces.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: ed41fc1d9b0aabd581dd7f1e0eb9e1939b96b26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed41fc1d9b0aabd581dd7f1e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 14 16:55:57 2014 +0200 oleaut32: Added debugstr_variant helper for better debug traces. --- dlls/oleaut32/varformat.c | 36 +++++++++++++++--------------------- dlls/oleaut32/variant.c | 33 +++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.h | 2 ++ 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e72a170..0e1c370 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1201,9 +1201,8 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vString) = VT_EMPTY; V_VT(&vBool) = VT_BOOL; @@ -1612,9 +1611,8 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), + debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vDate) = VT_EMPTY; @@ -1954,9 +1952,8 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, BOOL bUpper = FALSE; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vStr) = VT_EMPTY; @@ -2168,9 +2165,8 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, BYTE buff[256]; HRESULT hres; - TRACE("(%p->(%s%s),%s,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), nFirstDay, nFirstWeek, - dwFlags, pbstrOut); + TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + nFirstDay, nFirstWeek, dwFlags, pbstrOut); if (!pbstrOut) return E_INVALIDARG; @@ -2219,8 +2215,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B static WCHAR szEmpty[] = { '\0' }; const BYTE* lpFmt = NULL; - TRACE("(%p->(%s%s),%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nFormat, dwFlags, pbstrOut); + TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4) return E_INVALIDARG; @@ -2272,8 +2267,8 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2383,9 +2378,8 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vDbl; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, - dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2457,8 +2451,8 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c3bd225..7221787 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -78,6 +78,39 @@ const char * const wine_vflags[16] = "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_HARDTYPE", }; +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + 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: + return wine_dbg_sprintf("%p {VT_I4: %d}", v, V_I4(v)); + case VT_R8: + return wine_dbg_sprintf("%p {VT_R8: %lf}", v, V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("%p {VT_BSTR: %s}", v, debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("%p {VT_DISPATCH: %p}", v, V_DISPATCH(v)); + case VT_ERROR: + 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_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)); + } +} + /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARIANTARG* ps, VARTYPE vt) diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index d521b20..e13e56a 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -57,6 +57,8 @@ 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; + /* Size constraints */ #define I1_MAX 0x7f #define I1_MIN ((-I1_MAX)-1)

1 0

Piotr Caban : oleacc: Add GetStateText implementation.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 5f51dda7eeab4d905ecf86ac447b76346ab0df0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f51dda7eeab4d905ecf86ac4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:51 2014 +0200 oleacc: Add GetStateText implementation. --- dlls/oleacc/main.c | 64 +++++++++- dlls/oleacc/oleacc.rc | 34 ++++++ dlls/oleacc/oleacc.spec | 4 +- dlls/oleacc/resource.h | 50 ++++++++ dlls/oleacc/tests/main.c | 71 +++++++++++ po/ar.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/bg.po | 274 ++++++++++++++++++++++++++++++++---------- po/ca.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/cs.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/da.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/de.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/el.po | 269 ++++++++++++++++++++++++++++++++---------- po/en.po | 258 ++++++++++++++++++++++++++++++---------- po/en_US.po | 258 ++++++++++++++++++++++++++++++---------- po/eo.po | 282 ++++++++++++++++++++++++++++++++++---------- po/es.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/fa.po | 263 +++++++++++++++++++++++++++++++---------- po/fi.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/fr.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/he.po | 285 ++++++++++++++++++++++++++++++++++---------- po/hi.po | 258 ++++++++++++++++++++++++++++++---------- po/hr.po | 292 +++++++++++++++++++++++++++++++++++---------- po/hu.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/it.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ja.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ko.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/lt.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ml.po | 258 ++++++++++++++++++++++++++++++---------- po/nb_NO.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/nl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/or.po | 258 ++++++++++++++++++++++++++++++---------- po/pa.po | 258 ++++++++++++++++++++++++++++++---------- po/pl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/pt_PT.po | 292 +++++++++++++++++++++++++++++++++++---------- po/rm.po | 261 ++++++++++++++++++++++++++++++---------- po/ro.po | 292 +++++++++++++++++++++++++++++++++++---------- po/ru.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/sk.po | 280 +++++++++++++++++++++++++++++++++---------- po/sl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 284 ++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 288 +++++++++++++++++++++++++++++++++++---------- po/sv.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/te.po | 258 ++++++++++++++++++++++++++++++---------- po/th.po | 270 ++++++++++++++++++++++++++++++++---------- po/tr.po | 292 +++++++++++++++++++++++++++++++++++---------- po/uk.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/wa.po | 263 +++++++++++++++++++++++++++++++---------- po/wine.pot | 258 ++++++++++++++++++++++++++++++---------- po/zh_CN.po | 286 ++++++++++++++++++++++++++++++++++---------- po/zh_TW.po | 294 ++++++++++++++++++++++++++++++++++++---------- 51 files changed, 10235 insertions(+), 2993 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f51dda7eeab4d905ecf8…

1 0

Piotr Caban : include: Add STATE_SYSTEM_* definition to oleacc.idl.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: b6284cfc63872a34cb5cfe4f4494f1a8187fb367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6284cfc63872a34cb5cfe4f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:40 2014 +0200 include: Add STATE_SYSTEM_* definition to oleacc.idl. --- include/oleacc.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/oleacc.idl b/include/oleacc.idl index e9cf138..daf7dec 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -18,6 +18,7 @@ import "oaidl.idl"; +cpp_quote("#define NAVDIR_MIN 0") cpp_quote("#define NAVDIR_UP 1") cpp_quote("#define NAVDIR_DOWN 2") cpp_quote("#define NAVDIR_LEFT 3") @@ -26,6 +27,7 @@ cpp_quote("#define NAVDIR_NEXT 5") cpp_quote("#define NAVDIR_PREVIOUS 6") cpp_quote("#define NAVDIR_FIRSTCHILD 7") cpp_quote("#define NAVDIR_LASTCHILD 8") +cpp_quote("#define NAVDIR_MAX 9") cpp_quote("#define ROLE_SYSTEM_TITLEBAR 1") cpp_quote("#define ROLE_SYSTEM_MENUBAR 2") @@ -100,6 +102,45 @@ cpp_quote("#define SELFLAG_ADDSELECTION 0x08") cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") cpp_quote("#define SELFLAG_VALID 0x1f") +cpp_quote("#ifndef STATE_SYSTEM_UNAVAILABLE") +cpp_quote("#define STATE_SYSTEM_NORMAL 0x00000000") +cpp_quote("#define STATE_SYSTEM_UNAVAILABLE 0x00000001") +cpp_quote("#define STATE_SYSTEM_SELECTED 0x00000002") +cpp_quote("#define STATE_SYSTEM_FOCUSED 0x00000004") +cpp_quote("#define STATE_SYSTEM_PRESSED 0x00000008") +cpp_quote("#define STATE_SYSTEM_CHECKED 0x00000010") +cpp_quote("#define STATE_SYSTEM_MIXED 0x00000020") +cpp_quote("#define STATE_SYSTEM_INDETERMINATE STATE_SYSTEM_MIXED") +cpp_quote("#define STATE_SYSTEM_READONLY 0x00000040") +cpp_quote("#define STATE_SYSTEM_HOTTRACKED 0x00000080") +cpp_quote("#define STATE_SYSTEM_DEFAULT 0x00000100") +cpp_quote("#define STATE_SYSTEM_EXPANDED 0x00000200") +cpp_quote("#define STATE_SYSTEM_COLLAPSED 0x00000400") +cpp_quote("#define STATE_SYSTEM_BUSY 0x00000800") +cpp_quote("#define STATE_SYSTEM_FLOATING 0x00001000") +cpp_quote("#define STATE_SYSTEM_MARQUEED 0x00002000") +cpp_quote("#define STATE_SYSTEM_ANIMATED 0x00004000") +cpp_quote("#define STATE_SYSTEM_INVISIBLE 0x00008000") +cpp_quote("#define STATE_SYSTEM_OFFSCREEN 0x00010000") +cpp_quote("#define STATE_SYSTEM_SIZEABLE 0x00020000") +cpp_quote("#define STATE_SYSTEM_MOVEABLE 0x00040000") +cpp_quote("#define STATE_SYSTEM_SELFVOICING 0x00080000") +cpp_quote("#define STATE_SYSTEM_FOCUSABLE 0x00100000") +cpp_quote("#define STATE_SYSTEM_SELECTABLE 0x00200000") +cpp_quote("#define STATE_SYSTEM_LINKED 0x00400000") +cpp_quote("#define STATE_SYSTEM_TRAVERSED 0x00800000") +cpp_quote("#define STATE_SYSTEM_MULTISELECTABLE 0x01000000") +cpp_quote("#define STATE_SYSTEM_EXTSELECTABLE 0x02000000") +cpp_quote("#define STATE_SYSTEM_ALERT_LOW 0x04000000") +cpp_quote("#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000") +cpp_quote("#define STATE_SYSTEM_ALERT_HIGH 0x10000000") +cpp_quote("#define STATE_SYSTEM_PROTECTED 0x20000000") +cpp_quote("#define STATE_SYSTEM_VALID 0x7FFFFFFF") +cpp_quote("#endif") +cpp_quote("#ifndef STATE_SYSTEM_HASPOPUP") +cpp_quote("#define STATE_SYSTEM_HASPOPUP 0x40000000") +cpp_quote("#endif") + typedef GUID MSAAPROPID; typedef enum AnnoScope

1 0

Stefan Dösinger : wined3d: Always provide P8 GL texture information.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 7b049245f532d355ea0541c9a970d3459144aaf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b049245f532d355ea0541c9a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:51 2014 +0200 wined3d: Always provide P8 GL texture information. --- dlls/wined3d/surface.c | 23 ++--------------------- dlls/wined3d/utils.c | 2 +- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e0ba375..8e4b88b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1457,12 +1457,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct int src_pitch = 0; int dst_pitch = 0; - if (format->id == WINED3DFMT_P8_UINT) - { - gl_format = GL_ALPHA; - gl_type = GL_UNSIGNED_BYTE; - } - if (surface->flags & SFLAG_NONPOW2) { unsigned char alignment = surface->resource.device->surface_alignment; @@ -3211,8 +3205,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BYTE *mem; - GLint fmt; - GLint type; BYTE *row, *top, *bottom; int i; BOOL srcIsUpsideDown; @@ -3246,18 +3238,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc srcIsUpsideDown = FALSE; } - switch (surface->resource.format->id) - { - case WINED3DFMT_P8_UINT: - fmt = GL_ALPHA; - type = GL_UNSIGNED_BYTE; - break; - - default: - fmt = surface->resource.format->glFormat; - type = surface->resource.format->glType; - } - if (data.buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); @@ -3270,7 +3250,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc gl_info->gl_ops.gl.p_glReadPixels(0, 0, surface->resource.width, surface->resource.height, - fmt, type, data.addr); + surface->resource.format->glFormat, + surface->resource.format->glType, data.addr); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 044eed0..c077567 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -743,7 +743,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, 0, - ARB_FRAGMENT_PROGRAM, NULL}, + 0, NULL}, /* Standard ARGB formats */ {WINED3DFMT_B8G8R8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, 0,

1 0

Henri Verbeet : d2d1: Add the ID2D1Brush interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: eb4d5c7a254fe5e1e688e874c7b142e9d8d1331f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d5c7a254fe5e1e688e874c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:26 2014 +0200 d2d1: Add the ID2D1Brush interface. --- include/d2d1.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 367905c..ef05f00 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -543,5 +543,24 @@ interface ID2D1Bitmap : ID2D1Image ); } +[ + local, + object, + uuid(2cd906a8-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Brush : ID2D1Resource +{ + void SetOpacity( + [in] float opacity + ); + void SetTransform( + [in] const D2D1_MATRIX_3X2_F *transform + ); + float GetOpacity(); + void GetTransform( + [out] D2D1_MATRIX_3X2_F *transform + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1Bitmap interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 2156e68a4ce47a2d1347d4c1efc40a0a6669e5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2156e68a4ce47a2d1347d4c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 13:02:38 2014 +0200 d2d1: Add the ID2D1Bitmap interface. --- include/d2d1.idl | 36 ++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 20 ++++++++++++++++++++ include/dcommon.h | 17 +++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 55a8f4d..367905c 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -17,9 +17,11 @@ */ import "unknwn.idl"; +import "dcommon.h"; import "d2dbasetypes.h"; interface ID2D1Factory; +interface ID2D1RenderTarget; interface IDWriteRenderingParams; typedef D2D_POINT_2F D2D1_POINT_2F; @@ -27,6 +29,9 @@ typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; typedef UINT64 D2D1_TAG; +typedef D2D_SIZE_U D2D1_SIZE_U; +typedef D2D_POINT_2U D2D1_POINT_2U; +typedef D2D_RECT_U D2D1_RECT_U; typedef enum D2D1_DEBUG_LEVEL { @@ -507,5 +512,36 @@ interface ID2D1Image : ID2D1Resource { } +[ + local, + object, + uuid(a2296057-ea42-4099-983b-539fb6505426) +] +interface ID2D1Bitmap : ID2D1Image +{ + D2D1_SIZE_F GetSize(); + D2D1_SIZE_U GetPixelSize(); + D2D1_PIXEL_FORMAT GetPixelFormat(); + void GetDpi( + [out] float *dpi_x, + [out] float *dpi_y + ); + HRESULT CopyFromBitmap( + [in] const D2D1_POINT_2U *dst_point, + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_U *src_rect + ); + HRESULT CopyFromRenderTarget( + [in] const D2D1_POINT_2U *dst_point, + [in] ID2D1RenderTarget *render_target, + [in] const D2D1_RECT_U *src_rect + ); + HRESULT CopyFromMemory( + [in] const D2D1_RECT_U *dst_rect, + [in] const void *src_data, + [in] UINT32 pitch + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 4ddb994..61158ac 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -45,3 +45,23 @@ typedef struct D2D_SIZE_F float width; float height; } D2D_SIZE_F; + +typedef struct D2D_SIZE_U +{ + UINT32 width; + UINT32 height; +} D2D_SIZE_U; + +typedef struct D2D_POINT_2U +{ + UINT32 x; + UINT32 y; +} D2D_POINT_2U; + +typedef struct D2D_RECT_U +{ + UINT32 left; + UINT32 top; + UINT32 right; + UINT32 bottom; +} D2D_RECT_U; diff --git a/include/dcommon.h b/include/dcommon.h index 50daefb..56445a3 100644 --- a/include/dcommon.h +++ b/include/dcommon.h @@ -19,6 +19,8 @@ #ifndef __WINE_DCOMMON_H #define __WINE_DCOMMON_H +#include "dxgiformat.h" + typedef enum DWRITE_MEASURING_MODE { DWRITE_MEASURING_MODE_NATURAL, @@ -26,4 +28,19 @@ typedef enum DWRITE_MEASURING_MODE DWRITE_MEASURING_MODE_GDI_NATURAL } DWRITE_MEASURING_MODE; +typedef enum D2D1_ALPHA_MODE +{ + D2D1_ALPHA_MODE_UNKNOWN = 0, + D2D1_ALPHA_MODE_PREMULTIPLIED = 1, + D2D1_ALPHA_MODE_STRAIGHT = 2, + D2D1_ALPHA_MODE_IGNORE = 3, + D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_ALPHA_MODE; + +typedef struct D2D1_PIXEL_FORMAT +{ + DXGI_FORMAT format; + D2D1_ALPHA_MODE alphaMode; +} D2D1_PIXEL_FORMAT; + #endif /* __WINE_DCOMMON_H */

1 0

Henri Verbeet : d2d1: Add the ID2D1Image interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 61a909069d29070685f6f59ff9f6ebda7593dcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a909069d29070685f6f59ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:24 2014 +0200 d2d1: Add the ID2D1Image interface. --- include/d2d1.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 6fcadee..55a8f4d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -498,5 +498,14 @@ interface ID2D1DrawingStateBlock : ID2D1Resource ); } +[ + local, + object, + uuid(65019f75-8da2-497c-b32c-dfa34e48ede6) +] +interface ID2D1Image : ID2D1Resource +{ +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1PathGeometry interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: a4b15c1bb5a07fc8ae9f610b4188f92f0321683c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b15c1bb5a07fc8ae9f610b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:22 2014 +0200 d2d1: Add the ID2D1PathGeometry interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index bfed202..c6b9288 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -429,5 +429,26 @@ interface ID2D1GeometrySink : ID2D1SimplifiedGeometrySink ); } +[ + local, + object, + uuid(2cd906a5-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1PathGeometry : ID2D1Geometry +{ + HRESULT Open( + [out] ID2D1GeometrySink **sink + ); + HRESULT Stream( + [in] ID2D1GeometrySink *sink + ); + HRESULT GetSegmentCount( + [out] UINT32 *count + ); + HRESULT GetFigureCount( + [out] UINT32 *count + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Piotr Caban : user32: Fix LoadStringA behavior on 1-character long buffer.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c2df317c4b7be489d63fd559d7fb6676578a0bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2df317c4b7be489d63fd559d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:27 2014 +0200 user32: Fix LoadStringA behavior on 1-character long buffer. --- dlls/user32/resource.c | 3 ++- dlls/user32/tests/resource.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1917d51..83442d8 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -310,7 +310,8 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT while (id--) p += *p + 1; - RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); + if (buflen != 1) + RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); } buffer[retval] = 0; TRACE("returning %s\n", debugstr_a(buffer)); diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 9cb7380..2388adb 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -126,6 +126,13 @@ static void test_LoadStringA (void) ok( ret == -1 || broken(ret == 0), "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + buf[0] = 'a'; + ret = LoadStringA(hInst, 1, buf, 1); + ok( !ret, "LoadString returned %d\n", ret); + ok( buf[0] == 0, "buf[0] = %c (%x)\n", buf[0], buf[0]); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); } static void test_accel1(void)

1 0

Stefan Dösinger : wined3d: Don' t update the color table on palette changes.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 544816797adc4de21713abe4c9e208692d88eaa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544816797adc4de21713abe4c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:53 2014 +0200 wined3d: Don't update the color table on palette changes. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- dlls/wined3d/surface.c | 15 +++------------ 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ef07b97..c8f7d65 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5126,7 +5126,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -5139,7 +5139,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 64aa519..23795d3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6194,7 +6194,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -6207,7 +6207,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b760dfb..3d0bfe5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7096,7 +7096,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -7109,7 +7109,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8c5f6ac..97a6a19 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6818,7 +6818,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -6831,7 +6831,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8e4b88b..dea27ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -787,12 +787,6 @@ static void surface_realize_palette(struct wined3d_surface *surface) } } - if (surface->flags & SFLAG_DIBSECTION) - { - TRACE("Updating the DC's palette.\n"); - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); - } - /* Propagate the changes to the drawable when we have a palette. */ if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) surface_load_location(surface, surface->draw_binding); @@ -1379,17 +1373,14 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) if (!palette) return; - if (surface->flags & SFLAG_DIBSECTION) - { - TRACE("Updating the DC's palette.\n"); - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); - } - /* Update the image because of the palette change. Some games like e.g. * Red Alert call SetEntries a lot to implement fading. */ /* Tell the swapchain to update the screen. */ if (surface->swapchain && surface == surface->swapchain->front_buffer) + { + SetDIBColorTable(surface->hDC, 0, 256, palette->colors); x11_copy_to_screen(surface->swapchain, NULL); + } } static void gdi_surface_unmap(struct wined3d_surface *surface)

1 0

Stefan Dösinger : wined3d: Remove WINED3D_CT_PALETTED_CK.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: bfb5be0f4b93aa36044847d8d930ec6224d5fc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb5be0f4b93aa36044847d8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:50 2014 +0200 wined3d: Remove WINED3D_CT_PALETTED_CK. There's no difference between WINED3D_CT_PALETTED_CK and WINED3D_CT_PALETTED with the palette index in the alpha channel. --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/surface.c | 10 +++------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 653298a..195c3ae 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7282,9 +7282,8 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; - BOOL colorkey = !!(surface->container->color_key_flags & WINEDDSD_CKSRCBLT); - d3dfmt_p8_init_palette(surface, table, colorkey); + d3dfmt_p8_init_palette(surface, table); if (!priv->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &priv->palette_texture); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0e71de0..e0ba375 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1725,10 +1725,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ format->glInternal = GL_RGBA; format->glType = GL_UNSIGNED_BYTE; format->conv_byte_count = 4; - if (colorkey_active) - *conversion_type = WINED3D_CT_PALETTED_CK; - else - *conversion_type = WINED3D_CT_PALETTED; + *conversion_type = WINED3D_CT_PALETTED; } break; @@ -3426,7 +3423,7 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) { const struct wined3d_palette *pal = surface->palette; unsigned int i; @@ -3475,12 +3472,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } case WINED3D_CT_PALETTED: - case WINED3D_CT_PALETTED_CK: { BYTE table[256][4]; unsigned int x, y; - d3dfmt_p8_init_palette(surface, table, (conversion_type == WINED3D_CT_PALETTED_CK)); + d3dfmt_p8_init_palette(surface, table); for (y = 0; y < height; y++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7b5c57..9233148 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,7 +2341,6 @@ enum wined3d_conversion_type { WINED3D_CT_NONE, WINED3D_CT_PALETTED, - WINED3D_CT_PALETTED_CK, WINED3D_CT_CK_565, WINED3D_CT_CK_5551, WINED3D_CT_CK_RGB24, @@ -2349,7 +2348,7 @@ enum wined3d_conversion_type WINED3D_CT_CK_ARGB32, }; -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) DECLSPEC_HIDDEN; struct wined3d_sampler {

1 0

Stefan Dösinger : wined3d: Use GL_ALPHA8 for WINED3DFMT_P8_UINT surfaces.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 3cd83f4d56b94d6041acc4312073fbdb8f250a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd83f4d56b94d6041acc4312… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:52 2014 +0200 wined3d: Use GL_ALPHA8 for WINED3DFMT_P8_UINT surfaces. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c077567..6a27920 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -740,7 +740,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, /* Palettized formats */ - {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, + {WINED3DFMT_P8_UINT, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, 0, 0, NULL},

1 0

Stefan Dösinger : wined3d: Always store the palette index in the alpha component.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c1cca63e5ddcf7e6235889ed95aec844495e5de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cca63e5ddcf7e6235889ed9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:49 2014 +0200 wined3d: Always store the palette index in the alpha component. --- dlls/wined3d/surface.c | 184 ++++++++-------------------------------- dlls/wined3d/utils.c | 35 +------- dlls/wined3d/wined3d_private.h | 5 -- 3 files changed, 37 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1cca63e5ddcf7e623588…

1 0

Henri Verbeet : d2d1: Add the ID2D1DrawingStateBlock interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: d20be31395d39850da29651b90be83980ab575d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20be31395d39850da29651b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 13:02:37 2014 +0200 d2d1: Add the ID2D1DrawingStateBlock interface. --- include/d2d1.idl | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index c6b9288..6fcadee 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -19,10 +19,14 @@ import "unknwn.idl"; import "d2dbasetypes.h"; +interface ID2D1Factory; +interface IDWriteRenderingParams; + typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; +typedef UINT64 D2D1_TAG; typedef enum D2D1_DEBUG_LEVEL { @@ -138,6 +142,22 @@ typedef enum D2D1_ARC_SIZE D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff, } D2D1_ARC_SIZE; +typedef enum D2D1_ANTIALIAS_MODE +{ + D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0, + D2D1_ANTIALIAS_MODE_ALIASED = 1, + D2D1_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_ANTIALIAS_MODE; + +typedef enum D2D1_TEXT_ANTIALIAS_MODE +{ + D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0, + D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1, + D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2, + D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3, + D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_TEXT_ANTIALIAS_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -186,7 +206,14 @@ typedef struct D2D1_ARC_SEGMENT D2D1_ARC_SIZE arcSize; } D2D1_ARC_SEGMENT; -interface ID2D1Factory; +typedef struct D2D1_DRAWING_STATE_DESCRIPTION +{ + D2D1_ANTIALIAS_MODE antialiasMode; + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode; + D2D1_TAG tag1; + D2D1_TAG tag2; + D2D1_MATRIX_3X2_F transform; +} D2D1_DRAWING_STATE_DESCRIPTION; [ local, @@ -450,5 +477,26 @@ interface ID2D1PathGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(28506e39-ebf6-46a1-bb47-fd85565ab957) +] +interface ID2D1DrawingStateBlock : ID2D1Resource +{ + void GetDescription( + [out] D2D1_DRAWING_STATE_DESCRIPTION *desc + ); + void SetDescription( + [in] const D2D1_DRAWING_STATE_DESCRIPTION *desc + ); + void SetTextRenderingParams( + [in] IDWriteRenderingParams *text_rendering_params + ); + void GetTextRenderingParams( + [out] IDWriteRenderingParams **text_rendering_params + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Austin English : user32: Add a stub for RegisterTouchWindow.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 6458aca761f56dffcdf117e81450720c26a0c53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6458aca761f56dffcdf117e81… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 13 13:25:02 2014 -0500 user32: Add a stub for RegisterTouchWindow. --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 0b5754e..1425dac 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -573,6 +573,7 @@ @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) +@ stdcall RegisterTouchWindow(long long) # @ stub RegisterUserApiHook @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9e30321..c9660be 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3887,3 +3887,13 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) { return WIN_SetWindowLong( hwnd, offset, sizeof(LONG_PTR), newval, FALSE ); } + +/***************************************************************************** + * RegisterTouchWindow (USER32.@) + */ +BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) +{ + FIXME("(%p %08x): stub\n", hwnd, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Huw Davies : msxml3/tests: Fix test on win 8.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 305db0f65bc3a2e227bb8cd1972fde3d60b3c2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305db0f65bc3a2e227bb8cd19… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 14 08:02:25 2014 +0100 msxml3/tests: Fix test on win 8. --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 484be86..f5d6fcd 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1519,10 +1519,10 @@ static void test_get(void) if (!cache) return; hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); - EXPECT_HR(hr, E_NOTIMPL); + ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); hr = IXMLDOMSchemaCollection2_get(cache, _bstr_("uri"), &node); - ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); + EXPECT_HR(hr, E_NOTIMPL); IXMLDOMSchemaCollection2_Release(cache);

1 0

Nikolay Sivov : xmllite/writer: Implement GetProperty().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: d2737dde801b55a1feb4d7d489082d3ced33f2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2737dde801b55a1feb4d7d48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 14 11:52:13 2014 +0400 xmllite/writer: Implement GetProperty(). --- dlls/xmllite/reader.c | 6 ++--- dlls/xmllite/tests/writer.c | 23 +++++++++++++++++++ dlls/xmllite/writer.c | 52 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6e3f9cd..deb2d2e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -123,7 +123,7 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) return type_names[nodetype]; } -static const char *debugstr_prop(XmlReaderProperty prop) +static const char *debugstr_reader_prop(XmlReaderProperty prop) { static const char * const prop_names[] = { @@ -2537,7 +2537,7 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_prop(property), value); + TRACE("(%p)->(%s %p)\n", This, debugstr_reader_prop(property), value); if (!value) return E_INVALIDARG; @@ -2561,7 +2561,7 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_prop(property), value); + TRACE("(%p)->(%s %lu)\n", This, debugstr_reader_prop(property), value); switch (property) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b5935c1..738844f 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -71,6 +71,7 @@ static void test_writer_create(void) { HRESULT hr; IXmlWriter *writer; + LONG_PTR value; /* crashes native */ if (0) @@ -81,6 +82,28 @@ static void test_writer_create(void) hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* check default properties values */ + value = 0; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ByteOrderMark, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == TRUE, "got %ld\n", value); + + value = TRUE; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_Indent, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == FALSE, "got %ld\n", value); + + value = TRUE; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == FALSE, "got %ld\n", value); + + value = XmlConformanceLevel_Auto; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ConformanceLevel, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == XmlConformanceLevel_Document, "got %ld\n", value); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a58164b..2432602 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -52,6 +52,10 @@ typedef struct _xmlwriter LONG ref; IMalloc *imalloc; xmlwriteroutput *output; + BOOL indent; + BOOL bom; + BOOL omitxmldecl; + XmlConformanceLevel conformance; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -64,6 +68,23 @@ static inline xmlwriteroutput *impl_from_IXmlWriterOutput(IXmlWriterOutput *ifac return CONTAINING_RECORD(iface, xmlwriteroutput, IXmlWriterOutput_iface); } +static const char *debugstr_writer_prop(XmlWriterProperty prop) +{ + static const char * const prop_names[] = + { + "MultiLanguage", + "Indent", + "ByteOrderMark", + "OmitXmlDeclaration", + "ConformanceLevel" + }; + + if (prop > _XmlWriterProperty_Last) + return wine_dbg_sprintf("unknown property=%d", prop); + + return prop_names[prop]; +} + /* writer output memory allocation functions */ static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) { @@ -191,13 +212,34 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) return writeroutput_query_for_stream(This->output); } -static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) +static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LONG_PTR *value) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %u %p\n", This, nProperty, ppValue); + TRACE("(%p)->(%s %p)\n", This, debugstr_writer_prop(property), value); - return E_NOTIMPL; + if (!value) return E_INVALIDARG; + + switch (property) + { + case XmlWriterProperty_Indent: + *value = This->indent; + break; + case XmlWriterProperty_ByteOrderMark: + *value = This->bom; + break; + case XmlWriterProperty_OmitXmlDeclaration: + *value = This->omitxmldecl; + break; + case XmlWriterProperty_ConformanceLevel: + *value = This->conformance; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue) @@ -567,6 +609,10 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writer->output = NULL; + writer->indent = FALSE; + writer->bom = TRUE; + writer->omitxmldecl = FALSE; + writer->conformance = XmlConformanceLevel_Document; *obj = &writer->IXmlWriter_iface;

1 0

Francois Gouget : testbot/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 82049e35353b4da6d074977cf1b05003c22283dd URL: http://source.winehq.org/git/tools.git/?a=commit;h=82049e35353b4da6d074977c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:43:47 2014 +0200 testbot/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running. Now the Engine will automatically pick up patches from the patches website as part of its periodic 'SafetyNet' check. However WinePatchesWebSubmit can still be used to avoid the potential 10 minutes delay. Also, running WinePatchesWebSubmit when the Engine is stopped no longer has the side effect of leaking files in the staging directory. --- testbot/bin/Engine.pl | 86 +++++++++++++++++++----------- testbot/bin/WinePatchesWebSubmit.pl | 53 +++--------------- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- 3 files changed, 63 insertions(+), 80 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 2bb563a..72e165c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -497,48 +497,73 @@ sub HandleWinePatchMLSubmission sub HandleWinePatchWebSubmission { - # Validate file name - if ($_[0] !~ m/([0-9a-fA-F]{32}_patch_\d+)/) + my $LatestWebPatchId = 0; + my $Patches = CreatePatches(); + foreach my $Patch (@{$Patches->GetItems()}) { - return "0Invalid file name"; + my $WebPatchId = $Patch->WebPatchId; + if (defined $WebPatchId and $LatestWebPatchId < $WebPatchId) + { + $LatestWebPatchId = $WebPatchId; + } } - my $FullFileName = "$DataDir/staging/$1"; - if ($_[1] !~ m/^(\d+)$/) + + # Rescan the directory for robustness in case the patches site has already + # expired $LatestWebPatchId+1 (for instance if the WineTestBot has not been + # run for a while). + my (@ErrMessages, @WebPatchIds); + if (opendir(my $dh, "$DataDir/webpatches")) { - return "0Invalid patch id"; + foreach my $Entry (readdir($dh)) + { + next if ($Entry !~ /^(\d+)$/); + my $WebPatchId = $1; + next if ($WebPatchId <= $LatestWebPatchId); + + my $Patches = CreatePatches($Patches); + $Patches->AddFilter("WebPatchId", [$WebPatchId]); + if (@{$Patches->GetKeys()}) + { + push @ErrMessages, "$WebPatchId already exists and yet the latest patch is $LatestWebPatchId"; + next; + } + push @WebPatchIds, $WebPatchId; + } + close($dh); } - my $WebPatchId = $1; - my $Patches = CreatePatches(); - $Patches->AddFilter("WebPatchId", [$WebPatchId]); - if (@{$Patches->GetKeys()}) + else { - LogMsg "Patch $WebPatchId already exists\n"; - return "1OK"; + return "0Unable to open '$DataDir/webpatches': $!"; } - # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) + # Add the patches in increasing WebPatchId order so that next time + # $LatestWebPatchId still makes sense in case something goes wrong now + foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + # Create a working dir + my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + while (-e $WorkDir) + { + $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + } + mkdir $WorkDir; - # Process the patch - my $Parser = new MIME::Parser; - $Parser->output_dir($WorkDir); - my $Entity = $Parser->parse_open($FullFileName); - my $ErrMessage = CreatePatches()->NewPatch($Entity, $WebPatchId); + # Process the patch + my $Parser = new MIME::Parser; + $Parser->output_dir($WorkDir); + my $Entity = $Parser->parse_open("$DataDir/webpatches/$WebPatchId"); + my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); - # Clean up - if (!rmtree($WorkDir)) - { - # Not a fatal error but log it to help diagnosis - LogMsg "Unable to delete '$WorkDir': $!\n"; + # Clean up + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } } - unlink($FullFileName); - return defined($ErrMessage) ? "0" . $ErrMessage : "1OK"; + return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } sub HandleGetScreenshot @@ -629,6 +654,7 @@ sub SafetyNet { CheckJobs(); ScheduleJobs(); + HandleWinePatchWebSubmission(); my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); diff --git a/testbot/bin/WinePatchesWebSubmit.pl b/testbot/bin/WinePatchesWebSubmit.pl index d5b032a..15a5fd5 100755 --- a/testbot/bin/WinePatchesWebSubmit.pl +++ b/testbot/bin/WinePatchesWebSubmit.pl @@ -37,56 +37,15 @@ sub BEGIN } } -use File::Copy; -use WineTestBot::Config; use WineTestBot::Log; -use WineTestBot::Utils; -use WineTestBot::Patches; use WineTestBot::Engine::Notify; -my ($MaxCount) = @ARGV; -if (defined $MaxCount) +# Just tell the Engine to rescan the webpatches directory +my $ErrMessage = WinePatchWebSubmission(); +if (defined $ErrMessage) { - $MaxCount =~ m/^(\d+)$/; - $MaxCount = $1; + LogMsg "$ErrMessage\n"; + exit(1); } -my $LastWebPatchId = 0; -foreach my $Patch (@{CreatePatches()->GetItems()}) -{ - my $WebPatchId = $Patch->WebPatchId; - if (defined $WebPatchId and $LastWebPatchId < $WebPatchId) - { - $LastWebPatchId = $WebPatchId; - } -} - -while (1) -{ - $LastWebPatchId++; - my $NewPatch = "$DataDir/webpatches/$LastWebPatchId"; - last if (!-f $NewPatch); - - my $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_patch_$LastWebPatchId") - { - $FileNameRandomPart = GenerateRandomString(32); - } - my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_patch_$LastWebPatchId"; - - if (!copy($NewPatch, $StagingFileName)) - { - LogMsg "Unable to copy '$NewPatch' to '$StagingFileName': $!\n"; - exit 1; - } - - WinePatchWebSubmission("${FileNameRandomPart}_patch_$LastWebPatchId", $LastWebPatchId); - LogMsg "Added wine-patches patch $LastWebPatchId\n"; - if (defined $MaxCount) - { - $MaxCount--; - last if ($MaxCount == 0); - } -} - -exit; +exit(0); diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 09191ee..1f93db4 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -233,9 +233,7 @@ sub WinePatchMLSubmission sub WinePatchWebSubmission { - my ($FileName, $WebPatchId) = @_; - - my $Reply = SendCmdReceiveReply("winepatchwebsubmission $FileName $WebPatchId\n"); + my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/VMs: Catch the Libvirt exceptions in IsPoweredOn ().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: f82c4e5293766e926c8b1bde2e353d58ab13d902 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f82c4e5293766e926c8b1bde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:36:17 2014 +0200 testbot/VMs: Catch the Libvirt exceptions in IsPoweredOn(). --- testbot/lib/WineTestBot/VMs.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 1cf1a42..0aa06eb 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -352,7 +352,10 @@ sub IsPoweredOn($) my ($ErrMessage, $Domain) = $self->_GetDomain(); return undef if (defined $ErrMessage); - return $Domain->is_active(); + my $IsActive; + eval { $IsActive = $Domain->is_active() }; + return undef if ($@); + return $IsActive; } sub PowerOn

1 0

Francois Gouget : testbot/log2revtimes: Add a script to extract the VM revert times from the WineTestBot log and prepare them for analysis.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 8928cfed8b86c32d627ab8b0ace514d15b7469f3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8928cfed8b86c32d627ab8b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 12 19:31:27 2014 +0200 testbot/log2revtimes: Add a script to extract the VM revert times from the WineTestBot log and prepare them for analysis. --- testbot/scripts/log2revtimes | 324 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 324 insertions(+) diff --git a/testbot/scripts/log2revtimes b/testbot/scripts/log2revtimes new file mode 100755 index 0000000..2eac048 --- /dev/null +++ b/testbot/scripts/log2revtimes @@ -0,0 +1,324 @@ +#!/usr/bin/perl +# +# Parses the WineTestBot Engine's log to extract the VM revert times. +# +# Copyright 2013-2014 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use warnings; +use strict; + +use DateTime::Format::Strptime; + + +my $name0 = $0; +$name0 =~ s+^.*/++; + +sub error(@) +{ + print STDERR "$name0:error: ", @_; +} + + +# +# Command line parsing +# + +my $Usage; + +sub check_opt_val($$) +{ + my ($option, $val) = @_; + + if (defined $val) + { + error("$option can only be specified once\n"); + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + error("missing value for $option\n"); + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +sub CheckAndConvertDate($) +{ + my ($DateStr) = @_; + return undef if (!defined $DateStr); + + my $DateParser = DateTime::Format::Strptime->new( + pattern => '%Y/%m/%d', + time_zone => 'local', + ); + my $DT = $DateParser->parse_datetime($DateStr); + if (!defined $DT) + { + error("'$DateStr' is not a valid timestamp\n"); + $Usage = 2; + return undef; + } + return $DT->epoch; +} + +my ($OptLogFile, $OptMixed, $OptStart, $OptStop, $OptMaxLines); + +while (@ARGV) +{ + my $arg = shift @ARGV; + if ($arg eq "--help") + { + $Usage = 0; + } + elsif ($arg eq "--mixed") + { + $OptMixed = 1; + } + elsif ($arg eq "--start") + { + $OptStart = check_opt_val($arg, $OptStart); + } + elsif ($arg eq "--stop") + { + $OptStop = check_opt_val($arg, $OptStop); + } + elsif ($arg eq "--max-lines") + { + $OptMaxLines = check_opt_val($arg, $OptMaxLines); + } + elsif (!defined $OptLogFile) + { + $OptLogFile = $arg; + } + else + { + error("unexpected argument '$arg'\n"); + $Usage = 2; + } +} + +if (!defined $Usage) +{ + if (!defined $OptLogFile) + { + error("you must specify the log file to analyze\n"); + $Usage = 2; + } + $OptStart = CheckAndConvertDate($OptStart); + $OptStop = CheckAndConvertDate($OptStop); + if (defined $OptStart and defined $OptStop and $OptStop <= $OptStart) + { + error("the start date must be earlier than the stop date\n"); + $Usage = 2; + } + if (defined $OptMaxLines) + { + my $oldwarn = $SIG{__WARN__}; + $SIG{__WARN__} = sub { die $_[0] }; + my $bad = eval { $OptMaxLines < 1 }; + if (defined $oldwarn) + { + $SIG{__WARN__} = $oldwarn; + } + else + { + delete $SIG{__WARN__}; + } + if ($bad or $@) + { + error("the maximum line count is invalid\n"); + $Usage = 2; + } + } +} +if (defined $Usage) +{ + if ($Usage) + { + error("try '$name0 --help' for more information\n"); + exit $Usage; + } + print "Usage: $name0 [--help] LOGFILE\n"; + print "\n"; + print "Analyzes a WineTestBot log file and generates a report on stdout containing the revert times per VM. The report is tab-separated and is suitable for import into a spreadsheet.\n"; + print "\n"; + print "Where:\n"; + print " LOGFILE Is the log file to analyze.\n"; + print " --mixed Report the revert times of all the VMs together instead of\n"; + print " having a set of columns for each VM.\n"; + print " --start DATE Only report about revert starting on or after the specified\n"; + print " date (in yyyy/mm/dd format).\n"; + print " --stop DATE Only report about revert ending on or before the specified\n"; + print " date (in yyyy/mm/dd format).\n"; + print " --max-lines COUNT The maximum number of lines to return.\n"; + print " --help Shows this usage message.\n"; + exit 0; +} + + +# +# Log parsing +# + +my ($Lines, %VMReverts, %VMLines); + +sub AddRevert($$$$) +{ + my ($Date, $Duration, $VM, $Snapshot) = @_; + + if ($OptMixed) + { + print "$Date\t$Duration\t\"$VM\"\t\"$Snapshot\"\n"; + $Lines++; + return 0 if (defined $OptMaxLines and $Lines > $OptMaxLines); + } + else + { + # Skip reverts that have errors + return 1 if ($Duration < 0); + $VMReverts{$VM} ||= []; + push @{$VMReverts{$VM}}, [$Date, $Duration, $Snapshot]; + $VMLines{$VM}++; + return 0 if (defined $OptMaxLines and $VMLines{$VM} > $OptMaxLines); + } + return 1; +} + +if (open(my $fh, "<", $OptLogFile)) +{ + print "Timestamp\tDuration\tVM\tSnapshot\n" if ($OptMixed); + + my $DateParser = DateTime::Format::Strptime->new( + pattern => '%a %b %d %H:%M:%S %Y', + time_zone => 'local', + ); + + my (%Epochs, %Dates, %Snapshots); + my $Skip = defined $OptStart ? 1 : defined $OptStop ? 0 : undef; + foreach my $Line (<$fh>) + { + next if ($Line !~ s/^(.*?) RevertVM(?:\[[0-9]*\])?: (Reverting|Letting) ([a-zA-Z0-9-]+)//); + my ($DateStr, $Action, $VM) = ($1, $2, $3); + my $DT = $DateParser->parse_datetime($DateStr); + my $Epoch = $DT->epoch; + + if ($Skip) + { + if (defined $OptStart and $OptStart <= $Epoch) + { + $Skip = 0; + } + else + { + next; + } + } + elsif (defined $Skip and defined $OptStop and $Epoch > $OptStop) + { + last; + } + + if ($Action eq "Reverting") + { + if (defined $Epochs{$VM}) + { + # This revert never completed! + my $Snapshot = $Snapshots{$VM} || "Unknown"; + last if (!AddRevert($Dates{$VM}, -2, $VM, $Snapshot)); + } + + $Epochs{$VM} = $Epoch; + $Dates{$VM} = $DT->ymd("/") . " " . $DT->hms(); + $Snapshots{$VM} = $1 if ($Line =~ /to ([a-zA-Z0-9-]+)$/); + } + else + { + my $Snapshot = $Snapshots{$VM} || "Unknown"; + if (!defined $Epochs{$VM}) + { + # We don't have a start date for this revert! + last if (!AddRevert($Dates{$VM}, -1, $VM, "Unknown")); + } + else + { + my $Duration = $Epoch - $Epochs{$VM}; + last if (!AddRevert($Dates{$VM}, $Duration, $VM, $Snapshot)); + } + + delete $Epochs{$VM}; + delete $Dates{$VM}; + delete $Snapshots{$VM}; + } + } + close($fh); +} +else +{ + error("unable to open '$OptLogFile' for reading: $!\n"); + exit 1; +} + + +# +# Report output +# + +if (!$OptMixed) +{ + my $First=1; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + print "$VM\t\t"; + } + print "\n"; + + $First=1; + my $LineCount = 0; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + print "Date\tDuration\tSnapshot"; + $LineCount = $VMLines{$VM} if ($LineCount < $VMLines{$VM}); + } + print "\n"; + + for (my $i = 0; $i < $LineCount; $i++) + { + $First=1; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + + my $Revert = $VMReverts{$VM}->[$i]; + if ($Revert) + { + my ($Date, $Duration, $Snapshot) = @$Revert; + print "$Date\t$Duration\t$Snapshot"; + } + else + { + print "\t\t"; + } + } + print "\n"; + } +}

1 0

Francois Gouget : testbot/web: Fix handling of tasks error messages.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 02d6cb133c3d87be0ded493a8eaf96c81d48960c URL: http://source.winehq.org/git/tools.git/?a=commit;h=02d6cb133c3d87be0ded493a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:35:37 2014 +0200 testbot/web: Fix handling of tasks error messages. The <pre><code> tag nesting was broken for the error messages, resulting in unreadable multi-line error messages and an inability to view the later tasks reports. --- testbot/web/JobDetails.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index b1a3186..04ec3c5 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -402,10 +402,10 @@ sub GenerateBody { print "</code></pre>\n"; } + print "<br><pre><code>"; $PrintedDll = $CurrentDll; } - print "<br>\n"; - print "<pre><code>", $self->escapeHTML($Line), "\n"; + print $self->escapeHTML($Line), "\n"; } close ERRFILE; }

1 0

Francois Gouget : testbot/WinePatchesMLSubmit: Better handle errors and times when the Engine is not running.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 2cdc80043ed19e500164d4255a2551bb24089203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2cdc80043ed19e500164d425… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 02:41:26 2014 +0200 testbot/WinePatchesMLSubmit: Better handle errors and times when the Engine is not running. WinePatchesMLSubmit must return a non-zero exit code in case it could not deliver the message so the caller gets a chance to handle the situation gracefully. Have the Engine scan the staging directory for pending patches from the mailing list and automatically handle them, in particular on startup. This makes it possible for WinePatchesMLSubmit to deliver the patches even if the Engine is not running which is more robust. This also fixes a potential source of staging files leak. --- testbot/bin/Engine.pl | 77 ++++++++++++++++-------------- testbot/bin/WinePatchesMLSubmit.pl | 24 +++++++--- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- 3 files changed, 61 insertions(+), 44 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ea04461..2bb563a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -446,36 +446,53 @@ sub HandleFoundWinetestUpdate sub HandleWinePatchMLSubmission { - # Validate file name - if ($_[0] !~ m/([0-9a-fA-F]{32}_wine-patches)/) + my $dh; + if (!opendir($dh, "$DataDir/staging")) { - return "0Invalid file name"; + return "0Unable to open '$DataDir/staging': $!"; } - my $FullMessageFileName = "$DataDir/staging/$1"; - # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) + # Read the directory ahead as we'll be adding / removing entries + my @Entries = readdir($dh); + closedir($dh); + + my @ErrMessages; + foreach my $Entry (@Entries) { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + # Validate file name + next if ($Entry !~ m/^([0-9a-fA-F]{32}_wine-patches)$/); + my $FullMessageFileName = "$DataDir/staging/$1"; - # Process the patch - my $Parser = new MIME::Parser; - $Parser->output_dir($WorkDir); - my $Entity = $Parser->parse_open($FullMessageFileName); - CreatePatches()->NewPatch($Entity); + # Create a work directory + my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + while (-e $WorkDir) + { + $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + } + mkdir $WorkDir; - # Clean up - if (!rmtree($WorkDir)) - { - # Not a fatal error but log it to help diagnosis - LogMsg "Unable to delete '$WorkDir': $!\n"; + # Process the patch + my $Parser = new MIME::Parser; + $Parser->output_dir($WorkDir); + my $Entity = $Parser->parse_open($FullMessageFileName); + my $ErrMessage = CreatePatches()->NewPatch($Entity); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + + # Clean up + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } + if (!unlink($FullMessageFileName)) + { + # This is more serious because it could cause a patch to be added + # again and again. But there is not much we can do. + LogMsg "Unable to delete '$FullMessageFileName': $!\n"; + } } - unlink($FullMessageFileName); - return "1OK"; + return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } sub HandleWinePatchWebSubmission @@ -613,19 +630,6 @@ sub SafetyNet CheckJobs(); ScheduleJobs(); - if (opendir STAGING, "$DataDir/staging") - { - my @DirEntries = readdir STAGING; - closedir STAGING; - foreach my $DirEntry (@DirEntries) - { - if ($DirEntry =~ m/[0-9a-fA-F]{32}_wine-patches/) - { - HandleWinePatchMLSubmission($DirEntry); - } - } - } - my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); if (defined($ErrMessage)) @@ -737,6 +741,9 @@ sub main Cleanup(); + # Check for patches that arrived while the server was off. + HandleWinePatchMLSubmission(); + my $SockName = "$DataDir/socket/engine"; my $uaddr = sockaddr_un($SockName); my $proto = getprotobyname('tcp'); diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index ffc65cb..e904bbc 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -41,16 +41,28 @@ use File::Copy; use WineTestBot::Config; use WineTestBot::Utils; use WineTestBot::Engine::Notify; +use WineTestBot::Log; # Store the message in the staging dir -my $FileNameRandomPart = GenerateRandomString(32); -while (-e ("$DataDir/staging/${FileNameRandomPart}_wine-patches")) +my $FileName = GenerateRandomString(32) . "_wine-patches"; +while (-e ("$DataDir/staging/$FileName")) { - $FileNameRandomPart = GenerateRandomString(32); + $FileName = GenerateRandomString(32); } -copy(\*STDIN, "$DataDir/staging/${FileNameRandomPart}_wine-patches"); +if (!copy(\*STDIN, "$DataDir/staging/$FileName")) +{ + LogMsg "Unable to copy the email to '$FileName': $!\n"; + exit 1; +} + -# Let the engine handle it -WinePatchMLSubmission("${FileNameRandomPart}_wine-patches"); +# Notify the Engine of the new message +my $ErrMessage = WinePatchMLSubmission(); +if (defined $ErrMessage) +{ + # The Engine will pick up the email later so return success anyway. + # But still log the issue so it can be checked out. + LogMsg "$ErrMessage\n" +} exit 0; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index f376337..09191ee 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -218,9 +218,7 @@ sub FoundWinetestUpdate sub WinePatchMLSubmission { - my $FileName = $_[0]; - - my $Reply = SendCmdReceiveReply("winepatchmlsubmission $FileName\n"); + my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/Engine: Rename the TaskComplete() notification to RescheduleJobs().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 8e09345b413f4bc7acd64d3dcc3691b20934ab6a URL: http://source.winehq.org/git/tools.git/?a=commit;h=8e09345b413f4bc7acd64d3d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 02:34:31 2014 +0200 testbot/Engine: Rename the TaskComplete() notification to RescheduleJobs(). It did not actually use the Task ID and only calls ScheduleJobs() so the new name is more accurate. --- testbot/bin/Engine.pl | 6 +++--- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- testbot/lib/WineTestBot/Engine/Notify.pm | 8 +++----- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f0570d7..ea04461 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -390,12 +390,12 @@ sub HandleJobRestart return "1OK"; } -sub HandleTaskComplete +sub HandleRescheduleJobs { my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { - LogMsg "Scheduling problem in HandleTaskComplete: $ErrMessage\n"; + LogMsg "Scheduling problem in HandleRescheduleJobs: $ErrMessage\n"; } return "1OK"; @@ -560,7 +560,7 @@ my %Handlers=( "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, - "taskcomplete" => \&HandleTaskComplete, + "reschedulejobs" => \&HandleRescheduleJobs, "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e8561c9..b07454b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -76,7 +76,7 @@ sub FatalError($$$$) $VM->Save(); } - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -333,7 +333,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 562b9d1..555f4e4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -76,7 +76,7 @@ sub FatalError($$$$) $VM->Save(); } - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -291,7 +291,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index efeac8d..2413a76 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -84,7 +84,7 @@ sub FatalError($$$$$) $VM->Status('dirty'); $VM->Save(); - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -383,7 +383,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") completed\n"; exit 0; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 1a1ab6d..f376337 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -34,7 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel - &JobRestart &TaskComplete &VMStatusChange &FoundWinetestUpdate + &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -167,11 +167,9 @@ sub JobRestart return substr($Reply, 1); } -sub TaskComplete +sub RescheduleJobs { - my ($JobKey, $StepKey, $TaskKey) = @_; - - my $Reply = SendCmdReceiveReply("taskcomplete $JobKey $StepKey $TaskKey\n"); + my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/web: Always use a random prefix for the staging filename.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 3471277f654cb79ac2dc0c4393c37a4a3fab47d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3471277f654cb79ac2dc0c43… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 14 19:34:06 2014 +0200 testbot/web: Always use a random prefix for the staging filename. Starting with the session id means we'll have to try again to find a new unique filename. --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index f73ae6a..0d9d0b4 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -794,7 +794,7 @@ sub OnSubmit # Make sure the file has a unique name even when not picked up directly # by the engine - my $FileNameRandomPart = $self->GetCurrentSession()->Id; + my $FileNameRandomPart = GenerateRandomString(32); while (-e ("$DataDir/staging/${FileNameRandomPart}_" . $self->GetParam("FileName"))) {

1 0

Jacek Caban : ntdll: Use MAP_PRIVATE for copy on write mappings.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 5ceb22714e965692acf2b0ec9af0dabc5dfc8b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ceb22714e965692acf2b0ec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 12:02:48 2014 +0200 ntdll: Use MAP_PRIVATE for copy on write mappings. --- dlls/kernel32/tests/virtual.c | 17 +++++++++++------ dlls/ntdll/virtual.c | 3 ++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 174d422..0955d30 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2489,7 +2489,7 @@ static void test_shared_memory(BOOL is_child) CloseHandle(mapping); } -static void test_shared_memory_ro(BOOL is_child) +static void test_shared_memory_ro(BOOL is_child, DWORD child_access) { HANDLE mapping; LONG *p; @@ -2501,7 +2501,7 @@ static void test_shared_memory_ro(BOOL is_child) ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); SetLastError(0xdeadbef); - p = MapViewOfFile(mapping, FILE_MAP_READ | (is_child ? FILE_MAP_WRITE : 0), 0, 0, 4096); + p = MapViewOfFile(mapping, is_child ? child_access : FILE_MAP_READ, 0, 0, 4096); ok(p != NULL, "MapViewOfFile error %d\n", GetLastError()); if (is_child) @@ -2517,14 +2517,17 @@ static void test_shared_memory_ro(BOOL is_child) DWORD ret; winetest_get_mainargs(&argv); - sprintf(cmdline, "\"%s\" virtual sharedmemro", argv[0]); + sprintf(cmdline, "\"%s\" virtual sharedmemro %x", argv[0], child_access); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); winetest_wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + if(child_access & FILE_MAP_WRITE) + ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + else + ok(!*p, "*p = %x, expected 0\n", *p); } UnmapViewOfFile(p); @@ -2551,7 +2554,7 @@ START_TEST(virtual) } if (!strcmp(argv[2], "sharedmemro")) { - test_shared_memory_ro(TRUE); + test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); return; } while (1) @@ -2580,7 +2583,9 @@ START_TEST(virtual) pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); test_shared_memory(FALSE); - test_shared_memory_ro(FALSE); + test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); + test_shared_memory_ro(FALSE, FILE_MAP_COPY); + test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d9acac6..70dea5a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2627,7 +2627,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, + (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Alexandre Julliard : ntdll: Determine the mapping type automatically from the WRITECOPY flag.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 2cef8dbcc29739278037e6409e0a00a4fa8dc0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cef8dbcc29739278037e6409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 12:28:58 2014 +0200 ntdll: Determine the mapping type automatically from the WRITECOPY flag. --- dlls/ntdll/virtual.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 70dea5a..4819d2d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -854,10 +854,11 @@ done: * The csVirtual section must be held by caller. */ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start, size_t size, - off_t offset, unsigned int vprot, int flags, BOOL removable ) + off_t offset, unsigned int vprot, BOOL removable ) { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); assert( start < view->size ); assert( start + size <= view->size ); @@ -872,7 +873,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { - if (mmap( (char *)view->base + start, size, prot, flags | MAP_FIXED, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; if ((errno == EPERM) && (prot & PROT_EXEC)) @@ -1094,7 +1095,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + !dup_mapping ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); @@ -1118,8 +1119,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ - if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, + !dup_mapping ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; @@ -1172,8 +1173,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sec->PointerToRawData, (int)pos, file_size, map_size, sec->Characteristics ); if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos, - VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, - MAP_SHARED, FALSE ) != STATUS_SUCCESS) + VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, FALSE ) != STATUS_SUCCESS) { ERR_(module)( "Could not map shared section %.8s\n", sec->Name ); goto error; @@ -1189,8 +1189,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (end > base) map_file_into_view( view, shared_fd, base, end - base, pos + (base - sec->VirtualAddress), - VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, FALSE ); + VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, FALSE ); } pos += map_size; continue; @@ -1212,7 +1211,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz end < file_start || map_file_into_view( view, fd, sec->VirtualAddress, file_size, file_start, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) + !dup_mapping ) != STATUS_SUCCESS) { ERR_(module)( "Could not map section %.8s, file probably truncated\n", sec->Name ); goto error; @@ -2627,8 +2626,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, - (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Alex Henrie : gdi32/tests: Add MS Shell Dlg tests.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 0fb88f8d01fd69e3d026fba069a66aa05413d48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb88f8d01fd69e3d026fba06… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 11 22:05:12 2014 -0600 gdi32/tests: Add MS Shell Dlg tests. --- dlls/gdi32/tests/font.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 255771a..0e75088 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4681,6 +4681,7 @@ static void test_EnumFonts(void) int ret; LOGFONTA lf; HDC hdc; + struct enum_fullname_data efnd; if (!is_truetype_font_installed("Arial")) { @@ -4741,6 +4742,28 @@ static void test_EnumFonts(void) ret = EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); ok(ret, "font Arial Italic Bold should not be enumerated\n"); + /* MS Shell Dlg and MS Shell Dlg 2 must exist */ + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); + todo_wine ok(!ret, "expected MS Shell Dlg got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg"); + ok(ret, "did not expect MS Shell Dlg\n"); + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg 2"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg 2 is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); + todo_wine ok(!ret, "expected MS Shell Dlg 2 got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); + ok(ret, "did not expect MS Shell Dlg 2\n"); + DeleteDC(hdc); }

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in a few more places.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 6ebe1c60e243ac2b70ec19cceebb7d1a6a8f2cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebe1c60e243ac2b70ec19cce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 18:56:30 2014 +0200 mshtml: Use debugstr_mshtml_guid in a few more places. --- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstylesheet.c | 42 +++++++++++++++++------------------------- dlls/mshtml/htmlwindow.c | 33 +++++++++------------------------ dlls/mshtml/main.c | 12 ++++++++++++ 4 files changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 3e169ba..60a2a3a 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -56,7 +56,7 @@ static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID rii return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 4258f79..8f48a07 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -68,17 +68,17 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_QueryInterface(IHTMLStyleShe { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetRulesCollection, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheetRulesCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } @@ -222,28 +222,24 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_QueryInterface(IHTMLStyleSheetsC { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetsCollection, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheetsCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheetsCollection_AddRef(IHTMLStyleSheetsCollection *iface) @@ -415,28 +411,24 @@ static HRESULT WINAPI HTMLStyleSheet_QueryInterface(IHTMLStyleSheet *iface, REFI { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheet, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheet %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheet_AddRef(IHTMLStyleSheet *iface) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a57dfba..1333608 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -141,59 +141,45 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IHTMLFramesCollection2, riid)) { - TRACE("(%p)->(IID_IHTMLFramesCollection2 %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IHTMLWindow2, riid)) { - TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { - TRACE("(%p)->(IID_IHTMLWindow3 %p)\n", This, ppv); *ppv = &This->IHTMLWindow3_iface; }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { - TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); *ppv = &This->IHTMLWindow4_iface; }else if(IsEqualGUID(&IID_IHTMLWindow5, riid)) { - TRACE("(%p)->(IID_IHTMLWindow5 %p)\n", This, ppv); *ppv = &This->IHTMLWindow5_iface; }else if(IsEqualGUID(&IID_IHTMLWindow6, riid)) { - TRACE("(%p)->(IID_IHTMLWindow6 %p)\n", This, ppv); *ppv = &This->IHTMLWindow6_iface; }else if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) { - TRACE("(%p)->(IID_IHTMLPrivateWindow %p)\n", This, ppv); *ppv = &This->IHTMLPrivateWindow_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { - TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { - TRACE("(%p)->(IID_ITravelLogClient %p)\n", This, ppv); *ppv = &This->ITravelLogClient_iface; }else if(IsEqualGUID(&IID_IObjectIdentity, riid)) { - TRACE("(%p)->(IID_IObjectIdentity %p)\n", This, ppv); *ppv = &This->IObjectIdentity_iface; }else if(dispex_query_interface(&This->inner_window->dispex, riid, ppv)) { assert(!*ppv); return E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) @@ -2407,8 +2393,7 @@ static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid UINT i; HRESULT hres; - WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); + WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); for(i=0; i < cNames; i++) { /* We shouldn't use script's IDispatchEx here, so we shouldn't use GetDispID */ @@ -2686,7 +2671,7 @@ static HRESULT WINAPI HTMLWindowSP_QueryService(IServiceProvider *iface, REFGUID return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); } - TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_mshtml_guid(guidService), debugstr_mshtml_guid(riid), ppv); if(!This->outer_window->doc_obj) return E_NOINTERFACE; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 5e9d7cb..c34a6d8 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -573,9 +573,11 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLElementCollection); X(IID_IHTMLEventObj); X(IID_IHTMLFiltersCollection); + X(IID_IHTMLFramesCollection2); X(IID_IHTMLImageElementFactory); X(IID_IHTMLLocation); X(IID_IHTMLOptionElementFactory); + X(IID_IHTMLPrivateWindow); X(IID_IHTMLRect); X(IID_IHTMLScreen); X(IID_IHTMLStorage); @@ -585,9 +587,18 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLStyle4); X(IID_IHTMLStyle5); X(IID_IHTMLStyle6); + X(IID_IHTMLStyleSheet); + X(IID_IHTMLStyleSheetRulesCollection); + X(IID_IHTMLStyleSheetsCollection); + X(IID_IHTMLWindow2); + X(IID_IHTMLWindow3); + X(IID_IHTMLWindow4); + X(IID_IHTMLWindow5); + X(IID_IHTMLWindow6); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); + X(IID_IObjectIdentity); X(IID_IObjectSafety); X(IID_IObjectWithSite); X(IID_IOleContainer); @@ -613,6 +624,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IServiceProvider); X(IID_ISupportErrorInfo); X(IID_ITargetContainer); + X(IID_ITravelLogClient); X(IID_IUnknown); X(IID_IViewObject); X(IID_IViewObject2);

1 0

Nikolay Sivov : xmllite/writer: Implement SetOutput() for writer.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 9080329e4e05eea155c08008618810fb88dd75e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9080329e4e05eea155c080086… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 18:25:37 2014 +0400 xmllite/writer: Implement SetOutput() for writer. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/writer.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6e51d5e..6e3f9cd 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -642,7 +642,7 @@ static void readerinput_release_stream(xmlreaderinput *readerinput) /* Queries already stored interface for IStream/ISequentialStream. Interface supplied on creation will be overwritten */ -static HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) +static inline HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) { HRESULT hr; diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 5266049..a58164b 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -39,15 +39,19 @@ typedef struct IXmlWriterOutput IXmlWriterOutput_iface; LONG ref; IUnknown *output; + ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; } xmlwriteroutput; +static const struct IUnknownVtbl xmlwriteroutputvtbl; + typedef struct _xmlwriter { IXmlWriter IXmlWriter_iface; LONG ref; IMalloc *imalloc; + xmlwriteroutput *output; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -82,6 +86,26 @@ static inline void writer_free(xmlwriter *writer, void *mem) m_free(writer->imalloc, mem); } +static void writeroutput_release_stream(xmlwriteroutput *writeroutput) +{ + if (writeroutput->stream) { + ISequentialStream_Release(writeroutput->stream); + writeroutput->stream = NULL; + } +} + +static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutput) +{ + HRESULT hr; + + writeroutput_release_stream(writeroutput); + hr = IUnknown_QueryInterface(writeroutput->output, &IID_IStream, (void**)&writeroutput->stream); + if (hr != S_OK) + hr = IUnknown_QueryInterface(writeroutput->output, &IID_ISequentialStream, (void**)&writeroutput->stream); + + return hr; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -116,6 +140,7 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { IMalloc *imalloc = This->imalloc; + if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -124,13 +149,46 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) } /*** IXmlWriter methods ***/ -static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *pOutput) +static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) { xmlwriter *This = impl_from_IXmlWriter(iface); + IXmlWriterOutput *writeroutput; + HRESULT hr; - FIXME("%p %p\n", This, pOutput); + TRACE("(%p)->(%p)\n", This, output); - return E_NOTIMPL; + if (This->output) { + writeroutput_release_stream(This->output); + IUnknown_Release(&This->output->IXmlWriterOutput_iface); + This->output = NULL; + } + + /* just reset current output */ + if (!output) + return S_OK; + + /* now try IXmlWriterOutput, ISequentialStream, IStream */ + hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&writeroutput); + if (hr == S_OK) { + if (writeroutput->lpVtbl == &xmlwriteroutputvtbl) + This->output = impl_from_IXmlWriterOutput(writeroutput); + else { + ERR("got external IXmlWriterOutput implementation: %p, vtbl=%p\n", + writeroutput, writeroutput->lpVtbl); + IUnknown_Release(writeroutput); + return E_FAIL; + + } + } + + if (hr != S_OK || !writeroutput) { + /* create IXmlWriterOutput basing on supplied interface */ + hr = CreateXmlWriterOutputWithEncodingName(output, This->imalloc, NULL, &writeroutput); + if (hr != S_OK) return hr; + This->output = impl_from_IXmlWriterOutput(writeroutput); + } + + return writeroutput_query_for_stream(This->output); } static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) @@ -471,6 +529,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) { IMalloc *imalloc = This->imalloc; if (This->output) IUnknown_Release(This->output); + if (This->stream) ISequentialStream_Release(This->stream); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -507,6 +566,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->ref = 1; writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); + writer->output = NULL; *obj = &writer->IXmlWriter_iface; @@ -537,6 +597,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, writeroutput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding, -1); + writeroutput->stream = NULL; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output);

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8LobbiedApplication Initialize.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: d9ae2b828e6783cc02273bf9018e2ebba93778df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae2b828e6783cc02273bf90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 14 14:53:40 2014 +1100 dpnet: Implement IDirectPlay8LobbiedApplication Initialize. --- dlls/dpnet/dpnet_private.h | 9 +++++++-- dlls/dpnet/lobbiedapp.c | 16 +++++++++++++--- dlls/dpnet/tests/client.c | 28 ++++++++++++++++++++++++++-- dlls/dpnet/tests/peer.c | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index af81474..8fd04d6 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -78,8 +78,13 @@ struct IDirectPlay8AddressImpl */ struct IDirectPlay8LobbiedApplicationImpl { - IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; - LONG ref; + IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; + LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; + DPNHANDLE *connection; }; /***************************************************************************** diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index b430776..507a895 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -89,9 +89,19 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8 void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, DPNHANDLE * const pdpnhConnection, const DWORD dwFlags) { - IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); - FIXME("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); + + TRACE("(%p)->(%p %p %p %x)\n", This, pvUserContext, pfn, pdpnhConnection, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPOINTER; + + This->msghandler = pfn; + This->flags = dwFlags; + This->usercontext = pvUserContext; + This->connection = pdpnhConnection; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_RegisterProgram(IDirectPlay8LobbiedApplication *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index bf0d26f..92bed55 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -21,10 +21,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Client* client = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) @@ -33,10 +35,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static BOOL test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -56,6 +65,14 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); + return client != NULL; } @@ -195,8 +212,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Client_Close(client, 0); ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); - hr = IDirectPlay8Client_Release(client); - ok(hr == S_OK, "IDirectPlay8Client_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Client_Release(client); CoUninitialize(); } diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 670b843..1fec1f2 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -20,10 +20,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Peer* peer = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) { @@ -31,10 +33,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static void test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -53,6 +62,18 @@ static void test_init_dp(void) hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, NULL, + &lobbyConnection, 0); + ok(hr == DPNERR_INVALIDPOINTER, "Failed with %x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); } static void test_enum_service_providers(void) @@ -198,8 +219,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Peer_Close(peer, 0); ok(hr == S_OK, "IDirectPlay8Peer_Close failed with %x\n", hr); - hr = IDirectPlay8Peer_Release(peer); - ok(hr == S_OK, "IDirectPlay8Peer_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Peer_Release(peer); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 239d8077db6e9ebf9f2b3eda31e1733e30d40143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239d8077db6e9ebf9f2b3eda3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 00:20:21 2014 +0400 msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates. --- dlls/msxml3/tests/domdoc.c | 27 ++++++++++++++++++++------- dlls/msxml3/xslpattern.y | 5 +++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 19b2951..b028996 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -494,7 +494,7 @@ static const char szExampleXML[] = " </description>\n" " </elem>\n" "\n" -" <elem>\n" +" <elem a='a'>\n" " <a>A2 field</a>\n" " <b>B2 field</b>\n" " <c type=\"old\">C2 field</c>\n" @@ -1074,14 +1074,16 @@ static char *list_to_string(IXMLDOMNodeList *list) static char buf[4096]; char *pos = buf; LONG len = 0; + HRESULT hr; int i; if (list == NULL) { - lstrcpyA(buf, "(null)"); + strcpy(buf, "(null)"); return buf; } - ole_check(IXMLDOMNodeList_get_length(list, &len)); + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); for (i = 0; i < len; i++) { IXMLDOMNode *node; @@ -4449,12 +4451,13 @@ static const xpath_test_t xpath_test[] = { { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, { "child::text()", "" }, { "child::*/..", "E2.D1" }, - { "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" }, + { "child::*//@*/..", "E2.E5.E1.E2.D1 E2.E2.D1 E3.E2.E2.D1" }, { "self::node()", "E2.D1" }, { "ancestor::node()", "D1" }, { "elem[c][last()]/a", "E1.E2.E2.D1"}, { "ancestor-or-self::node()[1]", "E2.D1" }, { "((//a)[1])[last()]", "E1.E1.E2.D1" }, + { "//elem[@*]", "E2.E2.D1" }, { NULL } }; @@ -4517,7 +4520,7 @@ static void test_XPath(void) str = list_to_string(list); - ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n", + ok(!strcmp(str, xptest->list), "query=%s, invalid node list: \"%s\", expected \"%s\"\n", xptest->query, str, xptest->list); if (list) @@ -6838,6 +6841,7 @@ static void test_default_properties(void) typedef struct { const char *query; const char *list; + BOOL todo; } xslpattern_test_t; static const xslpattern_test_t xslpattern_test[] = { @@ -6900,6 +6904,7 @@ static const xslpattern_test_t xslpattern_test[] = { { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" }, + { "root/elem[@*]", "E2.E2.D1 E3.E2.D1", TRUE }, { NULL } }; @@ -6977,8 +6982,16 @@ static void test_XSLPattern(void) len = 0; hr = IXMLDOMNodeList_get_length(list, &len); ok(len != 0, "query=%s, empty list\n", ptr->query); - if (len) - expect_list_and_release(list, ptr->list); + if (len) { + if (ptr->todo) { + char *str = list_to_string(list); + todo_wine + ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list); + IXMLDOMNodeList_Release(list); + } + else + expect_list_and_release(list, ptr->list); + } ptr++; } diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 4e3b699..9adb318 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -186,6 +186,11 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons $$=xmlStrcat($$,$2); xmlFree($2); } + | '@' '*' + { + TRACE("Got All attributes pattern: \"@*\"\n"); + $$=xmlStrdup(U("@*")); + } ; /* [2.3] Node Tests */

1 0

Henri Verbeet : d2d1: Add the ID2D1GeometrySink interface.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 29237d832bd5fd8b28282b5f951833d82089d564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29237d832bd5fd8b28282b5f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:13 2014 +0200 d2d1: Add the ID2D1GeometrySink interface. --- include/d2d1.idl | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 6 ++++++ 2 files changed, 61 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 27a617c..bfed202 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -22,6 +22,7 @@ import "d2dbasetypes.h"; typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; +typedef D2D_SIZE_F D2D1_SIZE_F; typedef enum D2D1_DEBUG_LEVEL { @@ -123,6 +124,20 @@ typedef enum D2D1_COMBINE_MODE D2D1_COMBINE_MODE_FORCE_DWORD = 0xffffffff, } D2D1_COMBINE_MODE; +typedef enum D2D1_SWEEP_DIRECTION +{ + D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE = 0, + D2D1_SWEEP_DIRECTION_CLOCKWISE = 1, + D2D1_SWEEP_DIRECTION_FORCE_DWORD = 0xffffffff, +} D2D1_SWEEP_DIRECTION; + +typedef enum D2D1_ARC_SIZE +{ + D2D1_ARC_SIZE_SMALL = 0, + D2D1_ARC_SIZE_LARGE = 1, + D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff, +} D2D1_ARC_SIZE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -156,6 +171,21 @@ typedef struct D2D1_ELLIPSE float radiusY; } D2D1_ELLIPSE; +typedef struct D2D1_QUADRATIC_BEZIER_SEGMENT +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; +} D2D1_QUADRATIC_BEZIER_SEGMENT; + +typedef struct D2D1_ARC_SEGMENT +{ + D2D1_POINT_2F point; + D2D1_SIZE_F size; + float rotationAngle; + D2D1_SWEEP_DIRECTION sweepDirection; + D2D1_ARC_SIZE arcSize; +} D2D1_ARC_SEGMENT; + interface ID2D1Factory; [ @@ -374,5 +404,30 @@ interface ID2D1TransformedGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd9069f-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GeometrySink : ID2D1SimplifiedGeometrySink +{ + void AddLine( + [in] D2D1_POINT_2F point + ); + void AddBezier( + [in] const D2D1_BEZIER_SEGMENT *bezier + ); + void AddQuadraticBezier( + [in] const D2D1_QUADRATIC_BEZIER_SEGMENT *bezier + ); + void AddQuadraticBeziers( + [in, size_is(bezier_count)] const D2D1_QUADRATIC_BEZIER_SEGMENT *beziers, + [in] UINT32 bezier_count + ); + void AddArc( + [in] const D2D1_ARC_SEGMENT *arc + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 385e0b3..4ddb994 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -39,3 +39,9 @@ typedef struct D2D_RECT_F float right; float bottom; } D2D_RECT_F; + +typedef struct D2D_SIZE_F +{ + float width; + float height; +} D2D_SIZE_F;

1 0