wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Nikolay Sivov : msxml3: Support byteOrderMark() property.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: d4fd12594410991368addd6433a96b50cd345fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fd12594410991368addd643… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 21:57:45 2011 +0400 msxml3: Support byteOrderMark() property. --- dlls/msxml3/mxwriter.c | 25 ++++++++++++++++++------- dlls/msxml3/tests/saxreader.c | 8 ++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index fa0756f..0bf1146 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -44,7 +44,8 @@ static const char crlfA[] = "\r\n"; typedef enum { - MXWriter_Indent = 0, + MXWriter_BOM = 0, + MXWriter_Indent, MXWriter_OmitXmlDecl, MXWriter_Standalone, MXWriter_LastProp @@ -295,18 +296,27 @@ static HRESULT WINAPI mxwriter_get_encoding(IMXWriter *iface, BSTR *encoding) return return_bstr(This->encoding, encoding); } -static HRESULT WINAPI mxwriter_put_byteOrderMark(IMXWriter *iface, VARIANT_BOOL writeBOM) +static HRESULT WINAPI mxwriter_put_byteOrderMark(IMXWriter *iface, VARIANT_BOOL value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%d)\n", This, writeBOM); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, value); + This->props[MXWriter_BOM] = value; + + return S_OK; } -static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL *writeBOM) +static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL *value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, writeBOM); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, value); + + if (!value) return E_POINTER; + + *value = This->props[MXWriter_BOM]; + + return S_OK; } static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL value) @@ -719,6 +729,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; + This->props[MXWriter_BOM] = VARIANT_TRUE; This->props[MXWriter_Indent] = VARIANT_FALSE; This->props[MXWriter_OmitXmlDecl] = VARIANT_FALSE; This->props[MXWriter_Standalone] = VARIANT_FALSE; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 3092039..8ad464f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -936,6 +936,14 @@ static void test_mxwriter_properties(void) &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IMXWriter_get_byteOrderMark(writer, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + + b = VARIANT_FALSE; + hr = IMXWriter_get_byteOrderMark(writer, &b); + ok(hr == S_OK, "got %08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + hr = IMXWriter_get_indent(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr);

1 0

Nikolay Sivov : msxml3: Store raw text data passed through characters().
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 8cefe9b0710d241930fbc3ed6c6d8d9bf40ca5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cefe9b0710d241930fbc3ed6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 21:51:33 2011 +0400 msxml3: Store raw text data passed through characters(). --- dlls/msxml3/msxml_private.h | 16 ++++++++++--- dlls/msxml3/mxwriter.c | 15 +++++++++++- dlls/msxml3/tests/saxreader.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index d1d4617..dcd305a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -389,17 +389,25 @@ static inline HRESULT return_null_bstr(BSTR *p) return S_FALSE; } -static inline xmlChar *xmlchar_from_wchar( LPCWSTR str ) +static inline xmlChar *xmlchar_from_wcharn(const WCHAR *str, int nchars) { xmlChar *xmlstr; - DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL ); + DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, nchars, NULL, 0, NULL, NULL ); - xmlstr = heap_alloc( len ); + xmlstr = heap_alloc( len+1 ); if ( xmlstr ) - WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL ); + { + 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, diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 3d04ceb..fa0756f 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -636,8 +636,19 @@ static HRESULT WINAPI mxwriter_saxcontent_characters( int nchars) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_wn(chars, nchars)); - return E_NOTIMPL; + + TRACE("(%p)->(%s:%d)\n", This, debugstr_wn(chars, nchars), nchars); + + if (!chars) return E_INVALIDARG; + + if (nchars) + { + xmlChar *s = xmlchar_from_wcharn(chars, nchars); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + } + + return S_OK; } static HRESULT WINAPI mxwriter_saxcontent_ignorableWhitespace( diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index fd07629..3092039 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1285,6 +1285,52 @@ static void test_mxwriter_startendelement(void) free_bstrs(); } +static void test_mxwriter_characters(void) +{ + static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_characters(content, NULL, 0); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = ISAXContentHandler_characters(content, chardataW, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_characters(content, chardataW, sizeof(chardataW)/sizeof(WCHAR) - 1); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("TESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -1317,6 +1363,7 @@ START_TEST(saxreader) test_mxwriter_contenthandler(); test_mxwriter_startenddocument(); test_mxwriter_startendelement(); + test_mxwriter_characters(); test_mxwriter_properties(); test_mxwriter_flush(); }

1 0

Nikolay Sivov : msxml3: Support indent() property.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 630e5f81fe6155c4a0dfb62ff1d1afbb694db685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630e5f81fe6155c4a0dfb62ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 20:53:33 2011 +0400 msxml3: Support indent() property. --- dlls/msxml3/mxwriter.c | 25 ++++++++++++++++++------- dlls/msxml3/tests/saxreader.c | 8 ++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a791acb..3d04ceb 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -44,7 +44,8 @@ static const char crlfA[] = "\r\n"; typedef enum { - MXWriter_OmitXmlDecl = 0, + MXWriter_Indent = 0, + MXWriter_OmitXmlDecl, MXWriter_Standalone, MXWriter_LastProp } MXWRITER_PROPS; @@ -308,18 +309,27 @@ static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL return E_NOTIMPL; } -static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL indent) +static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%d)\n", This, indent); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, value); + This->props[MXWriter_Indent] = value; + + return S_OK; } -static HRESULT WINAPI mxwriter_get_indent(IMXWriter *iface, VARIANT_BOOL *indent) +static HRESULT WINAPI mxwriter_get_indent(IMXWriter *iface, VARIANT_BOOL *value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, indent); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, value); + + if (!value) return E_POINTER; + + *value = This->props[MXWriter_Indent]; + + return S_OK; } static HRESULT WINAPI mxwriter_put_standalone(IMXWriter *iface, VARIANT_BOOL value) @@ -698,6 +708,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; + This->props[MXWriter_Indent] = VARIANT_FALSE; This->props[MXWriter_OmitXmlDecl] = VARIANT_FALSE; This->props[MXWriter_Standalone] = VARIANT_FALSE; This->encoding = SysAllocString(utf16W); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cac238c..fd07629 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -936,6 +936,14 @@ static void test_mxwriter_properties(void) &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IMXWriter_get_indent(writer, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + + b = VARIANT_TRUE; + hr = IMXWriter_get_indent(writer, &b); + ok(hr == S_OK, "got %08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + hr = IMXWriter_get_omitXMLDeclaration(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr);

1 0

Nikolay Sivov : msxml3: Support attributes list for elements.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 2dfa1bffc4b975cdd72f0f1f7cd55d7db28e6c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dfa1bffc4b975cdd72f0f1f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 19:37:59 2011 +0400 msxml3: Support attributes list for elements. --- dlls/msxml3/mxwriter.c | 39 +++++++- dlls/msxml3/tests/saxreader.c | 209 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 141f58d..a791acb 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -548,12 +548,47 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; - if (attr) FIXME("attributes not handled\n"); - xmlOutputBufferWriteString(This->buffer, "<"); s = xmlchar_from_wchar(QName); xmlOutputBufferWriteString(This->buffer, (char*)s); heap_free(s); + + if (attr) + { + HRESULT hr; + INT length; + INT i; + + hr = ISAXAttributes_getLength(attr, &length); + if (FAILED(hr)) return hr; + + if (length) xmlOutputBufferWriteString(This->buffer, " "); + + for (i = 0; i < length; i++) + { + const WCHAR *str; + INT len; + + hr = ISAXAttributes_getQName(attr, i, &str, &len); + if (FAILED(hr)) return hr; + + s = xmlchar_from_wchar(str); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + + xmlOutputBufferWriteString(This->buffer, "=\""); + + hr = ISAXAttributes_getValue(attr, i, &str, &len); + if (FAILED(hr)) return hr; + + s = xmlchar_from_wchar(str); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + + xmlOutputBufferWriteString(This->buffer, "\""); + } + } + xmlOutputBufferWriteString(This->buffer, ">"); return S_OK; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 2bdb8b5..cac238c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -491,6 +491,211 @@ static const ISAXErrorHandlerVtbl errorHandlerVtbl = static ISAXErrorHandler errorHandler = { &errorHandlerVtbl }; +static HRESULT WINAPI isaxattributes_QueryInterface( + ISAXAttributes* iface, + REFIID riid, + void **ppvObject) +{ + *ppvObject = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ISAXAttributes)) + { + *ppvObject = iface; + } + else + { + return E_NOINTERFACE; + } + + return S_OK; +} + +static ULONG WINAPI isaxattributes_AddRef(ISAXAttributes* iface) +{ + return 2; +} + +static ULONG WINAPI isaxattributes_Release(ISAXAttributes* iface) +{ + return 1; +} + +static HRESULT WINAPI isaxattributes_getLength(ISAXAttributes* iface, int *length) +{ + *length = 2; + return S_OK; +} + +static HRESULT WINAPI isaxattributes_getURI( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pUrl, + int *pUriSize) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getLocalName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pLocalName, + int *pLocalNameLength) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getQName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pQName, + int *pQNameLength) +{ + static const WCHAR attr1W[] = {'a',':','a','t','t','r','1',0}; + static const WCHAR attr2W[] = {'a','t','t','r','2',0}; + + ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); + + *pQName = (nIndex == 0) ? attr1W : attr2W; + *pQNameLength = lstrlenW(*pQName); + + return S_OK; +} + +static HRESULT WINAPI isaxattributes_getName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pUri, + int * pUriLength, + const WCHAR ** pLocalName, + int * pLocalNameSize, + const WCHAR ** pQName, + int * pQNameLength) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getIndexFromName( + ISAXAttributes* iface, + const WCHAR * pUri, + int cUriLength, + const WCHAR * pLocalName, + int cocalNameLength, + int * index) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getIndexFromQName( + ISAXAttributes* iface, + const WCHAR * pQName, + int nQNameLength, + int * index) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getType( + ISAXAttributes* iface, + int nIndex, + const WCHAR ** pType, + int * pTypeLength) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getTypeFromName( + ISAXAttributes* iface, + const WCHAR * pUri, + int nUri, + const WCHAR * pLocalName, + int nLocalName, + const WCHAR ** pType, + int * nType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getTypeFromQName( + ISAXAttributes* iface, + const WCHAR * pQName, + int nQName, + const WCHAR ** pType, + int * nType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getValue( + ISAXAttributes* iface, + int nIndex, + const WCHAR ** pValue, + int * nValue) +{ + static const WCHAR attrval1W[] = {'a','1',0}; + static const WCHAR attrval2W[] = {'a','2',0}; + + ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); + + *pValue = (nIndex == 0) ? attrval1W : attrval2W; + *nValue = lstrlenW(*pValue); + + return S_OK; +} + +static HRESULT WINAPI isaxattributes_getValueFromName( + ISAXAttributes* iface, + const WCHAR * pUri, + int nUri, + const WCHAR * pLocalName, + int nLocalName, + const WCHAR ** pValue, + int * nValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getValueFromQName( + ISAXAttributes* iface, + const WCHAR * pQName, + int nQName, + const WCHAR ** pValue, + int * nValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ISAXAttributesVtbl SAXAttributesVtbl = +{ + isaxattributes_QueryInterface, + isaxattributes_AddRef, + isaxattributes_Release, + isaxattributes_getLength, + isaxattributes_getURI, + isaxattributes_getLocalName, + isaxattributes_getQName, + isaxattributes_getName, + isaxattributes_getIndexFromName, + isaxattributes_getIndexFromQName, + isaxattributes_getType, + isaxattributes_getTypeFromName, + isaxattributes_getTypeFromQName, + isaxattributes_getValue, + isaxattributes_getValueFromName, + isaxattributes_getValueFromQName +}; + +static ISAXAttributes saxattributes = { &SAXAttributesVtbl }; + static void test_saxreader(void) { HRESULT hr; @@ -1059,6 +1264,10 @@ static void test_mxwriter_startendelement(void) todo_wine ok(!lstrcmpW(_bstr_("<><nspace:c/></a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* try with attributes */ + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1, &saxattributes); + ok(hr == S_OK, "got %08x\n", hr); + hr = ISAXContentHandler_endDocument(content); todo_wine ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : msxml3: Basic support for startElement()/endElement().
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: b63778656e345d364a61b9321be0485e70ac41c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63778656e345d364a61b9321… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 18:34:37 2011 +0400 msxml3: Basic support for startElement()/endElement(). --- dlls/msxml3/mxwriter.c | 32 +++++++++++++++++++++++++--- dlls/msxml3/tests/saxreader.c | 45 ++++++++++++++++++++++++++++++----------- 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d2ff775..141f58d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -541,9 +541,22 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( ISAXAttributes *attr) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), + xmlChar *s; + + TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName), attr); - return E_NOTIMPL; + + if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; + + if (attr) FIXME("attributes not handled\n"); + + xmlOutputBufferWriteString(This->buffer, "<"); + s = xmlchar_from_wchar(QName); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + xmlOutputBufferWriteString(This->buffer, ">"); + + return S_OK; } static HRESULT WINAPI mxwriter_saxcontent_endElement( @@ -556,9 +569,20 @@ static HRESULT WINAPI mxwriter_saxcontent_endElement( int nQName) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s %s %s)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), + xmlChar *s; + + TRACE("(%p)->(%s %s %s)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName)); - return E_NOTIMPL; + + if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; + + xmlOutputBufferWriteString(This->buffer, "</"); + s = xmlchar_from_wchar(QName); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + xmlOutputBufferWriteString(This->buffer, ">"); + + return S_OK; } static HRESULT WINAPI mxwriter_saxcontent_characters( diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 46e8004..2bdb8b5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -980,56 +980,66 @@ static void test_mxwriter_startendelement(void) /* qualified name without defined namespace */ hr = ISAXContentHandler_startElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3, NULL); - todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08x\n", hr); hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, _bstr_("a:b"), 3, NULL); - todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08x\n", hr); /* only local name is an error too */ hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, NULL, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08x\n", hr); /* only local name is an error too */ hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, NULL, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08x\n", hr); /* all string pointers should be not null */ hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, _bstr_(""), 0, NULL); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1, NULL); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + hr = ISAXContentHandler_endElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = ISAXContentHandler_endElement(content, NULL, 0, _bstr_("b"), 1, _bstr_("a:b"), 3); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + /* only local name is an error too */ + hr = ISAXContentHandler_endElement(content, NULL, 0, _bstr_("b"), 1, NULL, 0); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - todo_wine ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); /* some with namespace URI */ hr = ISAXContentHandler_startElement(content, _bstr_(winehqA), sizeof(winehqA), _bstr_(""), 0, _bstr_("nspace:c"), 8, NULL); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); hr = ISAXContentHandler_endElement(content, _bstr_(winehqA), sizeof(winehqA), _bstr_(""), 0, _bstr_("nspace:c"), 8); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); @@ -1038,6 +1048,17 @@ static void test_mxwriter_startendelement(void) todo_wine ok(!lstrcmpW(_bstr_("<><nspace:c/>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* try to end element that wasn't open */ + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), 1); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<><nspace:c/></a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + hr = ISAXContentHandler_endDocument(content); todo_wine ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : comctl32/listview: Make edit box handle available from LVN_ENDLABELEDIT notification.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 34d86a2d17464d1e98f92a58491c00e100c005e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d86a2d17464d1e98f92a584… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 8 19:02:36 2011 +0400 comctl32/listview: Make edit box handle available from LVN_ENDLABELEDIT notification. --- dlls/comctl32/listview.c | 27 ++++++++++++------------- dlls/comctl32/tests/listview.c | 41 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9f8b2a9..6f7d7f3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5662,7 +5662,7 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL WCHAR szDispText[DISP_TEXT_SIZE] = { 0 }; NMLVDISPINFOW dispInfo; INT editedItem = infoPtr->nEditLabelItem; - BOOL bSame; + BOOL same; WCHAR *pszText = NULL; BOOL res; @@ -5682,9 +5682,6 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL TRACE("(pszText=%s, isW=%d)\n", debugtext_t(pszText, isW), isW); - infoPtr->nEditLabelItem = -1; - infoPtr->hwndEdit = 0; - ZeroMemory(&dispInfo, sizeof(dispInfo)); dispInfo.item.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT; dispInfo.item.iItem = editedItem; @@ -5699,32 +5696,34 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL } if (isW) - bSame = (lstrcmpW(dispInfo.item.pszText, pszText) == 0); + same = (lstrcmpW(dispInfo.item.pszText, pszText) == 0); else { LPWSTR tmp = textdupTtoW(pszText, FALSE); - bSame = (lstrcmpW(dispInfo.item.pszText, tmp) == 0); + same = (lstrcmpW(dispInfo.item.pszText, tmp) == 0); textfreeT(tmp, FALSE); } /* add the text from the edit in */ dispInfo.item.mask |= LVIF_TEXT; - dispInfo.item.pszText = bSame ? NULL : pszText; - dispInfo.item.cchTextMax = bSame ? 0 : textlenT(pszText, isW); + dispInfo.item.pszText = same ? NULL : pszText; + dispInfo.item.cchTextMax = textlenT(dispInfo.item.pszText, isW); /* Do we need to update the Item Text */ - if (!notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW)) - { - res = FALSE; - goto cleanup; - } + res = notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW); + + infoPtr->nEditLabelItem = -1; + infoPtr->hwndEdit = 0; + + if (!res) goto cleanup; + if (!IsWindow(hwndSelf)) { res = FALSE; goto cleanup; } if (!pszText) return TRUE; - if (bSame) + if (same) { res = TRUE; goto cleanup; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e9fa684..3bf3dcb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -61,6 +61,8 @@ static BOOL g_is_below_5; static LVITEMA g_itema; /* alter notification code A->W */ static BOOL g_disp_A_to_W; +/* dispinfo data sent with LVN_LVN_ENDLABELEDIT */ +static NMLVDISPINFO g_editbox_disp_info; static HWND subclass_editbox(HWND hwndListview); @@ -358,9 +360,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP } case LVN_ENDLABELEDIT: { + HWND edit; + /* always accept new item text */ NMLVDISPINFO *di = (NMLVDISPINFO*)lParam; + g_editbox_disp_info = *di; trace("LVN_ENDLABELEDIT: text=%s\n", di->item.pszText); + + /* edit control still available from this notification */ + edit = (HWND)SendMessageA(((NMHDR*)lParam)->hwndFrom, LVM_GETEDITCONTROL, 0, 0); + ok(IsWindow(edit), "expected valid edit control handle\n"); + return TRUE; } case LVN_BEGINSCROLL: @@ -3611,6 +3621,7 @@ static void test_editbox(void) { static CHAR testitemA[] = "testitem"; static CHAR testitem1A[] = "testitem_quitelongname"; + static CHAR testitem2A[] = "testITEM_quitelongname"; static CHAR buffer[25]; HWND hwnd, hwndedit, hwndedit2, header; LVITEMA item; @@ -3707,8 +3718,11 @@ static void test_editbox(void) /* modify edit and notify control that it lost focus */ r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem1A); expect(TRUE, r); + g_editbox_disp_info.item.pszText = NULL; r = SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hwndedit); expect(0, r); + ok(g_editbox_disp_info.item.pszText != NULL, "expected notification with not null text\n"); + memset(&item, 0, sizeof(item)); item.pszText = buffer; item.cchTextMax = sizeof(buffer); @@ -3718,6 +3732,29 @@ static void test_editbox(void) expect(lstrlen(item.pszText), r); ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); ok(!IsWindow(hwndedit), "Expected Edit window to be freed\n"); + + /* change item name to differ in casing only */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* modify edit and notify control that it lost focus */ + r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem2A); + expect(TRUE, r); + g_editbox_disp_info.item.pszText = NULL; + r = SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hwndedit); + expect(0, r); + ok(g_editbox_disp_info.item.pszText != NULL, "got %p\n", g_editbox_disp_info.item.pszText); + + memset(&item, 0, sizeof(item)); + item.pszText = buffer; + item.cchTextMax = sizeof(buffer); + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); + expect(lstrlen(item.pszText), r); + ok(strcmp(buffer, testitem2A) == 0, "got %s, expected %s\n", buffer, testitem2A); + ok(!IsWindow(hwndedit), "Expected Edit window to be freed\n"); + /* end edit without saving */ SetFocus(hwnd); hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); @@ -3742,7 +3779,7 @@ static void test_editbox(void) item.iSubItem = 0; r = SendMessage(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); expect(lstrlen(item.pszText), r); - ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + ok(strcmp(buffer, testitem2A) == 0, "Expected item text to change\n"); /* LVM_EDITLABEL with -1 destroys current edit */ hwndedit = (HWND)SendMessage(hwnd, LVM_GETEDITCONTROL, 0, 0); @@ -3786,7 +3823,7 @@ static void test_editbox(void) ok_sequence(sequences, EDITBOX_SEQ_INDEX, editbox_create_pos, "edit box create - sizing", FALSE); - /* WM_COMMAND with EN_KILLFOCUS isn't forwared to parent */ + /* WM_COMMAND with EN_KILLFOCUS isn't forwarded to parent */ SetFocus(hwnd); hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); ok(IsWindow(hwndedit), "Expected Edit window to be created\n");

1 0

Karsten Elfenbein : winhttp: Follow 307 temporary redirect.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 5f12a6423c7701adfab46a843e2093c1eff2ff53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f12a6423c7701adfab46a843… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Sun May 8 12:29:40 2011 +0200 winhttp: Follow 307 temporary redirect. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2c3d534..8a21ab5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1835,7 +1835,7 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) record_cookies( request ); - if (status == 301 || status == 302) + if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) { if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break;

1 0

Karsten Elfenbein : wininet: Follow 307 temporary redirect.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 5b173cb405a5859976022482cb62a769f92dfef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b173cb405a5859976022482c… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Sun May 8 12:29:06 2011 +0200 wininet: Follow 307 temporary redirect. --- dlls/wininet/http.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d925975..b246d67 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4415,6 +4415,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, dwBufferSize=sizeof(szNewLocation); if ((dwStatusCode == HTTP_STATUS_REDIRECT || dwStatusCode == HTTP_STATUS_MOVED || + dwStatusCode == HTTP_STATUS_REDIRECT_KEEP_VERB || dwStatusCode == HTTP_STATUS_REDIRECT_METHOD) && HTTP_HttpQueryInfoW(request,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) == ERROR_SUCCESS) { @@ -4574,7 +4575,10 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ { DWORD dwCode,dwCodeLength = sizeof(DWORD); if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, &dwCode, &dwCodeLength, NULL) == ERROR_SUCCESS - && (dwCode == 302 || dwCode == 301 || dwCode == 303)) + && (dwCode == HTTP_STATUS_REDIRECT || + dwCode == HTTP_STATUS_MOVED || + dwCode == HTTP_STATUS_REDIRECT_METHOD || + dwCode == HTTP_STATUS_REDIRECT_KEEP_VERB)) { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation);

1 0

Thomas Mullaly : urlmon: Stop binding with E_ABORT if the client returns that from OnStartBinding.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: dad5913823b8d3c951093529e4122bf49b471da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad5913823b8d3c951093529e… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun May 1 23:29:53 2011 -0400 urlmon: Stop binding with E_ABORT if the client returns that from OnStartBinding. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/tests/url.c | 122 +++++++++++++++++++++++++++++++--------------- 2 files changed, 83 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dad5913823b8d3c951093…

1 0

Austin English : kernel32/tests: Fix typo in test failure message.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 689840babbfa64ee39c413e0e0274a943dfd41b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689840babbfa64ee39c413e0e… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 6 14:10:29 2011 -0500 kernel32/tests: Fix typo in test failure message. --- dlls/kernel32/tests/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 373eea7..e35e0e4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -955,7 +955,7 @@ static void test_SetThreadContext(void) prevcount, GetLastError() ); WaitForSingleObject( thread, INFINITE ); - ok( test_value == 10, "test_value %d instead of 20\n", test_value ); + ok( test_value == 10, "test_value %d\n", test_value ); ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef);

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
95
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 May 2011