wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Hans Leidekker : xmllite: Implement CreateXmlWriterOutputWithEncodingCodePage.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: d1658260a2baa4be183baa8eb0003e57aa715337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1658260a2baa4be183baa8eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 5 17:13:57 2015 +0200 xmllite: Implement CreateXmlWriterOutputWithEncodingCodePage. --- dlls/xmllite/reader.c | 10 ++++++++++ dlls/xmllite/tests/writer.c | 19 ++++++++++++++++++ dlls/xmllite/writer.c | 44 ++++++++++++++++++++++++++++++++---------- dlls/xmllite/xmllite.spec | 2 +- dlls/xmllite/xmllite_private.h | 1 + 5 files changed, 65 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 2aa9d95..525b4f7 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -160,6 +160,16 @@ const WCHAR *get_encoding_name(xml_encoding encoding) return xml_encoding_map[encoding].name; } +xml_encoding get_encoding_from_codepage(UINT codepage) +{ + int i; + for (i = 0; i < sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]); i++) + { + if (xml_encoding_map[i].cp == codepage) return xml_encoding_map[i].enc; + } + return XmlEncoding_Unknown; +} + typedef struct { char *data; diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index d81a934..577b330 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -36,6 +36,10 @@ static HRESULT (WINAPI *pCreateXmlWriterOutputWithEncodingName)(IUnknown *stream IMalloc *imalloc, LPCWSTR encoding_name, IXmlWriterOutput **output); +static HRESULT (WINAPI *pCreateXmlWriterOutputWithEncodingCodePage)(IUnknown *stream, + IMalloc *imalloc, + UINT codepage, + IXmlWriterOutput **output); static HRESULT WINAPI testoutput_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { @@ -168,6 +172,7 @@ static BOOL init_pointers(void) #define MAKEFUNC(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return FALSE; MAKEFUNC(CreateXmlWriter); MAKEFUNC(CreateXmlWriterOutputWithEncodingName); + MAKEFUNC(CreateXmlWriterOutputWithEncodingCodePage); #undef MAKEFUNC return TRUE; @@ -193,6 +198,20 @@ static void test_writeroutput(void) ok(unk != NULL, "got %p\n", unk); /* releasing 'unk' crashes on native */ IUnknown_Release(output); + + output = NULL; + hr = pCreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, ~0u, &output); + ok(hr == S_OK, "got %08x\n", hr); + IUnknown_Release(output); + + hr = pCreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, CP_UTF8, &output); + ok(hr == S_OK, "got %08x\n", hr); + unk = NULL; + hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); + ok(hr == S_OK, "got %08x\n", hr); + ok(unk != NULL, "got %p\n", unk); + /* releasing 'unk' crashes on native */ + IUnknown_Release(output); } static void test_writestartdocument(void) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 8387935..fa01553 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -1085,19 +1085,12 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) return S_OK; } -HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, - IMalloc *imalloc, - LPCWSTR encoding, - IXmlWriterOutput **output) +static HRESULT create_writer(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + IXmlWriterOutput **output) { - static const WCHAR utf8W[] = {'U','T','F','-','8',0}; 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) @@ -1110,7 +1103,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, writeroutput->ref = 1; writeroutput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); - writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); + writeroutput->encoding = encoding; writeroutput->stream = NULL; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { @@ -1126,3 +1119,34 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, return S_OK; } + +HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, + IMalloc *imalloc, + LPCWSTR encoding, + IXmlWriterOutput **output) +{ + static const WCHAR utf8W[] = {'U','T','F','-','8',0}; + xml_encoding xml_enc; + + TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); + + if (!stream || !output) return E_INVALIDARG; + + xml_enc = parse_encoding_name(encoding ? encoding : utf8W, -1); + return create_writer(stream, imalloc, xml_enc, output); +} + +HRESULT WINAPI CreateXmlWriterOutputWithEncodingCodePage(IUnknown *stream, + IMalloc *imalloc, + UINT codepage, + IXmlWriterOutput **output) +{ + xml_encoding xml_enc; + + TRACE("%p %p %u %p\n", stream, imalloc, codepage, output); + + if (!stream || !output) return E_INVALIDARG; + + xml_enc = get_encoding_from_codepage(codepage); + return create_writer(stream, imalloc, xml_enc, output); +} diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec index 295bff6..d6ee017 100644 --- a/dlls/xmllite/xmllite.spec +++ b/dlls/xmllite/xmllite.spec @@ -2,5 +2,5 @@ @ stub CreateXmlReaderInputWithEncodingCodePage @ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr ptr long ptr ptr) @ stdcall CreateXmlWriter(ptr ptr ptr) -@ stub CreateXmlWriterOutputWithEncodingCodePage +@ stdcall CreateXmlWriterOutputWithEncodingCodePage(ptr ptr long ptr) @ stdcall CreateXmlWriterOutputWithEncodingName(ptr ptr wstr ptr) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 7936939..3f03379 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -71,5 +71,6 @@ typedef enum xml_encoding parse_encoding_name(const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; const WCHAR *get_encoding_name(xml_encoding) DECLSPEC_HIDDEN; +xml_encoding get_encoding_from_codepage(UINT) DECLSPEC_HIDDEN; #endif /* __XMLLITE_PRIVATE__ */

1 0

Hans Leidekker : netprofm: Create a connection point object for INetworkConnectionEvents.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: afb98a38ae5761cc1d31b748b0f31401fbb720fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb98a38ae5761cc1d31b748b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 5 17:13:31 2015 +0200 netprofm: Create a connection point object for INetworkConnectionEvents. --- dlls/netprofm/list.c | 3 ++- dlls/netprofm/tests/list.c | 4 ++++ include/netlistmgr.idl | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 1808178..245f7f4 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -551,7 +551,8 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo return E_POINTER; if (IsEqualGUID( riid, &IID_INetworkListManagerEvents ) || - IsEqualGUID( riid, &IID_INetworkCostManagerEvents )) + IsEqualGUID( riid, &IID_INetworkCostManagerEvents ) || + IsEqualGUID( riid, &IID_INetworkConnectionEvents )) return connection_point_create( cp, riid, iface ); FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 7e885c3..1e1ba82 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -116,6 +116,10 @@ static void test_INetworkListManager( void ) ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); if (hr == S_OK) IConnectionPoint_Release( pt ); + hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkConnectionEvents, &pt ); + ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); + if (hr == S_OK) IConnectionPoint_Release( pt ); + IConnectionPointContainer_Release( cpc ); INetworkListManager_Release( mgr ); } diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index fd3ef77..e6328f4 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -175,3 +175,25 @@ interface INetworkListManagerEvents : IUnknown HRESULT ConnectivityChanged( [in] NLM_CONNECTIVITY newConnectivity); } + +[ + object, + oleautomation, + pointer_default(unique), + uuid(dcb00007-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkConnectionEvents : IUnknown +{ + typedef enum NLM_CONNECTION_PROPERTY_CHANGE + { + NLM_CONNECTION_PROPERTY_CHANGE_AUTHENTICATION = 1 + } NLM_CONNECTION_PROPERTY_CHANGE; + + HRESULT NetworkConnectionConnectivityChanged( + [in] GUID connectionId, + [in] NLM_CONNECTIVITY newConnectivity); + + HRESULT NetworkConnectionPropertyChanged( + [in] GUID connectionId, + [in] NLM_CONNECTION_PROPERTY_CHANGE flags); +}

1 0

Hans Leidekker : ntdsapi: Implement DsClientMakeSpnForTargetServerW.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 2655ca253825775ea2164bef5a35979ad2c047bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2655ca253825775ea2164bef5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 5 17:13:08 2015 +0200 ntdsapi: Implement DsClientMakeSpnForTargetServerW. --- dlls/ntdsapi/ntdsapi.c | 26 ++++++++++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 2 +- dlls/ntdsapi/tests/ntdsapi.c | 31 +++++++++++++++++++++++++++++++ include/ntdsapi.h | 4 ++++ 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 4ca3b09..2a313ec 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -203,3 +203,29 @@ DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClas debugstr_w(ServiceClass), debugstr_w(UserObjectDN)); return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD *buflen, LPWSTR buf) +{ + DWORD len; + WCHAR *p; + + TRACE("(%s,%s,%p,%p)\n", debugstr_w(class), debugstr_w(name), buflen, buf); + + if (!class || !name || !buflen) return ERROR_INVALID_PARAMETER; + + len = strlenW(class) + 1 + strlenW(name) + 1; + if (*buflen < len) + { + *buflen = len; + return ERROR_BUFFER_OVERFLOW; + } + *buflen = len; + + memcpy(buf, class, strlenW(class) * sizeof(WCHAR)); + p = buf + strlenW(class); + *p++ = '/'; + memcpy(p, name, strlenW(name) * sizeof(WCHAR)); + buf[len] = 0; + + return ERROR_SUCCESS; +} diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index b3ed8be..925cb71 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -7,7 +7,7 @@ @ stub DsBindWithSpnA @ stub DsBindWithSpnW @ stub DsClientMakeSpnForTargetServerA -@ stub DsClientMakeSpnForTargetServerW +@ stdcall DsClientMakeSpnForTargetServerW(wstr wstr ptr ptr) @ stub DsCrackNamesA @ stub DsCrackNamesW @ stub DsCrackSpn2A diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c index 8290ed2..3d95d1b 100644 --- a/dlls/ntdsapi/tests/ntdsapi.c +++ b/dlls/ntdsapi/tests/ntdsapi.c @@ -84,7 +84,38 @@ static void test_DsMakeSpn(void) ok(spn_length == lstrlenW(wszSpn5) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn5) + 1, spn_length); } +static void test_DsClientMakeSpnForTargetServer(void) +{ + static const WCHAR classW[] = {'c','l','a','s','s',0}; + static const WCHAR hostW[] = {'h','o','s','t','.','d','o','m','a','i','n',0}; + static const WCHAR resultW[] = {'c','l','a','s','s','/','h','o','s','t','.','d','o','m','a','i','n',0}; + DWORD ret, len; + WCHAR buf[256]; + + ret = DsClientMakeSpnForTargetServerW( NULL, NULL, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = DsClientMakeSpnForTargetServerW( classW, NULL, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = DsClientMakeSpnForTargetServerW( classW, hostW, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + len = 0; + ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, NULL ); + ok( ret == ERROR_BUFFER_OVERFLOW, "got %u\n", ret ); + ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); + + len = sizeof(buf)/sizeof(buf[0]); + buf[0] = 0; + ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, buf ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); + ok( !lstrcmpW( buf, resultW ), "wrong data\n" ); +} + START_TEST( ntdsapi ) { test_DsMakeSpn(); + test_DsClientMakeSpnForTargetServer(); } diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 6d2902f3..672ea63 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -25,6 +25,10 @@ extern "C" { #endif +DWORD WINAPI DsClientMakeSpnForTargetServerA(LPCSTR, LPCSTR, DWORD*, LPSTR); +DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR, LPCWSTR, DWORD*, LPWSTR); +#define DsClientMakeSpnForTargetServer WINELIB_NAME_AW(DsClientMakeSpnForTargetServer) + DWORD WINAPI DsMakeSpnA(LPCSTR, LPCSTR, LPCSTR, USHORT, LPCSTR, DWORD*, LPSTR); DWORD WINAPI DsMakeSpnW(LPCWSTR, LPCWSTR, LPCWSTR, USHORT, LPCWSTR, DWORD*, LPWSTR); #define DsMakeSpn WINELIB_NAME_AW(DsMakeSpn)

1 0

Hans Leidekker : crypt32: Add stub implementations of CryptProtectMemory and CryptUnprotectMemory.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: a8baf4d3ef3410d55857dd42d50303ed2618a656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8baf4d3ef3410d55857dd42d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 5 17:12:44 2015 +0200 crypt32: Add stub implementations of CryptProtectMemory and CryptUnprotectMemory. --- dlls/crypt32/crypt32.spec | 2 ++ dlls/crypt32/main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 66d831b..e639d7c 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -163,6 +163,7 @@ @ stub CryptMsgVerifyCountersignatureEncoded @ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) +@ stdcall CryptProtectMemory(ptr long long) @ stdcall CryptQueryObject(long ptr long long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptRegisterDefaultOIDFunction(long str long wstr) @ stdcall CryptRegisterOIDFunction(long str str wstr str) @@ -186,6 +187,7 @@ @ stdcall CryptSignMessage(ptr long long ptr ptr ptr ptr) @ stub CryptSignMessageWithKey @ stdcall CryptUnprotectData(ptr ptr ptr ptr ptr long ptr) +@ stdcall CryptUnprotectMemory(ptr long long) @ stdcall CryptUnregisterDefaultOIDFunction(long str wstr) @ stdcall CryptUnregisterOIDFunction(long str str) @ stub CryptUnregisterOIDInfo diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index c4f6c78..241a1d9 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -250,3 +250,15 @@ ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x) FIXME("(%08x): stub\n", x); return NULL; } + +BOOL WINAPI CryptProtectMemory(void *data, DWORD len, DWORD flags) +{ + FIXME("(%p %u %08x): stub\n", data, len, flags); + return TRUE; +} + +BOOL WINAPI CryptUnprotectMemory(void *data, DWORD len, DWORD flags) +{ + FIXME("(%p %u %08x): stub\n", data, len, flags); + return TRUE; +}

1 0

Iván Matellanes : msvcirt: Implement filebuf status functions.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: d669e7452713b97413952a8bd6ea1b90ed1dc988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d669e7452713b97413952a8bd… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 5 20:32:35 2015 +0200 msvcirt: Implement filebuf status functions. --- dlls/msvcirt/msvcirt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e07ecb5..bf89650 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -915,8 +915,8 @@ filebuf* __thiscall filebuf_close(filebuf *this) DEFINE_THISCALL_WRAPPER(filebuf_fd, 4) filedesc __thiscall filebuf_fd(const filebuf *this) { - FIXME("(%p) stub\n", this); - return EOF; + TRACE("(%p)\n", this); + return this->fd; } /* ?is_open@filebuf@@QBEHXZ */ @@ -924,8 +924,8 @@ filedesc __thiscall filebuf_fd(const filebuf *this) DEFINE_THISCALL_WRAPPER(filebuf_is_open, 4) int __thiscall filebuf_is_open(const filebuf *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->fd != -1; } /* ?open@filebuf@@QAEPAV1@PBDHH@Z */

1 0

Iván Matellanes : msvcirt: Implement filebuf::open/ close.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 95fd3af19071a4493367ac3918f448cc2c8771a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fd3af19071a4493367ac391… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 5 20:32:29 2015 +0200 msvcirt: Implement filebuf::open/close. --- dlls/msvcirt/msvcirt.c | 74 +++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 139 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95fd3af19071a4493367a…

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest::getAllResponseHeaders() method implementation.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: bb060fe62fee675b16915395c3dfcfad5b1473eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb060fe62fee675b16915395c… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Aug 5 09:23:43 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::getAllResponseHeaders() method implementation. --- dlls/mshtml/tests/xmlhttprequest.c | 45 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/xmlhttprequest.c | 24 ++++++++++++++++++-- 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 3ee54ac..b7ecb49 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -421,8 +421,17 @@ static void create_xmlhttprequest(IHTMLDocument2 *doc) static void test_header(const struct HEADER_TYPE expect[], int num) { int i; - BSTR key, text; + BSTR key, text, all_header; HRESULT hres; + char all[4096], buf[512]; + + all_header = NULL; + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &all_header); + ok(hres == S_OK, "getAllResponseHeader failed: %08x\n", hres); + ok(all_header != NULL, "all_header == NULL\n"); + + WideCharToMultiByte(CP_UTF8, 0, all_header, -1, all, sizeof(all), NULL, NULL); + SysFreeString(all_header); for(i = 0; i < num; ++i) { text = NULL; @@ -434,6 +443,11 @@ static void test_header(const struct HEADER_TYPE expect[], int num) "Expect %s: %s, got %s\n", expect[i].key, expect[i].value, wine_dbgstr_w(text)); SysFreeString(key); SysFreeString(text); + + strcpy(buf, expect[i].key); + strcat(buf, ": "); + strcat(buf, expect[i].value); + ok(strstr(all, buf) != NULL, "AllResponseHeaders(%s) don't have expected substr(%s)\n", all, buf); } } @@ -495,6 +509,11 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) ok(text == NULL, "Expect NULL, got %p\n", text); text = (BSTR)0xdeadbeef; + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); + ok(hres == E_FAIL, "got %08x\n", hres); + ok(text == NULL, "text = %p\n", text); + + text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); ok(hres == E_FAIL, "got %08x\n", hres); ok(text == NULL, "text = %p\n", text); @@ -520,6 +539,11 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) } text = (BSTR)0xdeadbeef; + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); + ok(hres == E_FAIL, "got %08x\n", hres); + ok(text == NULL, "text = %p\n", text); + + text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); ok(hres == E_FAIL, "got %08x\n", hres); ok(text == NULL, "text = %p\n", text); @@ -627,6 +651,14 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) ok(hres == E_FAIL, "got %08x\n", hres); ok(text == NULL, "text = %p\n", text); + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, NULL); + ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + + text = (BSTR)0xdeadbeef; + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); + ok(hres == E_FAIL, "got %08x\n", hres); + ok(text == NULL, "text = %p\n", text); + val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); @@ -663,6 +695,11 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) } text = (BSTR)0xdeadbeef; + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); + ok(hres == E_FAIL, "got %08x\n", hres); + ok(text == NULL, "text = %p\n", text); + + text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); ok(hres == E_FAIL, "got %08x\n", hres); ok(text == NULL, "text = %p\n", text); @@ -702,6 +739,12 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) } text = NULL; + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); + ok(hres == S_OK, "getAllResponseHeader failed, got %08x\n", hres); + ok(text != NULL, "text == NULL\n"); + SysFreeString(text); + + text = NULL; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); ok(text != NULL, "text == NULL\n"); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 0321944..ea420c3 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -505,8 +505,28 @@ static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIAN static HRESULT WINAPI HTMLXMLHttpRequest_getAllResponseHeaders(IHTMLXMLHttpRequest *iface, BSTR *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsACString nscstr; + nsresult nsres; + HRESULT hres; + LONG state; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + hres = IHTMLXMLHttpRequest_get_readyState(iface, &state); + if(FAILED(hres)) + return hres; + + if(state < 2) { + *p = NULL; + return E_FAIL; + } + + nsACString_Init(&nscstr, NULL); + nsres = nsIXMLHttpRequest_GetAllResponseHeaders(This->nsxhr, &nscstr); + return return_nscstr(nsres, &nscstr, p); } static HRESULT WINAPI HTMLXMLHttpRequest_getResponseHeader(IHTMLXMLHttpRequest *iface, BSTR bstrHeader, BSTR *p)

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest::getResponseHeader() method implementation.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 44e644861866b788c105fb08f4c0ca7cd133c983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e644861866b788c105fb08f… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Aug 5 09:23:32 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::getResponseHeader() method implementation. --- dlls/mshtml/tests/xmlhttprequest.c | 84 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 32 ++++++++++++++- 2 files changed, 114 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 005e27c..3ee54ac 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -71,6 +71,7 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) }while(0) static IHTMLXMLHttpRequest *xhr = NULL; +static BSTR content_type = NULL; DEFINE_EXPECT(xmlhttprequest_onreadystatechange_opened); DEFINE_EXPECT(xmlhttprequest_onreadystatechange_headers_received); @@ -376,6 +377,11 @@ static void pump_msgs(BOOL *b) static const char EXPECT_RESPONSE_TEXT[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; +struct HEADER_TYPE { + const char *key; + const char *value; +}; + static void create_xmlhttprequest(IHTMLDocument2 *doc) { IHTMLWindow2 *window; @@ -412,6 +418,25 @@ static void create_xmlhttprequest(IHTMLDocument2 *doc) ok(xhr != NULL, "xhr == NULL\n"); } +static void test_header(const struct HEADER_TYPE expect[], int num) +{ + int i; + BSTR key, text; + HRESULT hres; + + for(i = 0; i < num; ++i) { + text = NULL; + key = a2bstr(expect[i].key); + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, key, &text); + ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); + ok(text != NULL, "text == NULL\n"); + ok(!strcmp_wa(text, expect[i].value), + "Expect %s: %s, got %s\n", expect[i].key, expect[i].value, wine_dbgstr_w(text)); + SysFreeString(key); + SysFreeString(text); + } +} + static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) { VARIANT vbool, vempty, var; @@ -419,6 +444,12 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) BSTR text; LONG val; HRESULT hres; + static const struct HEADER_TYPE expect_headers[] = { + {"Server", "Apache"}, + {"Accept-Ranges", "bytes"}, + {"Content-Length", "51"}, + {"Content-Type", "application/xml"} + }; create_xmlhttprequest(doc); if(!xhr) @@ -463,6 +494,11 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); ok(text == NULL, "Expect NULL, got %p\n", text); + text = (BSTR)0xdeadbeef; + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); + ok(hres == E_FAIL, "got %08x\n", hres); + ok(text == NULL, "text = %p\n", text); + method = a2bstr("GET"); url = a2bstr(xml_url); V_VT(&vbool) = VT_BOOL; @@ -483,6 +519,11 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) return; } + text = (BSTR)0xdeadbeef; + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); + ok(hres == E_FAIL, "got %08x\n", hres); + ok(text == NULL, "text = %p\n", text); + val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); @@ -508,6 +549,14 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) CHECK_CALLED(xmlhttprequest_onreadystatechange_loading); CHECK_CALLED(xmlhttprequest_onreadystatechange_done); + text = NULL; + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); + ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); + ok(text != NULL, "text == NULL\n"); + SysFreeString(text); + + test_header(expect_headers, sizeof(expect_headers)/sizeof(expect_headers[0])); + val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); ok(hres == S_OK, "get_status failed: %08x\n", hres); @@ -543,6 +592,10 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) BSTR text; LONG val; HRESULT hres; + static const struct HEADER_TYPE expect_headers[] = { + {"Content-Length", "51"}, + {"Content-Type", "application/xml"} + }; create_xmlhttprequest(doc); if(!xhr) @@ -559,6 +612,21 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) ok(V_VT(&var) == VT_DISPATCH, "V_VT(onreadystatechange) = %d\n", V_VT(&var)); ok(V_DISPATCH(&var) == (IDispatch*)&xmlhttprequest_onreadystatechange_obj, "unexpected onreadystatechange value\n"); + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, NULL, &text); + ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, NULL); + ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, NULL, NULL); + ok(hres == E_POINTER || broken(hres == E_INVALIDARG), /* Vista and before */ + "Expect E_POINTER, got %08x\n", hres); + + text = (BSTR)0xdeadbeef; + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); + ok(hres == E_FAIL, "got %08x\n", hres); + ok(text == NULL, "text = %p\n", text); + val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); @@ -594,6 +662,11 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) return; } + text = (BSTR)0xdeadbeef; + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); + ok(hres == E_FAIL, "got %08x\n", hres); + ok(text == NULL, "text = %p\n", text); + val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); @@ -628,6 +701,15 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) return; } + text = NULL; + hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); + ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); + ok(text != NULL, "text == NULL\n"); + ok(!strcmp_wa(text, "application/xml"), "text = %s\n", wine_dbgstr_w(text)); + SysFreeString(text); + + test_header(expect_headers, sizeof(expect_headers)/sizeof(expect_headers[0])); + val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); ok(hres == S_OK, "get_status failed: %08x\n", hres); @@ -707,12 +789,14 @@ START_TEST(xmlhttprequest) CoInitialize(NULL); + content_type = a2bstr("Content-Type"); doc = create_doc_from_url(start_url); if(doc) { test_sync_xhr(doc, xml_url); test_async_xhr(doc, xml_url); IHTMLDocument2_Release(doc); } + SysFreeString(content_type); CoUninitialize(); } diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 7be0f4c..0321944 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -512,8 +512,36 @@ static HRESULT WINAPI HTMLXMLHttpRequest_getAllResponseHeaders(IHTMLXMLHttpReque static HRESULT WINAPI HTMLXMLHttpRequest_getResponseHeader(IHTMLXMLHttpRequest *iface, BSTR bstrHeader, BSTR *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrHeader), p); - return E_NOTIMPL; + nsACString header, ret; + char *cstr; + nsresult nsres; + HRESULT hres; + LONG state; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrHeader), p); + + if(!p) + return E_POINTER; + if(!bstrHeader) + return E_INVALIDARG; + + hres = IHTMLXMLHttpRequest_get_readyState(iface, &state); + if(FAILED(hres)) + return hres; + + if(state < 2) { + *p = NULL; + return E_FAIL; + } + + cstr = heap_strdupWtoU(bstrHeader); + nsACString_InitDepend(&header, cstr); + nsACString_Init(&ret, NULL); + + nsres = nsIXMLHttpRequest_GetResponseHeader(This->nsxhr, &header, &ret); + + nsACString_Finish(&header); + heap_free(cstr); + return return_nscstr(nsres, &ret, p); } static HRESULT WINAPI HTMLXMLHttpRequest_setRequestHeader(IHTMLXMLHttpRequest *iface, BSTR bstrHeader, BSTR bstrValue)

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest:: statusText property implementation.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 74d07b7b0a95e9324a3e3029d9cf548eaa3332ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d07b7b0a95e9324a3e3029d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Aug 5 09:21:57 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::statusText property implementation. --- dlls/mshtml/tests/xmlhttprequest.c | 20 +++++++------- dlls/mshtml/xmlhttprequest.c | 53 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 713dedf..005e27c 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -457,11 +457,11 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url) ok(val == 0, "Expect 0, got %d\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, NULL); - todo_wine ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - todo_wine ok(text == NULL, "Expect NULL, got %p\n", text); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(text == NULL, "Expect NULL, got %p\n", text); method = a2bstr("GET"); url = a2bstr(xml_url); @@ -566,8 +566,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - todo_wine ok(text == NULL, "Expect NULL, got %p\n", text); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(text == NULL, "Expect NULL, got %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); @@ -600,8 +600,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) ok(val == 0, "Expect 0, got %d\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - todo_wine ok(text == NULL, "Expect NULL, got %p\n", text); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(text == NULL, "Expect NULL, got %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); @@ -635,9 +635,9 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) text = NULL; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - todo_wine ok(hres == S_OK, "get_statusText failed: %08x\n", hres); - todo_wine ok(text != NULL, "text == NULL\n"); - todo_wine ok(!strcmp_wa(text, "OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); + ok(hres == S_OK, "get_statusText failed: %08x\n", hres); + ok(text != NULL, "text == NULL\n"); + ok(!strcmp_wa(text, "OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); SysFreeString(text); val = 0xdeadbeef; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 5b5cf87..7be0f4c 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -60,6 +60,35 @@ static HRESULT variant_to_nsastr(VARIANT var, nsAString *ret) } } +static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) +{ + const char *str; + int len; + + if(NS_FAILED(nsres)) { + ERR("failed: %08x\n", nsres); + nsACString_Finish(nscstr); + return E_FAIL; + } + + nsACString_GetData(nscstr, &str); + + if(*str) { + len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0); + *p = SysAllocStringLen(NULL, len); + if(!*p) { + nsACString_Finish(nscstr); + return E_OUTOFMEMORY; + } + MultiByteToWideChar(CP_UTF8, 0, str, -1, *p, len); + }else { + *p = NULL; + } + + nsACString_Finish(nscstr); + return S_OK; +} + typedef struct XMLHttpReqEventListener XMLHttpReqEventListener; typedef struct { @@ -334,8 +363,28 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_status(IHTMLXMLHttpRequest *iface, static HRESULT WINAPI HTMLXMLHttpRequest_get_statusText(IHTMLXMLHttpRequest *iface, BSTR *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsACString nscstr; + nsresult nsres; + HRESULT hres; + LONG state; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + hres = IHTMLXMLHttpRequest_get_readyState(iface, &state); + if(FAILED(hres)) + return hres; + + if(state < 2) { + *p = NULL; + return E_FAIL; + } + + nsACString_Init(&nscstr, NULL); + nsres = nsIXMLHttpRequest_GetStatusText(This->nsxhr, &nscstr); + return return_nscstr(nsres, &nscstr, p); } static HRESULT WINAPI HTMLXMLHttpRequest_put_onreadystatechange(IHTMLXMLHttpRequest *iface, VARIANT v)

1 0

Stefan Dösinger : d3d9/tests: Mark testbot depth bias results broken.
by Alexandre Julliard 06 Aug '15

06 Aug '15

Module: wine Branch: master Commit: 961f4c0a2570ce47433886c7ce8b7cecc5d21b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961f4c0a2570ce47433886c7c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 31 21:37:10 2015 +0200 d3d9/tests: Mark testbot depth bias results broken. --- dlls/d3d9/tests/visual.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 275ee8f..0796013 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19754,19 +19754,28 @@ static void test_depthbias(void) ok(color_match(color, 0x00ffffff, 1), "Got unexpected color %08x at x=62, format %u.\n", color, formats[i]); color = getPixelColor(device, 65, 240); - ok(color_match(color, 0x000000ff, 1), "Got unexpected color %08x at x=64, format %u.\n", color, formats[i]); + /* The broken results are for the WARP driver on the testbot. It seems to initialize + * a scaling factor based on the first depth format that is used. Other formats with + * a different depth size then render incorrectly. */ + ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00ffffff, 1)), + "Got unexpected color %08x at x=64, format %u.\n", color, formats[i]); color = getPixelColor(device, 190, 240); - ok(color_match(color, 0x000000ff, 1), "Got unexpected color %08x at x=190, format %u.\n", color, formats[i]); + ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00ffffff, 1)), + "Got unexpected color %08x at x=190, format %u.\n", color, formats[i]); color = getPixelColor(device, 194, 240); - ok(color_match(color, 0x0000ff00, 1), "Got unexpected color %08x at x=194, format %u.\n", color, formats[i]); + ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x00ffffff, 1)), + "Got unexpected color %08x at x=194, format %u.\n", color, formats[i]); color = getPixelColor(device, 318, 240); - ok(color_match(color, 0x0000ff00, 1), "Got unexpected color %08x at x=318, format %u.\n", color, formats[i]); + ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x00ffffff, 1)), + "Got unexpected color %08x at x=318, format %u.\n", color, formats[i]); color = getPixelColor(device, 322, 240); - ok(color_match(color, 0x00ff0000, 1), "Got unexpected color %08x at x=322, format %u.\n", color, formats[i]); + ok(color_match(color, 0x00ff0000, 1) || broken(color_match(color, 0x00000000, 1)), + "Got unexpected color %08x at x=322, format %u.\n", color, formats[i]); color = getPixelColor(device, 446, 240); - ok(color_match(color, 0x00ff0000, 1), "Got unexpected color %08x at x=446, format %u.\n", color, formats[i]); + ok(color_match(color, 0x00ff0000, 1) || broken(color_match(color, 0x00000000, 1)), + "Got unexpected color %08x at x=446, format %u.\n", color, formats[i]); color = getPixelColor(device, 450, 240); ok(color_match(color, 0x00000000, 1), "Got unexpected color %08x at x=446, format %u.\n", color, formats[i]);

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015