May 2011 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Use a separate function to retrieve the target folder path.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 8fb5368d4e595f5e385831614bbc7a2b11eb4421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb5368d4e595f5e385831614… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:03:32 2011 +0200 msi: Use a separate function to retrieve the target folder path. --- dlls/msi/action.c | 66 +++++++++++++++++++--------------------------------- dlls/msi/custom.c | 19 ++++----------- dlls/msi/files.c | 11 ++++---- dlls/msi/format.c | 2 +- dlls/msi/helpers.c | 7 +++++ dlls/msi/msipriv.h | 1 + 6 files changed, 43 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fb5368d4e595f5e38583…

1 0

Hans Leidekker : msi: Rewrite the folder resolution code to keep track of the parent-child relationship .
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 4668091528e4d124632544b36d0ab10cc890f292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4668091528e4d124632544b36… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:03:55 2011 +0200 msi: Rewrite the folder resolution code to keep track of the parent-child relationship. --- dlls/msi/action.c | 181 ++++++++++++++++++++++++++++------------------ dlls/msi/helpers.c | 130 --------------------------------- dlls/msi/install.c | 113 +++++++++++++---------------- dlls/msi/msipriv.h | 12 +++- dlls/msi/package.c | 31 ++++++--- dlls/msi/tests/package.c | 8 ++ 6 files changed, 199 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4668091528e4d12463254…

1 0

Hans Leidekker : msi: Define common strings just once.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: cd34bfe6c1e1c841fdae24f8721a01c47db9a681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd34bfe6c1e1c841fdae24f87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:04:25 2011 +0200 msi: Define common strings just once. --- dlls/msi/action.c | 50 ++++++++++++++++---------------------------------- dlls/msi/appsearch.c | 2 +- dlls/msi/custom.c | 17 ++++++----------- dlls/msi/dialog.c | 2 +- dlls/msi/helpers.c | 12 +++++------- dlls/msi/install.c | 6 +----- dlls/msi/media.c | 6 +++--- dlls/msi/msi.c | 12 ++++-------- dlls/msi/msipriv.h | 18 ++++++++++++++---- dlls/msi/package.c | 10 +++------- dlls/msi/string.c | 5 ----- dlls/msi/table.c | 5 ----- dlls/msi/upgrade.c | 2 +- 13 files changed, 55 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd34bfe6c1e1c841fdae2…

1 0

Nikolay Sivov : msxml3: Add support for standalone property.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 1d816be12e48e8c5cf7adca2194f946ff55346d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d816be12e48e8c5cf7adca21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 30 15:36:37 2011 +0400 msxml3: Add support for standalone property. --- dlls/msxml3/mxwriter.c | 21 +++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 6cebf76..fed2fda 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -44,6 +44,8 @@ typedef struct _mxwriter ISAXContentHandler ISAXContentHandler_iface; LONG ref; + + VARIANT_BOOL standalone; } mxwriter; static inline mxwriter *impl_from_IMXWriter(IMXWriter *iface) @@ -237,15 +239,24 @@ static HRESULT WINAPI mxwriter_get_indent(IMXWriter *iface, VARIANT_BOOL *indent static HRESULT WINAPI mxwriter_put_standalone(IMXWriter *iface, VARIANT_BOOL value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%d)\n", This, value); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, value); + This->standalone = value; + + return S_OK; } static HRESULT WINAPI mxwriter_get_standalone(IMXWriter *iface, VARIANT_BOOL *value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, value); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, value); + + if (!value) return E_POINTER; + + *value = This->standalone; + + return S_OK; } static HRESULT WINAPI mxwriter_put_omitXMLDeclaration(IMXWriter *iface, VARIANT_BOOL value) @@ -499,6 +510,8 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; + This->standalone = VARIANT_FALSE; + *ppObj = &This->IMXWriter_iface; TRACE("returning iface %p\n", *ppObj); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index f6c35b8..784b37a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -694,6 +694,41 @@ static void test_mxwriter_contenthandler(void) IMXWriter_Release(writer); } +static void test_mxwriter_properties(void) +{ + IMXWriter *writer; + VARIANT_BOOL b; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + if (hr != S_OK) + { + win_skip("MXXMLWriter not supported\n"); + return; + } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IMXWriter_get_standalone(writer, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + + b = VARIANT_TRUE; + hr = IMXWriter_get_standalone(writer, &b); + ok(hr == S_OK, "got %08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + + /* set and check */ + hr = IMXWriter_put_standalone(writer, VARIANT_TRUE); + ok(hr == S_OK, "got %08x\n", hr); + + b = VARIANT_FALSE; + hr = IMXWriter_get_standalone(writer, &b); + ok(hr == S_OK, "got %08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + + IMXWriter_Release(writer); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -716,6 +751,7 @@ START_TEST(saxreader) test_saxreader(); test_encoding(); test_mxwriter_contenthandler(); + test_mxwriter_properties(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Store stream reference as destination.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 92668f1d30ade1bc9082d90572d096ac9b6c980f URL: http://source.winehq.org/git/wine.git/?a=commit;h=92668f1d30ade1bc9082d9057… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 1 12:04:59 2011 +0400 msxml3: Store stream reference as destination. --- dlls/msxml3/mxwriter.c | 41 +++++++++++++++- dlls/msxml3/tests/saxreader.c | 108 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 135 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index fed2fda..14fccb8 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -46,6 +46,8 @@ typedef struct _mxwriter LONG ref; VARIANT_BOOL standalone; + + IStream *dest; } mxwriter; static inline mxwriter *impl_from_IMXWriter(IMXWriter *iface) @@ -103,7 +105,10 @@ static ULONG WINAPI mxwriter_Release(IMXWriter *iface) TRACE("(%p)->(%d)\n", This, ref); if(!ref) + { + if (This->dest) IStream_Release(This->dest); heap_free(This); + } return ref; } @@ -183,8 +188,39 @@ static HRESULT WINAPI mxwriter_Invoke( static HRESULT WINAPI mxwriter_put_output(IMXWriter *iface, VARIANT dest) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&dest)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&dest)); + + switch (V_VT(&dest)) + { + case VT_EMPTY: + { + if (This->dest) IStream_Release(This->dest); + This->dest = NULL; + break; + } + case VT_UNKNOWN: + { + IStream *stream; + HRESULT hr; + + hr = IUnknown_QueryInterface(V_UNKNOWN(&dest), &IID_IStream, (void**)&stream); + if (hr == S_OK) + { + if (This->dest) IStream_Release(This->dest); + This->dest = stream; + break; + } + + FIXME("unhandled interface type for VT_UNKNOWN destination\n"); + return E_NOTIMPL; + } + default: + FIXME("unhandled destination type %s\n", debugstr_variant(&dest)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) @@ -511,6 +547,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ref = 1; This->standalone = VARIANT_FALSE; + This->dest = NULL; *ppObj = &This->IMXWriter_iface; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 784b37a..1f7aac7 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -669,11 +669,6 @@ static void test_mxwriter_contenthandler(void) hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); - if (hr != S_OK) - { - win_skip("MXXMLWriter not supported\n"); - return; - } ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); EXPECT_REF(writer, 1); @@ -702,11 +697,6 @@ static void test_mxwriter_properties(void) hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); - if (hr != S_OK) - { - win_skip("MXXMLWriter not supported\n"); - return; - } ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); hr = IMXWriter_get_standalone(writer, NULL); @@ -729,9 +719,92 @@ static void test_mxwriter_properties(void) IMXWriter_Release(writer); } +static void test_mxwriter_flush(void) +{ + ISAXContentHandler *content; + IMXWriter *writer; + LARGE_INTEGER pos; + ULARGE_INTEGER pos2; + IStream *stream; + 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 = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + EXPECT_REF(stream, 1); + + /* detach whe nothing was attached */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* attach stream */ + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine EXPECT_REF(stream, 3); + + /* detach setting VT_EMPTY destination */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + EXPECT_REF(stream, 1); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* flush() doesn't detach a stream */ + hr = IMXWriter_flush(writer); +todo_wine { + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + EXPECT_REF(stream, 3); +} + + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine ok(pos2.QuadPart != 0, "expected stream beginning\n"); + + /* already started */ + hr = ISAXContentHandler_startDocument(content); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + /* flushed on endDocument() */ + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine ok(pos2.QuadPart != 0, "expected stream position moved\n"); + + ISAXContentHandler_Release(content); + IStream_Release(stream); + IMXWriter_Release(writer); +} + START_TEST(saxreader) { ISAXXMLReader *reader; + IMXWriter *writer; HRESULT hr; hr = CoInitialize(NULL); @@ -750,8 +823,19 @@ START_TEST(saxreader) test_saxreader(); test_encoding(); - test_mxwriter_contenthandler(); - test_mxwriter_properties(); + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + if (hr == S_OK) + { + IMXWriter_Release(writer); + + test_mxwriter_contenthandler(); + test_mxwriter_properties(); + test_mxwriter_flush(); + } + else + win_skip("MXXMLWriter not supported\n"); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Basic support for encoding property.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: e93125f31b5f6a57ec01e94b46727bf30f6a46e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93125f31b5f6a57ec01e94b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 1 12:54:09 2011 +0400 msxml3: Basic support for encoding property. --- dlls/msxml3/mxwriter.c | 32 ++++++++++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 14fccb8..fe7fba7 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -46,6 +46,7 @@ typedef struct _mxwriter LONG ref; VARIANT_BOOL standalone; + BSTR encoding; IStream *dest; } mxwriter; @@ -107,6 +108,7 @@ static ULONG WINAPI mxwriter_Release(IMXWriter *iface) if(!ref) { if (This->dest) IStream_Release(This->dest); + SysFreeString(This->encoding); heap_free(This); } @@ -232,16 +234,35 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) static HRESULT WINAPI mxwriter_put_encoding(IMXWriter *iface, BSTR encoding) { + static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; + static const WCHAR utf8W[] = {'U','T','F','-','8',0}; mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_w(encoding)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(encoding)); + + /* FIXME: filter all supported encodings */ + if (!strcmpW(encoding, utf16W) || !strcmpW(encoding, utf8W)) + { + SysFreeString(This->encoding); + This->encoding = SysAllocString(encoding); + return S_OK; + } + else + { + FIXME("unsupported encoding %s\n", debugstr_w(encoding)); + return E_INVALIDARG; + } } static HRESULT WINAPI mxwriter_get_encoding(IMXWriter *iface, BSTR *encoding) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, encoding); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, encoding); + + if (!encoding) return E_POINTER; + + return return_bstr(This->encoding, encoding); } static HRESULT WINAPI mxwriter_put_byteOrderMark(IMXWriter *iface, VARIANT_BOOL writeBOM) @@ -532,6 +553,7 @@ static const struct ISAXContentHandlerVtbl mxwriter_saxcontent_vtbl = HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) { + static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; mxwriter *This; TRACE("(%p,%p)\n", pUnkOuter, ppObj); @@ -547,6 +569,8 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ref = 1; This->standalone = VARIANT_FALSE; + This->encoding = SysAllocString(utf16W); + This->dest = NULL; *ppObj = &This->IMXWriter_iface; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 1f7aac7..34fa902 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -691,9 +691,13 @@ static void test_mxwriter_contenthandler(void) static void test_mxwriter_properties(void) { + static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; + static const WCHAR emptyW[] = {0}; + static const WCHAR testW[] = {'t','e','s','t',0}; IMXWriter *writer; VARIANT_BOOL b; HRESULT hr; + BSTR str, str2; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -716,6 +720,40 @@ static void test_mxwriter_properties(void) ok(hr == S_OK, "got %08x\n", hr); ok(b == VARIANT_TRUE, "got %d\n", b); + hr = IMXWriter_get_encoding(writer, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + + /* UTF-16 is a default setting apparently */ + str = (void*)0xdeadbeef; + hr = IMXWriter_get_encoding(writer, &str); + ok(hr == S_OK, "got %08x\n", hr); + ok(lstrcmpW(str, utf16W) == 0, "expected empty string, got %s\n", wine_dbgstr_w(str)); + + str2 = (void*)0xdeadbeef; + hr = IMXWriter_get_encoding(writer, &str2); + ok(hr == S_OK, "got %08x\n", hr); + ok(str != str2, "expected newly allocated, got same %p\n", str); + + SysFreeString(str2); + SysFreeString(str); + + /* put empty string */ + str = SysAllocString(emptyW); + hr = IMXWriter_put_encoding(writer, str); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = IMXWriter_get_encoding(writer, &str); + ok(hr == S_OK, "got %08x\n", hr); + ok(lstrcmpW(str, utf16W) == 0, "expected empty string, got %s\n", wine_dbgstr_w(str)); + + /* invalid encoding name */ + str = SysAllocString(testW); + hr = IMXWriter_put_encoding(writer, str); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + SysFreeString(str); + IMXWriter_Release(writer); }

1 0

Nikolay Sivov : msxml3: Basic support for startDocument().
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: c8f9c4581cf3bad1150e0459c4eea6a8af40257e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f9c4581cf3bad1150e0459c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 1 20:05:31 2011 +0400 msxml3: Basic support for startDocument(). --- dlls/msxml3/mxwriter.c | 80 ++++++++++++++++++++++++++++++++++--- dlls/msxml3/tests/saxreader.c | 87 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 159 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index fe7fba7..ec82611 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -38,6 +38,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#ifdef HAVE_LIBXML2 + +static const char crlfA[] = "\r\n"; + typedef struct _mxwriter { IMXWriter IMXWriter_iface; @@ -47,8 +51,11 @@ typedef struct _mxwriter VARIANT_BOOL standalone; BSTR encoding; + BSTR version; IStream *dest; + + xmlOutputBufferPtr buffer; } mxwriter; static inline mxwriter *impl_from_IMXWriter(IMXWriter *iface) @@ -109,6 +116,9 @@ static ULONG WINAPI mxwriter_Release(IMXWriter *iface) { if (This->dest) IStream_Release(This->dest); SysFreeString(This->encoding); + SysFreeString(This->version); + + xmlOutputBufferClose(This->buffer); heap_free(This); } @@ -228,7 +238,19 @@ static HRESULT WINAPI mxwriter_put_output(IMXWriter *iface, VARIANT dest) static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, dest); + + TRACE("(%p)->(%p)\n", This, dest); + + if (!This->dest) + { + V_VT(dest) = VT_BSTR; + V_BSTR(dest) = bstr_from_xmlChar(This->buffer->buffer->content); + + return S_OK; + } + else + FIXME("not implemented when stream is set up\n"); + return E_NOTIMPL; } @@ -340,8 +362,12 @@ static HRESULT WINAPI mxwriter_put_version(IMXWriter *iface, BSTR version) static HRESULT WINAPI mxwriter_get_version(IMXWriter *iface, BSTR *version) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, version); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, version); + + if (!version) return E_POINTER; + + return return_bstr(This->version, version); } static HRESULT WINAPI mxwriter_put_disableOutputEscaping(IMXWriter *iface, VARIANT_BOOL value) @@ -427,8 +453,34 @@ static HRESULT WINAPI mxwriter_saxcontent_putDocumentLocator( static HRESULT WINAPI mxwriter_saxcontent_startDocument(ISAXContentHandler *iface) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)\n", This); - return E_NOTIMPL; + xmlChar *s; + + TRACE("(%p)\n", This); + + /* version */ + xmlOutputBufferWriteString(This->buffer, "<?xml version=\""); + s = xmlchar_from_wchar(This->version); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + xmlOutputBufferWriteString(This->buffer, "\""); + + /* encoding */ + xmlOutputBufferWriteString(This->buffer, " encoding=\""); + s = xmlchar_from_wchar(This->encoding); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + xmlOutputBufferWriteString(This->buffer, "\""); + + /* standalone */ + xmlOutputBufferWriteString(This->buffer, " standalone=\""); + if (This->standalone == VARIANT_TRUE) + xmlOutputBufferWriteString(This->buffer, "yes\"?>"); + else + xmlOutputBufferWriteString(This->buffer, "no\"?>"); + + xmlOutputBufferWriteString(This->buffer, crlfA); + + return S_OK; } static HRESULT WINAPI mxwriter_saxcontent_endDocument(ISAXContentHandler *iface) @@ -554,6 +606,7 @@ static const struct ISAXContentHandlerVtbl mxwriter_saxcontent_vtbl = HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) { static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; + static const WCHAR version10W[] = {'1','.','0',0}; mxwriter *This; TRACE("(%p,%p)\n", pUnkOuter, ppObj); @@ -569,13 +622,28 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ref = 1; This->standalone = VARIANT_FALSE; - This->encoding = SysAllocString(utf16W); + This->encoding = SysAllocString(utf16W); + This->version = SysAllocString(version10W); This->dest = NULL; + /* set up a buffer, default encoding is UTF-16 */ + This->buffer = xmlAllocOutputBuffer(xmlFindCharEncodingHandler("UTF-16")); + *ppObj = &This->IMXWriter_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; } + +#else + +HRESULT MXWriter_create(IUnknown *pUnkOuter, 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 */ diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 34fa902..6ae7e3d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -22,6 +22,8 @@ #define CONST_VTABLE #include <stdio.h> +#include <assert.h> + #include "windows.h" #include "ole2.h" #include "msxml2.h" @@ -37,6 +39,32 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); } +static BSTR alloc_str_from_narrow(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static BSTR alloced_bstrs[256]; +static int alloced_bstrs_count; + +static BSTR _bstr_(const char *str) +{ + assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); + alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); + return alloced_bstrs[alloced_bstrs_count++]; +} + +static void free_bstrs(void) +{ + int i; + for (i = 0; i < alloced_bstrs_count; i++) + SysFreeString(alloced_bstrs[i]); + alloced_bstrs_count = 0; +} + typedef enum _CH { CH_ENDTEST, CH_PUTDOCUMENTLOCATOR, @@ -754,7 +782,15 @@ static void test_mxwriter_properties(void) ok(hr == E_INVALIDARG, "got %08x\n", hr); SysFreeString(str); + hr = IMXWriter_get_version(writer, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + /* default version is 'surprisingly' 1.0 */ + hr = IMXWriter_get_version(writer, &str); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(str, _bstr_("1.0")), "got %s\n", wine_dbgstr_w(str)); + IMXWriter_Release(writer); + free_bstrs(); } static void test_mxwriter_flush(void) @@ -814,7 +850,7 @@ todo_wine { ok(hr == S_OK, "got %08x\n", hr); hr = ISAXContentHandler_startDocument(content); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); pos.QuadPart = 0; hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); @@ -823,7 +859,7 @@ todo_wine { /* already started */ hr = ISAXContentHandler_startDocument(content); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); hr = ISAXContentHandler_endDocument(content); todo_wine ok(hr == S_OK, "got %08x\n", hr); @@ -839,6 +875,52 @@ todo_wine { IMXWriter_Release(writer); } +static void test_mxwriter_startenddocument(void) +{ + 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 = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_endDocument(content); + todo_wine 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_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + /* now try another startDocument */ + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + /* and get duplcated prolog */ + 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_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n" + "<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -869,6 +951,7 @@ START_TEST(saxreader) IMXWriter_Release(writer); test_mxwriter_contenthandler(); + test_mxwriter_startenddocument(); test_mxwriter_properties(); test_mxwriter_flush(); }

1 0

Jacek Caban : wininet: Get rid of useless read_ret in netconn_read.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: aa612ec39b5c9bf5d5d709108d00372d567bc633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa612ec39b5c9bf5d5d709108… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 11:25:47 2011 +0200 wininet: Get rid of useless read_ret in netconn_read. --- dlls/wininet/http.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f1ed423..fb01e36 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2144,8 +2144,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD *read, read_mode_t read_mode) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; - DWORD ret_read = 0; - int len; + int len = 0; size = min(size, netconn_stream->content_length-netconn_stream->content_read); @@ -2153,13 +2152,12 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, size = min(size, netconn_get_avail_data(stream, req)); if(size) { - if(NETCON_recv(&req->netConnection, buf + ret_read, size, - read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len) == ERROR_SUCCESS) - ret_read = len; + if(NETCON_recv(&req->netConnection, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len) != ERROR_SUCCESS) + len = 0; } - netconn_stream->content_read += *read = ret_read; - TRACE("read %u bytes\n", ret_read); + netconn_stream->content_read += *read = len; + TRACE("read %u bytes\n", len); return ERROR_SUCCESS; }

1 0

Jacek Caban : wininet: Allocate buffer for host name in HTTP_HttpOpenRequestW only if needed.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 59f2e837eb6cc4428a0048fd3b46830b9086af8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f2e837eb6cc4428a0048fd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 11:26:10 2011 +0200 wininet: Allocate buffer for host name in HTTP_HttpOpenRequestW only if needed. --- dlls/wininet/http.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fb01e36..bc1fcf4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2792,8 +2792,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = NULL; http_request_t *request; - LPWSTR lpszHostName = NULL; - static const WCHAR szHostForm[] = {'%','s',':','%','u',0}; DWORD len, res; TRACE("-->\n"); @@ -2819,13 +2817,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); - lpszHostName = heap_alloc(sizeof(WCHAR) * (strlenW(session->hostName) + 7 /* length of ":65535" + 1 */)); - if (NULL == lpszHostName) - { - res = ERROR_OUTOFMEMORY; - goto lend; - } - if ((res = NETCON_init(&request->netConnection, dwFlags & INTERNET_FLAG_SECURE)) != ERROR_SUCCESS) goto lend; if (dwFlags & INTERNET_FLAG_IGNORE_CERT_CN_INVALID) @@ -2877,9 +2868,19 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, session->hostPort != INTERNET_DEFAULT_HTTP_PORT && session->hostPort != INTERNET_DEFAULT_HTTPS_PORT) { - sprintfW(lpszHostName, szHostForm, session->hostName, session->hostPort); - HTTP_ProcessHeader(request, hostW, lpszHostName, - HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); + WCHAR *host_name; + + static const WCHAR host_formatW[] = {'%','s',':','%','u',0}; + + host_name = heap_alloc((strlenW(session->hostName) + 7 /* length of ":65535" + 1 */) * sizeof(WCHAR)); + if (!host_name) { + res = ERROR_OUTOFMEMORY; + goto lend; + } + + sprintfW(host_name, host_formatW, session->hostName, session->hostPort); + HTTP_ProcessHeader(request, hostW, host_name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); + heap_free(host_name); } else HTTP_ProcessHeader(request, hostW, session->hostName, @@ -2905,7 +2906,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, lend: TRACE("<-- %u (%p)\n", res, request); - HeapFree(GetProcessHeap(), 0, lpszHostName); if(res != ERROR_SUCCESS) { WININET_Release( &request->hdr ); *ret = NULL;

1 0

Adam Martinson : wined3d: Fix an oops/crash in context_destroy_gl_resources ().
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: f912e55610d055464680d8d05f60f54a4a8174f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f912e55610d055464680d8d05… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri Apr 29 16:48:25 2011 -0500 wined3d: Fix an oops/crash in context_destroy_gl_resources(). Introduced by 96b150929b0791c7c30ade49d55cedf2d608537e. --- dlls/wined3d/context.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 00a649b..9fecddd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -989,7 +989,10 @@ static void context_destroy_gl_resources(struct wined3d_context *context) if (gl_info->supported[ARB_SYNC]) { - if (event_query->object.sync) GL_EXTCALL(glDeleteSync(event_query->object.sync)); + for (i = 0; i < context->free_event_query_count; ++i) + { + GL_EXTCALL(glDeleteSync(context->free_event_queries[i].sync)); + } } else if (gl_info->supported[APPLE_FENCE]) {

1 0