December 2011 - Wine-commits

Nikolay Sivov : msxml3: Implement response headers access methods.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 02414775e9b25346b178775d971ddd6a14377b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02414775e9b25346b178775d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 18 21:00:24 2011 +0300 msxml3: Implement response headers access methods. --- dlls/msxml3/httprequest.c | 137 +++++++++++++++++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 25 ++++++++- 2 files changed, 148 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index cf4afe4..26241dd 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -56,7 +56,7 @@ static const WCHAR crlfW[] = {'\r','\n',0}; typedef struct BindStatusCallback BindStatusCallback; -struct reqheader +struct httpheader { struct list entry; BSTR header; @@ -80,6 +80,9 @@ typedef struct struct list reqheaders; /* cached resulting custom request headers string length in WCHARs */ LONG reqheader_size; + /* response headers */ + struct list respheaders; + BSTR raw_respheaders; /* credentials */ BSTR user; @@ -126,6 +129,22 @@ static void httprequest_setreadystate(httprequest *This, READYSTATE state) } } +static void free_response_headers(httprequest *This) +{ + struct httpheader *header, *header2; + + LIST_FOR_EACH_ENTRY_SAFE(header, header2, &This->respheaders, struct httpheader, entry) + { + list_remove(&header->entry); + SysFreeString(header->header); + SysFreeString(header->value); + heap_free(header); + } + + SysFreeString(This->raw_respheaders); + This->raw_respheaders = NULL; +} + struct BindStatusCallback { IBindStatusCallback IBindStatusCallback_iface; @@ -386,7 +405,7 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac LPCWSTR url, LPCWSTR headers, DWORD reserved, LPWSTR *add_headers) { BindStatusCallback *This = impl_from_IHttpNegotiate(iface); - const struct reqheader *entry; + const struct httpheader *entry; WCHAR *buff, *ptr; TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(url), debugstr_w(headers), reserved, add_headers); @@ -399,7 +418,7 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac if (!buff) return E_OUTOFMEMORY; ptr = buff; - LIST_FOR_EACH_ENTRY(entry, &This->request->reqheaders, struct reqheader, entry) + LIST_FOR_EACH_ENTRY(entry, &This->request->reqheaders, struct httpheader, entry) { lstrcpyW(ptr, entry->header); ptr += SysStringLen(entry->header); @@ -419,6 +438,37 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac return S_OK; } +static void add_response_header(httprequest *This, const WCHAR *data, int len) +{ + struct httpheader *entry; + const WCHAR *ptr = data; + BSTR header, value; + + while (*ptr) + { + if (*ptr == ':') + { + header = SysAllocStringLen(data, ptr-data); + /* skip leading spaces for a value */ + while (*++ptr == ' ') + ; + value = SysAllocStringLen(ptr, len-(ptr-data)); + break; + } + ptr++; + } + + if (!*ptr) return; + + /* new header */ + TRACE("got header %s:%s\n", debugstr_w(header), debugstr_w(value)); + + entry = heap_alloc(sizeof(*header)); + entry->header = header; + entry->value = value; + list_add_head(&This->respheaders, &entry->entry); +} + static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD code, LPCWSTR resp_headers, LPCWSTR req_headers, LPWSTR *add_reqheaders) { @@ -428,6 +478,28 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c debugstr_w(req_headers), add_reqheaders); This->request->status = code; + /* store headers */ + free_response_headers(This->request); + if (resp_headers) + { + const WCHAR *ptr, *line; + + ptr = line = resp_headers; + + /* skip status line */ + while (*ptr) + { + if (*ptr == '\r' && *(ptr+1) == '\n') + { + line = ++ptr+1; + break; + } + ptr++; + } + + /* store as unparsed string for now */ + This->request->raw_respheaders = SysAllocString(line); + } return S_OK; } @@ -563,7 +635,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) if ( ref == 0 ) { - struct reqheader *header, *header2; + struct httpheader *header, *header2; if (This->site) IUnknown_Release( This->site ); @@ -573,13 +645,15 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) SysFreeString(This->password); /* request headers */ - LIST_FOR_EACH_ENTRY_SAFE(header, header2, &This->reqheaders, struct reqheader, entry) + LIST_FOR_EACH_ENTRY_SAFE(header, header2, &This->reqheaders, struct httpheader, entry) { list_remove(&header->entry); SysFreeString(header->header); SysFreeString(header->value); heap_free(header); } + /* response headers */ + free_response_headers(This); /* detach callback object */ BindStatusCallback_Detach(This->bsc); @@ -719,7 +793,7 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR header, BSTR value) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - struct reqheader *entry; + struct httpheader *entry; TRACE("(%p)->(%s %s)\n", This, debugstr_w(header), debugstr_w(value)); @@ -728,7 +802,7 @@ static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR if (!value) return E_INVALIDARG; /* replace existing header value if already added */ - LIST_FOR_EACH_ENTRY(entry, &This->reqheaders, struct reqheader, entry) + LIST_FOR_EACH_ENTRY(entry, &This->reqheaders, struct httpheader, entry) { if (lstrcmpW(entry->header, header) == 0) { @@ -760,22 +834,56 @@ static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR return S_OK; } -static HRESULT WINAPI httprequest_getResponseHeader(IXMLHTTPRequest *iface, BSTR bstrHeader, BSTR *pbstrValue) +static HRESULT WINAPI httprequest_getResponseHeader(IXMLHTTPRequest *iface, BSTR header, BSTR *value) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + struct httpheader *entry; - FIXME("stub (%p) %s %p\n", This, debugstr_w(bstrHeader), pbstrValue); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(header), value); - return E_NOTIMPL; + if (!header || !value) return E_INVALIDARG; + + if (This->raw_respheaders && list_empty(&This->respheaders)) + { + WCHAR *ptr, *line; + + ptr = line = This->raw_respheaders; + while (*ptr) + { + if (*ptr == '\r' && *(ptr+1) == '\n') + { + add_response_header(This, line, ptr-line); + ptr++; line = ++ptr; + continue; + } + ptr++; + } + } + + LIST_FOR_EACH_ENTRY(entry, &This->respheaders, struct httpheader, entry) + { + if (!strcmpiW(entry->header, header)) + { + *value = SysAllocString(entry->value); + TRACE("header value %s\n", debugstr_w(*value)); + return S_OK; + } + } + + return S_FALSE; } -static HRESULT WINAPI httprequest_getAllResponseHeaders(IXMLHTTPRequest *iface, BSTR *pbstrHeaders) +static HRESULT WINAPI httprequest_getAllResponseHeaders(IXMLHTTPRequest *iface, BSTR *respheaders) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub (%p) %p\n", This, pbstrHeaders); + TRACE("(%p)->(%p)\n", This, respheaders); - return E_NOTIMPL; + if (!respheaders) return E_INVALIDARG; + + *respheaders = SysAllocString(This->raw_respheaders); + + return S_OK; } static HRESULT WINAPI httprequest_send(IXMLHTTPRequest *iface, VARIANT body) @@ -1189,6 +1297,9 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->status = 0; req->reqheader_size = 0; list_init(&req->reqheaders); + list_init(&req->respheaders); + req->raw_respheaders = NULL; + req->site = NULL; req->safeopt = 0; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0a2dbcf..86d0cbf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4690,7 +4690,7 @@ static void test_XMLHTTP(void) IXMLHttpRequest *xhr; IObjectSafety *safety; IObjectWithSite *obj_site, *obj_site2; - BSTR bstrResponse, url; + BSTR bstrResponse, url, str, str1; VARIANT dummy; VARIANT async; VARIANT varbody; @@ -4840,6 +4840,29 @@ static void test_XMLHTTP(void) } EXPECT_HR(hr, S_OK); + /* response headers */ + hr = IXMLHttpRequest_getAllResponseHeaders(xhr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); + EXPECT_HR(hr, S_OK); + /* status line is stripped already */ + ok(memcmp(str, _bstr_("HTTP"), 4*sizeof(WCHAR)), "got response headers %s\n", wine_dbgstr_w(str)); + ok(*str, "got empty headers\n"); + hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str1); + EXPECT_HR(hr, S_OK); + ok(str1 != str, "got %p\n", str1); + SysFreeString(str1); + SysFreeString(str); + + hr = IXMLHttpRequest_getResponseHeader(xhr, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + hr = IXMLHttpRequest_getResponseHeader(xhr, _bstr_("Date"), NULL); + EXPECT_HR(hr, E_INVALIDARG); + hr = IXMLHttpRequest_getResponseHeader(xhr, _bstr_("Date"), &str); + EXPECT_HR(hr, S_OK); + ok(*str != ' ', "got leading space in header %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* status code after ::send() */ status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(xhr, &status);

1 0

Nikolay Sivov : msxml3: libxml2 is not used for writer.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 477fd6ef3c38744e78043c14867caa20b12dac8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=477fd6ef3c38744e78043c148… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 18 21:12:19 2011 +0300 msxml3: libxml2 is not used for writer. --- dlls/msxml3/msxml_private.h | 42 +++++++++++++++++++++--------------------- dlls/msxml3/mxwriter.c | 13 ------------- 2 files changed, 21 insertions(+), 34 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 141c08c..813584a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -375,6 +375,27 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str) return ret; } +static inline xmlChar *xmlchar_from_wcharn(const WCHAR *str, int nchars) +{ + xmlChar *xmlstr; + DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, nchars, NULL, 0, NULL, NULL ); + + xmlstr = heap_alloc( len+1 ); + if ( xmlstr ) + { + WideCharToMultiByte( CP_UTF8, 0, str, nchars, (LPSTR) xmlstr, len+1, NULL, NULL ); + xmlstr[len] = 0; + } + return xmlstr; +} + +static inline xmlChar *xmlchar_from_wchar( const WCHAR *str ) +{ + return xmlchar_from_wcharn(str, -1); +} + +#endif + static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) { if(!p) @@ -425,27 +446,6 @@ static inline HRESULT return_null_bstr(BSTR *p) return S_FALSE; } -static inline xmlChar *xmlchar_from_wcharn(const WCHAR *str, int nchars) -{ - xmlChar *xmlstr; - DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, nchars, NULL, 0, NULL, NULL ); - - xmlstr = heap_alloc( len+1 ); - if ( xmlstr ) - { - WideCharToMultiByte( CP_UTF8, 0, str, nchars, (LPSTR) xmlstr, len+1, NULL, NULL ); - xmlstr[len] = 0; - } - return xmlstr; -} - -static inline xmlChar *xmlchar_from_wchar( const WCHAR *str ) -{ - return xmlchar_from_wcharn(str, -1); -} - -#endif - extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, LONG line, LONG linepos, LONG filepos ) DECLSPEC_HIDDEN; extern HRESULT DOMDocument_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index be03877..0cca473 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); -#ifdef HAVE_LIBXML2 - static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR emptyW[] = {0}; @@ -1144,14 +1142,3 @@ HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) return S_OK; } - -#else - -HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **obj) -{ - MESSAGE("This program tried to use a MXXMLWriter object, but\n" - "libxml2 support was not present at compile time.\n"); - return E_NOTIMPL; -} - -#endif /* HAVE_LIBXML2 */

1 0

Nikolay Sivov : msxml3: Use ascii/utf-8 encoding for request body.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: c00bbef3e4cced74c7d0995d511494433214cd2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00bbef3e4cced74c7d0995d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 18 23:24:58 2011 +0300 msxml3: Use ascii/utf-8 encoding for request body. --- dlls/msxml3/httprequest.c | 62 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 26241dd..9653644 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -80,6 +80,9 @@ typedef struct struct list reqheaders; /* cached resulting custom request headers string length in WCHARs */ LONG reqheader_size; + /* use UTF-8 content type */ + BOOL use_utf8_content; + /* response headers */ struct list respheaders; BSTR raw_respheaders; @@ -404,20 +407,37 @@ static ULONG WINAPI BSCHttpNegotiate_Release(IHttpNegotiate *iface) static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, LPCWSTR url, LPCWSTR headers, DWORD reserved, LPWSTR *add_headers) { + static const WCHAR content_type_utf8W[] = {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ', + 't','e','x','t','/','p','l','a','i','n',';','c','h','a','r','s','e','t','=','u','t','f','-','8','\r','\n',0}; + BindStatusCallback *This = impl_from_IHttpNegotiate(iface); const struct httpheader *entry; WCHAR *buff, *ptr; + int size = 0; TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(url), debugstr_w(headers), reserved, add_headers); *add_headers = NULL; - if (list_empty(&This->request->reqheaders)) return S_OK; + if (This->request->use_utf8_content) + size = sizeof(content_type_utf8W); + + if (!list_empty(&This->request->reqheaders)) + size += This->request->reqheader_size*sizeof(WCHAR); - buff = CoTaskMemAlloc(This->request->reqheader_size*sizeof(WCHAR)); + if (!size) return S_OK; + + buff = CoTaskMemAlloc(size); if (!buff) return E_OUTOFMEMORY; ptr = buff; + if (This->request->use_utf8_content) + { + lstrcpyW(ptr, content_type_utf8W); + ptr += sizeof(content_type_utf8W)/sizeof(WCHAR)-1; + } + + /* user headers */ LIST_FOR_EACH_ENTRY(entry, &This->request->reqheaders, struct httpheader, entry) { lstrcpyW(ptr, entry->header); @@ -536,25 +556,49 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * bsc->stream = NULL; bsc->body = NULL; - TRACE("created callback %p\n", bsc); + TRACE("(%p)->(%p)\n", This, bsc); + + This->use_utf8_content = FALSE; if (This->verb != BINDVERB_GET) { if (V_VT(body) == VT_BSTR) { - LONG size = SysStringLen(V_BSTR(body)) * sizeof(WCHAR); - void *ptr; + int len = SysStringLen(V_BSTR(body)), size; + const WCHAR *str = V_BSTR(body); + void *send_data, *ptr; + UINT i, cp = CP_ACP; + + for (i = 0; i < len; i++) + { + if (str[i] > 127) + { + cp = CP_UTF8; + break; + } + } + + size = WideCharToMultiByte(cp, 0, str, len, NULL, 0, NULL, NULL); + if (!(ptr = heap_alloc(size))) + { + heap_free(bsc); + return E_OUTOFMEMORY; + } + WideCharToMultiByte(cp, 0, str, len, ptr, size, NULL, NULL); + if (cp == CP_UTF8) This->use_utf8_content = TRUE; bsc->body = GlobalAlloc(GMEM_FIXED, size); if (!bsc->body) { heap_free(bsc); + heap_free(ptr); return E_OUTOFMEMORY; } - ptr = GlobalLock(bsc->body); - memcpy(ptr, V_BSTR(body), size); + send_data = GlobalLock(bsc->body); + memcpy(send_data, ptr, size); GlobalUnlock(bsc->body); + heap_free(ptr); } else FIXME("unsupported body data type %d\n", V_VT(body)); @@ -1296,9 +1340,11 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->bsc = NULL; req->status = 0; req->reqheader_size = 0; + req->raw_respheaders = NULL; + req->use_utf8_content = FALSE; + list_init(&req->reqheaders); list_init(&req->respheaders); - req->raw_respheaders = NULL; req->site = NULL; req->safeopt = 0;

1 0

Nikolay Sivov : msxml3: Support VT_VARIANT|VT_BYREF for body data.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 466341b6efd6ec9a6213df1081e232482fbde1e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466341b6efd6ec9a6213df108… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 19 00:20:59 2011 +0300 msxml3: Support VT_VARIANT|VT_BYREF for body data. --- dlls/msxml3/httprequest.c | 12 +++++++++- dlls/msxml3/tests/domdoc.c | 45 +++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 9653644..5591d2a 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -562,7 +562,12 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * if (This->verb != BINDVERB_GET) { - if (V_VT(body) == VT_BSTR) + if (V_VT(body) == (VT_VARIANT|VT_BYREF)) + body = V_VARIANTREF(body); + + switch (V_VT(body)) + { + case VT_BSTR: { int len = SysStringLen(V_BSTR(body)), size; const WCHAR *str = V_BSTR(body); @@ -599,9 +604,12 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * memcpy(send_data, ptr, size); GlobalUnlock(bsc->body); heap_free(ptr); + break; } - else + default: FIXME("unsupported body data type %d\n", V_VT(body)); + break; + } } hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 86d0cbf..93620a2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4677,23 +4677,19 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) static void test_XMLHTTP(void) { - static const WCHAR wszBody[] = {'m','o','d','e','=','T','e','s','t',0}; - static const WCHAR wszUrl[] = {'h','t','t','p',':','/','/', - 'c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', - 'p','o','s','t','t','e','s','t','.','p','h','p',0}; - static const WCHAR xmltestW[] = {'h','t','t','p',':','/','/', - 'c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', - 'x','m','l','t','e','s','t','.','x','m','l',0}; + static const char bodyA[] = "mode=Test"; + static const char urlA[] = "http://crossover.codeweavers.com/posttest.php"; + static const char xmltestA[] = "http://crossover.codeweavers.com/xmltest.xml"; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; IXMLHttpRequest *xhr; IObjectSafety *safety; IObjectWithSite *obj_site, *obj_site2; - BSTR bstrResponse, url, str, str1; + BSTR bstrResponse, str, str1; + VARIANT varbody, varbody_ref; VARIANT dummy; VARIANT async; - VARIANT varbody; LONG state, status, bound; IDispatch *event; void *ptr; @@ -4714,10 +4710,6 @@ static void test_XMLHTTP(void) VariantInit(&async); V_VT(&async) = VT_BOOL; V_BOOL(&async) = VARIANT_FALSE; - V_VT(&varbody) = VT_BSTR; - V_BSTR(&varbody) = SysAllocString(wszBody); - - url = SysAllocString(wszUrl); hr = IXMLHttpRequest_put_onreadystatechange(xhr, NULL); EXPECT_HR(hr, S_OK); @@ -4759,7 +4751,7 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), NULL, async, dummy, dummy); EXPECT_HR(hr, E_INVALIDARG); - hr = IXMLHttpRequest_open(xhr, NULL, url, async, dummy, dummy); + hr = IXMLHttpRequest_open(xhr, NULL, _bstr_(urlA), async, dummy, dummy); EXPECT_HR(hr, E_INVALIDARG); hr = IXMLHttpRequest_setRequestHeader(xhr, NULL, NULL); @@ -4791,7 +4783,7 @@ static void test_XMLHTTP(void) g_unexpectedcall = g_expectedcall = 0; - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), url, async, dummy, dummy); + hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); EXPECT_HR(hr, S_OK); ok(g_unexpectedcall == 0, "unexpected disp event call\n"); @@ -4817,7 +4809,7 @@ static void test_XMLHTTP(void) ok(state == READYSTATE_UNINITIALIZED || broken(state == READYSTATE_LOADING) /* win2k */, "got %d, expected READYSTATE_UNINITIALIZED\n", state); - hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), url, async, dummy, dummy); + hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); EXPECT_HR(hr, S_OK); hr = IXMLHttpRequest_setRequestHeader(xhr, _bstr_("header1"), _bstr_("value1")); @@ -4829,7 +4821,8 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_setRequestHeader(xhr, _bstr_(""), _bstr_("value1")); EXPECT_HR(hr, E_INVALIDARG); - SysFreeString(url); + V_VT(&varbody) = VT_BSTR; + V_BSTR(&varbody) = _bstr_(bodyA); hr = IXMLHttpRequest_send(xhr, varbody); if (hr == INET_E_RESOURCE_NOT_FOUND) @@ -4870,11 +4863,12 @@ static void test_XMLHTTP(void) ok(status == 200, "got %d\n", status); /* another ::send() after completed request */ + V_VT(&varbody) = VT_BSTR; + V_BSTR(&varbody) = _bstr_(bodyA); + hr = IXMLHttpRequest_send(xhr, varbody); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); - VariantClear(&varbody); - hr = IXMLHttpRequest_get_responseText(xhr, &bstrResponse); EXPECT_HR(hr, S_OK); /* the server currently returns "FAILED" because the Content-Type header is @@ -4886,10 +4880,16 @@ static void test_XMLHTTP(void) SysFreeString(bstrResponse); } - /* GET request */ - url = SysAllocString(xmltestW); + /* POST: VT_VARIANT|VT_BYREF body */ + V_VT(&varbody_ref) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(&varbody_ref) = &varbody; + hr = IXMLHttpRequest_open(xhr, _bstr_("POST"), _bstr_(urlA), async, dummy, dummy); + EXPECT_HR(hr, S_OK); + hr = IXMLHttpRequest_send(xhr, varbody_ref); + EXPECT_HR(hr, S_OK); - hr = IXMLHttpRequest_open(xhr, _bstr_("GET"), url, async, dummy, dummy); + /* GET request */ + hr = IXMLHttpRequest_open(xhr, _bstr_("GET"), _bstr_(xmltestA), async, dummy, dummy); EXPECT_HR(hr, S_OK); V_VT(&varbody) = VT_EMPTY; @@ -4932,7 +4932,6 @@ static void test_XMLHTTP(void) SafeArrayUnaccessData(V_ARRAY(&varbody)); VariantClear(&varbody); - SysFreeString(url); /* get_responseStream */ hr = IXMLHttpRequest_get_responseStream(xhr, NULL);

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 8bd35864a5638e082b6362e6cfe6b9a8e8969183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd35864a5638e082b6362e6c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 18 13:53:19 2011 +0100 po: Update German translation. --- po/de.po | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/po/de.po b/po/de.po index e3b8d48..a288cab 100644 --- a/po/de.po +++ b/po/de.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: 2011-12-10 19:51+0100\n" +"PO-Revision-Date: 2011-12-18 13:19+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -3473,9 +3473,8 @@ msgid "Subscript out of range" msgstr "Index außerhalb des Bereichs" #: jscript.rc:28 -#, fuzzy msgid "Object required" -msgstr "Objekt erwartet" +msgstr "Objekt benötigt" #: jscript.rc:29 msgid "Automation server can't create object" @@ -3546,9 +3545,8 @@ msgid "Boolean object expected" msgstr "Boolisches Objekt erwartet" #: jscript.rc:46 -#, fuzzy msgid "Cannot delete '|'" -msgstr "Kann nicht abschliessen\n" +msgstr "Kann '|' nicht löschen" #: jscript.rc:47 msgid "VBArray object expected" @@ -6797,9 +6795,8 @@ msgid "&Data Rate" msgstr "&Datenrate" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" -msgstr "kB/Sek" +msgstr "kB/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -10061,13 +10058,11 @@ msgid "Parameter error\n" msgstr "Parameterfehler\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Volume in Laufwerk %1!c! ist %2\n" -"Volumeseriennummer ist %3!04x!-%4!04x!\n" +"Volumeseriennummer ist %1!04x!-%2!04x!\n" "\n" #: cmd.rc:319 @@ -10100,11 +10095,11 @@ msgstr "Die Eingabezeile ist zu lang.\n" #: cmd.rc:326 msgid "Volume in drive %1!c! is %2\n" -msgstr "" +msgstr "Volume in Laufwerk %1!c! ist %2\n" #: cmd.rc:327 msgid "Volume in drive %1!c! has no label.\n" -msgstr "" +msgstr "Volume in Laufwerk %1!c! hat keine Bezeichnung\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 1be400826bba5c7cbb250ea369ec410ba16ff0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be400826bba5c7cbb250ea36… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Dec 18 22:10:18 2011 +0900 po: Updated Korean translation. --- po/ko.po | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/po/ko.po b/po/ko.po index 4e4a997..5e1d0d2 100644 --- a/po/ko.po +++ b/po/ko.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: 2011-09-06 18:50+0900\n" +"PO-Revision-Date: 2011-12-18 18:50+0900\n" "Last-Translator: YunSong Hwang <hys545(a)dreamwiz.com>\n" "Language-Team: none\n" "Language: Korean\n" @@ -3444,7 +3444,7 @@ msgstr "증가" #: inetcpl.rc:36 msgid "High" -msgstr "높음(&H)" +msgstr "높음" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -3459,9 +3459,8 @@ msgid "Subscript out of range" msgstr "첨자가 범위를 벗어남" #: jscript.rc:28 -#, fuzzy msgid "Object required" -msgstr "객체가 필요합니다" +msgstr "객체가 필요함" #: jscript.rc:29 msgid "Automation server can't create object" @@ -3532,9 +3531,8 @@ msgid "Boolean object expected" msgstr "볼린 객제가 필요함" #: jscript.rc:46 -#, fuzzy msgid "Cannot delete '|'" -msgstr "완료되지 않았습니다\n" +msgstr "'|'를 지울 수 없음" #: jscript.rc:47 msgid "VBArray object expected" @@ -6778,9 +6776,8 @@ msgid "&Data Rate" msgstr "데이타 전송율(&D)" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" -msgstr "킬로바이트/초" +msgstr "kB/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -9941,14 +9938,10 @@ msgid "Parameter error\n" msgstr "매개변수 오류\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" -msgstr "" -"드라이브 %1!c!의 볼륨은 %2임\n" -" 볼륨 시리얼 번호는 %3!04x!-%4!04x!\n" -"임\n" +msgstr "볼륨 시리얼 번호는 %1!04x!-%2!04x!임\n" #: cmd.rc:319 msgid "Volume label (11 characters, ENTER for none)?" @@ -9980,11 +9973,11 @@ msgstr "이 출력 줄은 너무 깁니다.\n" #: cmd.rc:326 msgid "Volume in drive %1!c! is %2\n" -msgstr "" +msgstr "드라이브 %1!c!의 볼륨은 %2임\n" #: cmd.rc:327 msgid "Volume in drive %1!c! has no label.\n" -msgstr "" +msgstr "드라이브 %1!c!는 라벨을 가지고 있지 않습니다.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Alexandre Julliard : winex11: Hardcode the MWM hints for the desktop window .
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: c4cf90246d5dd147a1b84497493dea29c7cbab5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4cf90246d5dd147a1b844974… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 11:12:12 2011 +0100 winex11: Hardcode the MWM hints for the desktop window. --- dlls/winex11.drv/window.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 63f58a9..1fb339a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1007,19 +1007,28 @@ static void set_mwm_hints( Display *display, struct x11drv_win_data *data, DWORD { MwmHints mwm_hints; - mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; - mwm_hints.decorations = get_mwm_decorations( data, style, ex_style ); - mwm_hints.functions = MWM_FUNC_MOVE; - if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; - if (!(style & WS_DISABLED)) + if (data->hwnd == GetDesktopWindow()) { - if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; - if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; - if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + mwm_hints.decorations = MWM_DECOR_TITLE | MWM_DECOR_BORDER | MWM_DECOR_MENU | MWM_DECOR_MINIMIZE; + mwm_hints.functions = MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE | MWM_FUNC_CLOSE; } + else + { + mwm_hints.decorations = get_mwm_decorations( data, style, ex_style ); + mwm_hints.functions = MWM_FUNC_MOVE; + if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; + if (!(style & WS_DISABLED)) + { + if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; + if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; + if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + } + } + TRACE( "%p setting mwm hints to %lx,%lx (style %x exstyle %x)\n", data->hwnd, mwm_hints.decorations, mwm_hints.functions, style, ex_style ); + mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; XChangeProperty( display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, (unsigned char*)&mwm_hints, sizeof(mwm_hints)/sizeof(long) );

1 0

Alexandre Julliard : winex11: Only take managed popups into account when deciding whether to make a window managed .
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: c1297ac0d8719972203b23e18da04f84c7486f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1297ac0d8719972203b23e18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 11:12:38 2011 +0100 winex11: Only take managed popups into account when deciding whether to make a window managed. --- dlls/winex11.drv/window.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1fb339a..0411ddf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -159,12 +159,15 @@ struct has_popup_result BOOL found; }; -static BOOL CALLBACK has_popup( HWND hwnd, LPARAM lparam ) +static BOOL CALLBACK has_managed_popup( HWND hwnd, LPARAM lparam ) { struct has_popup_result *result = (struct has_popup_result *)lparam; + struct x11drv_win_data *data; if (hwnd == result->hwnd) return FALSE; /* popups are always above owner */ - result->found = (GetWindow( hwnd, GW_OWNER ) == result->hwnd); + if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; + if (GetWindow( hwnd, GW_OWNER ) != result->hwnd) return TRUE; + result->found = data->managed; return !result->found; } @@ -174,7 +177,7 @@ static BOOL has_owned_popups( HWND hwnd ) result.hwnd = hwnd; result.found = FALSE; - EnumWindows( has_popup, (LPARAM)&result ); + EnumWindows( has_managed_popup, (LPARAM)&result ); return result.found; }

1 0

Alexandre Julliard : winex11: Remove DIB locking calls from all blitting entry points.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 4066587f19237748776bbc6bd2265a2b35d72e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4066587f19237748776bbc6bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 11:34:44 2011 +0100 winex11: Remove DIB locking calls from all blitting entry points. --- dlls/winex11.drv/bitblt.c | 26 ++------------------------ dlls/winex11.drv/graphics.c | 13 ------------- dlls/winex11.drv/xrender.c | 24 ------------------------ 3 files changed, 2 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4066587f19237748776bb…

1 0

Alexandre Julliard : gdi32: Remove support for deferring brush calls to X11 , all brush types are supported now.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: a585659e31c3cb078623f0afc131f0d5305cf1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a585659e31c3cb078623f0afc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 11:35:14 2011 +0100 gdi32: Remove support for deferring brush calls to X11, all brush types are supported now. --- dlls/gdi32/dibdrv/dibdrv.h | 6 ------ dlls/gdi32/dibdrv/graphics.c | 21 ++++----------------- dlls/gdi32/dibdrv/objects.c | 6 ------ 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 6c63c3d..1bf9114 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -112,7 +112,6 @@ typedef struct dibdrv_physdev } dibdrv_physdev; #define DEFER_PEN 2 -#define DEFER_BRUSH 4 extern BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN; @@ -253,8 +252,3 @@ static inline BOOL defer_pen(dibdrv_physdev *pdev) { return pdev->defer & DEFER_PEN; } - -static inline BOOL defer_brush(dibdrv_physdev *pdev) -{ - return pdev->defer & DEFER_BRUSH; -} diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 67f1c99..69ce50b 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -467,26 +467,16 @@ static inline INT get_rop2_from_rop(INT rop) */ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPatBlt ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); INT rop2 = get_rop2_from_rop(rop); - BOOL done; + BOOL ret; TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, dst->x, dst->y, dst->width, dst->height, rop); - if(defer_brush(pdev)) - return next->funcs->pPatBlt( next, dst, rop ); - update_brush_rop( pdev, rop2 ); - - done = brush_rects( pdev, 1, &dst->visrect ); - + ret = brush_rects( pdev, 1, &dst->visrect ); update_brush_rop( pdev, GetROP2(dev->hdc) ); - - if(!done) - return next->funcs->pPatBlt( next, dst, rop ); - - return TRUE; + return ret; } /*********************************************************************** @@ -494,7 +484,6 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) */ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPaintRgn ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); const WINEREGION *region; int i; @@ -502,8 +491,6 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) TRACE("%p, %p\n", dev, rgn); - if(defer_brush(pdev)) return next->funcs->pPaintRgn( next, rgn ); - region = get_wine_region( rgn ); if(!region) return FALSE; @@ -587,7 +574,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) if(rect.left == rect.right || rect.top == rect.bottom) return TRUE; - if(defer_pen(pdev) || defer_brush(pdev)) + if(defer_pen(pdev)) return next->funcs->pRectangle( next, left, top, right, bottom ); reset_dash_origin(pdev); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 1b6fc89..d9fb868 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1657,7 +1657,6 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->brush_pattern_bits = bits; pdev->brush_pattern_usage = usage; pdev->brush_pattern_bitmap = bitmap; - pdev->defer &= ~DEFER_BRUSH; free_pattern_brush( pdev ); /* brush is actually selected only when it's used */ return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage ); @@ -1670,8 +1669,6 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->brush_style = logbrush.lbStyle; - pdev->defer |= DEFER_BRUSH; - free_pattern_brush( pdev ); switch(logbrush.lbStyle) @@ -1681,12 +1678,10 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); pdev->brush_rects = solid_brush; - pdev->defer &= ~DEFER_BRUSH; break; case BS_NULL: pdev->brush_rects = null_brush; - pdev->defer &= ~DEFER_BRUSH; break; case BS_HATCHED: @@ -1696,7 +1691,6 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); pdev->brush_rects = pattern_brush; - pdev->defer &= ~DEFER_BRUSH; break; default:

1 0