wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Alistair Leslie-Hughes : d3dx9_33: Share the source with d3dx9_36.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 1a885745fce9b896d06cc191b93dda6ea3bbd75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a885745fce9b896d06cc191b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 06:00:11 2016 +0000 d3dx9_33: Share the source with d3dx9_36. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_33/Makefile.in | 22 +- dlls/d3dx9_33/d3dx9_33.spec | 666 +++++++++++++++++++++--------------------- dlls/d3dx9_33/d3dx9_33_main.c | 1 + tools/make_specfiles | 1 - 4 files changed, 354 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a885745fce9b896d06cc…

1 0

Nikolay Sivov : msscript: Implement GetViewStatus().
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: c34f09b9d8dc534d1dc3894bb81f0260b39b2ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34f09b9d8dc534d1dc3894bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 21 13:41:36 2016 +0300 msscript: Implement GetViewStatus(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 5 +++-- dlls/msscript.ocx/tests/msscript.c | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ea4ce3c..5be53da 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1073,9 +1073,10 @@ static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *stat { ScriptControl *This = impl_from_IViewObjectEx(iface); - FIXME("(%p)->(%p)\n", This, status); + TRACE("(%p)->(%p)\n", This, status); - return E_NOTIMPL; + *status = VIEWSTATUS_OPAQUE; + return S_OK; } static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx *iface, DWORD aspect, const RECT *bounds, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 97c700e..714b075 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -828,8 +828,10 @@ static void test_quickactivate(void) static void test_viewobject(void) { + IViewObjectEx *viewex; IScriptControl *sc; IViewObject *view; + DWORD status; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -844,9 +846,18 @@ static void test_viewobject(void) ok(hr == S_OK, "got 0x%08x\n", hr); IViewObject_Release(view); - hr = IScriptControl_QueryInterface(sc, &IID_IViewObjectEx, (void**)&view); + hr = IScriptControl_QueryInterface(sc, &IID_IViewObjectEx, (void**)&viewex); ok(hr == S_OK, "got 0x%08x\n", hr); - IViewObject_Release(view); + + if (0) /* crashes */ + hr = IViewObjectEx_GetViewStatus(viewex, NULL); + + status = 0; + hr = IViewObjectEx_GetViewStatus(viewex, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == VIEWSTATUS_OPAQUE, "got %#x\n", status); + + IViewObjectEx_Release(viewex); IScriptControl_Release(sc); }

1 0

Nikolay Sivov : msscript: Update to IViewObjectEx.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 33c2a22f662830c52f7347a0ddb96901cad11dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c2a22f662830c52f7347a0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 21 13:41:35 2016 +0300 msscript: Update to IViewObjectEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 120 +++++++++++++++++++++++++++++-------- dlls/msscript.ocx/tests/msscript.c | 8 +++ 2 files changed, 103 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33c2a22f662830c52f734…

1 0

Hans Leidekker : webservices: Implement WsSetWriterPosition.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 511c21d30977cb15c03bd193a7aa2fb3982a6c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=511c21d30977cb15c03bd193a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:48 2016 +0200 webservices: Implement WsSetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 48 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 17 ++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f425664..5314bc8 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1532,6 +1532,53 @@ static void test_WsGetWriterPosition(void) WsFreeHeap( heap ); } +static void test_WsSetWriterPosition(void) +{ + WS_HEAP *heap; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buf1, *buf2; + WS_XML_NODE_POSITION pos; + HRESULT hr; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetWriterPosition( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buf1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buf1, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetWriterPosition( writer, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer == buf1, "wrong buffer\n" ); + ok( pos.node != NULL, "node not set\n" ); + + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* different buffer */ + hr = WsCreateXmlBuffer( heap, NULL, 0, &buf2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + pos.buffer = buf2; + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeWriter( writer ); + WsFreeHeap( heap ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1552,4 +1599,5 @@ START_TEST(writer) test_complex_struct_type(); test_WsMoveWriter(); test_WsGetWriterPosition(); + test_WsSetWriterPosition(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 618d6ee..3a69302 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -157,7 +157,7 @@ @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stub WsSetReaderPosition -@ stub WsSetWriterPosition +@ stdcall WsSetWriterPosition(ptr ptr ptr) @ stub WsShutdownSessionChannel @ stub WsSkipNode @ stub WsStartReaderCanonicalization diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f9c9ca9..8c9e202 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1819,3 +1819,20 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION pos->node = writer->current; return S_OK; } + +/************************************************************************** + * WsSetWriterPosition [webservices.@] + */ +HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POSITION *pos, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %p %p\n", handle, pos, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !pos || (struct xmlbuf *)pos->buffer != writer->output_buf) return E_INVALIDARG; + if (!writer->output_type) return WS_E_INVALID_OPERATION; + + writer->current = pos->node; + return S_OK; +}

1 0

Hans Leidekker : webservices: Implement WsGetWriterPosition.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 600e2e53c858beb553f97855c56031d8d6beb64c URL: http://source.winehq.org/git/wine.git/?a=commit;h=600e2e53c858beb553f97855c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:47 2016 +0200 webservices: Implement WsGetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 18 +++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index b223544..f425664 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1486,6 +1486,52 @@ static void test_WsMoveWriter(void) WsFreeHeap( heap ); } +static void test_WsGetWriterPosition(void) +{ + WS_HEAP *heap; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buffer; + WS_XML_NODE_POSITION pos; + HRESULT hr; + + hr = WsGetWriterPosition( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* writer must be set to an XML buffer */ + hr = WsGetWriterPosition( writer, &pos, NULL ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetWriterPosition( writer, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer != NULL, "buffer not set\n" ); + ok( pos.node != NULL, "node not set\n" ); + + WsFreeWriter( writer ); + WsFreeHeap( heap ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1505,4 +1551,5 @@ START_TEST(writer) test_WsGetPrefixFromNamespace(); test_complex_struct_type(); test_WsMoveWriter(); + test_WsGetWriterPosition(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 5754c61..618d6ee 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -87,7 +87,7 @@ @ stub WsGetSecurityTokenProperty @ stub WsGetServiceHostProperty @ stdcall WsGetServiceProxyProperty(ptr long ptr long ptr) -@ stub WsGetWriterPosition +@ stdcall WsGetWriterPosition(ptr ptr ptr) @ stdcall WsGetWriterProperty(ptr long ptr long ptr) @ stdcall WsGetXmlAttribute(ptr ptr ptr ptr ptr ptr) @ stub WsInitializeMessage diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 583e7fa..f9c9ca9 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1801,3 +1801,21 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found return write_move_to( writer, move, found ); } + +/************************************************************************** + * WsGetWriterPosition [webservices.@] + */ +HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION *pos, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %p %p\n", handle, pos, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !pos) return E_INVALIDARG; + if (!writer->output_type) return WS_E_INVALID_OPERATION; + + pos->buffer = (WS_XML_BUFFER *)writer->output_buf; + pos->node = writer->current; + return S_OK; +}

1 0

Hans Leidekker : webservices: Implement WsMoveWriter.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 768197795df9b4c24e7252cfc91e36e527d84799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768197795df9b4c24e7252cfc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:46 2016 +0200 webservices: Implement WsMoveWriter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 151 +++++++++++++++++++-------------- dlls/webservices/tests/writer.c | 71 ++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 13 +++ dlls/webservices/writer.c | 87 +++++++++++++++++++ 5 files changed, 258 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=768197795df9b4c24e725…

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: f5c8f697250e0956257fdf66cb35990481e3fdbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c8f697250e0956257fdf66c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:45 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 451cfad..a5ffd51 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -73,6 +73,7 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; +typedef struct _WS_XML_NODE_POSITION WS_XML_NODE_POSITION; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -1266,6 +1267,16 @@ struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT void *state; }; +typedef enum +{ + WS_RECEIVE_REQUIRED_MESSAGE = 1, + WS_RECEIVE_OPTIONAL_MESSAGE = 2 +} WS_RECEIVE_OPTION; + +typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) + (void*); + +HRESULT WINAPI WsAddressMessage(WS_MESSAGE*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const void**, WS_HEAP*, const WS_CALL_PROPERTY*, const ULONG, const WS_ASYNC_CONTEXT*, @@ -1273,6 +1284,7 @@ HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const HRESULT WINAPI WsCloseChannel(WS_CHANNEL*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsCloseServiceProxy(WS_SERVICE_PROXY*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsCombineUrl(const WS_STRING*, const WS_STRING*, ULONG, WS_HEAP*, WS_STRING*, WS_ERROR*); +HRESULT WINAPI WsCopyNode(WS_XML_WRITER*, WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsCreateChannel(WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY*, ULONG, const WS_SECURITY_DESCRIPTION*, WS_CHANNEL**, WS_ERROR*); HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); @@ -1321,6 +1333,7 @@ HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERR HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetServiceProxyProperty(WS_SERVICE_PROXY*, const WS_PROXY_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetWriterPosition(WS_XML_WRITER*, WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsGetWriterProperty(WS_XML_WRITER*, WS_XML_WRITER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetXmlAttribute(WS_XML_READER*, const WS_XML_STRING*, WS_HEAP*, WCHAR**, ULONG*, WS_ERROR*); @@ -1344,10 +1357,20 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION**, ULONG, + WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, + const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); +HRESULT WINAPI WsRequestReply(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, + WS_READ_OPTION, WS_HEAP*, void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSendMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsSendReplyMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, + WS_WRITE_OPTION, const void*, ULONG, WS_MESSAGE*, + const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const WS_XML_READER_INPUT*, @@ -1359,15 +1382,21 @@ HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsSetReaderPosition(WS_XML_READER*, const WS_XML_NODE_POSITION*, WS_ERROR*); +HRESULT WINAPI WsSetWriterPosition(WS_XML_WRITER*, const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsSkipNode(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsWriteAttribute(WS_XML_WRITER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, + ULONG, WS_ERROR*); HRESULT WINAPI WsWriteElement(WS_XML_WRITER*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndCData(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndStartElement(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteEnvelopeEnd(WS_MESSAGE*, WS_ERROR*); +HRESULT WINAPI WsWriteEnvelopeStart(WS_MESSAGE*, WS_XML_WRITER*, WS_MESSAGE_DONE_CALLBACK, void*, WS_ERROR*); HRESULT WINAPI WsWriteMessageStart(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteMessageEnd(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*,

1 0

Hans Leidekker : webservices: Validate parent nodes in the writer.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 13ef81e4c08bb8f4d032496591e34027d6d5942d URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ef81e4c08bb8f4d03249659… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:44 2016 +0200 webservices: Validate parent nodes in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 11 +++++------ dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 11 +++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ca8f1bd..8f2d8fb 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1100,9 +1100,8 @@ static inline BOOL is_valid_parent( const struct node *node ) return node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF; } -static struct node *read_find_parent( struct reader *reader ) +struct node *find_parent( struct node *node ) { - struct node *node = reader->current; if (node_type( node ) == WS_XML_NODE_TYPE_END_ELEMENT) { if (!node->parent || !is_valid_parent( node->parent->parent )) return NULL; @@ -1168,7 +1167,7 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; - if (!(parent = read_find_parent( reader ))) goto error; + if (!(parent = find_parent( reader->current ))) goto error; hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; @@ -1217,7 +1216,7 @@ static HRESULT read_text( struct reader *reader ) len += skip; } - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; @@ -1386,7 +1385,7 @@ static HRESULT read_comment( struct reader *reader ) len += skip; } - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; comment = (WS_XML_COMMENT_NODE *)node; @@ -1410,7 +1409,7 @@ static HRESULT read_startcdata( struct reader *reader ) if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; read_skip( reader, 9 ); - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; read_insert_node( reader, parent, node ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 363f164..fc888ee 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -45,6 +45,7 @@ struct node struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN; void destroy_nodes( struct node * ) DECLSPEC_HIDDEN; +struct node *find_parent( struct node * ) DECLSPEC_HIDDEN; static inline WS_XML_NODE_TYPE node_type( const struct node *node ) { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ebe9b9d..bf4c61b 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -880,10 +880,11 @@ static HRESULT write_flush( struct writer *writer ) static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - struct node *node; + struct node *node, *parent; WS_XML_ELEMENT_NODE *elem; HRESULT hr; + if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; if ((hr = write_flush( writer )) != S_OK) return hr; if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) @@ -907,7 +908,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN free_node( node ); return E_OUTOFMEMORY; } - write_insert_node( writer, writer->current, node ); + write_insert_node( writer, parent, node ); writer->state = WRITER_STATE_STARTELEMENT; return S_OK; } @@ -938,14 +939,16 @@ static inline void write_set_attribute_value( struct writer *writer, WS_XML_TEXT static HRESULT write_add_text_node( struct writer *writer, WS_XML_TEXT *value ) { - struct node *node; + struct node *node, *parent; WS_XML_TEXT_NODE *text; + if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; text->text = value; - write_insert_node( writer, writer->current, node ); + write_insert_node( writer, parent, node ); writer->state = WRITER_STATE_TEXT; return S_OK; }

1 0

Hans Leidekker : webservices: Accept zero write option in WsWriteType.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: b0077f06f091c661138ef39550ca66bada1ee56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0077f06f091c661138ef3955… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:43 2016 +0200 webservices: Accept zero write option in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 9779870..ebe9b9d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1424,55 +1424,55 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_BOOL_TYPE: { const BOOL *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_bool( writer, mapping, desc, ptr ); } case WS_INT8_TYPE: { const INT8 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int8( writer, mapping, desc, ptr ); } case WS_INT16_TYPE: { const INT16 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int16( writer, mapping, desc, ptr ); } case WS_INT32_TYPE: { const INT32 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int32( writer, mapping, desc, ptr ); } case WS_INT64_TYPE: { const INT64 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int64( writer, mapping, desc, ptr ); } case WS_UINT8_TYPE: { const UINT8 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint8( writer, mapping, desc, ptr ); } case WS_UINT16_TYPE: { const UINT16 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint16( writer, mapping, desc, ptr ); } case WS_UINT32_TYPE: { const UINT32 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint32( writer, mapping, desc, ptr ); } case WS_UINT64_TYPE: { const UINT64 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint64( writer, mapping, desc, ptr ); } case WS_WSZ_TYPE:

1 0

Hans Leidekker : webservices: Insert a text node in WsWriteText.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 9a51526bd3391cde896f2ba652f9fdeafda55e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a51526bd3391cde896f2ba65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:42 2016 +0200 webservices: Insert a text node in WsWriteText. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index fc7292f..9779870 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -936,6 +936,20 @@ static inline void write_set_attribute_value( struct writer *writer, WS_XML_TEXT elem->attributes[elem->attributeCount - 1]->value = text; } +static HRESULT write_add_text_node( struct writer *writer, WS_XML_TEXT *value ) +{ + struct node *node; + WS_XML_TEXT_NODE *text; + + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; + text = (WS_XML_TEXT_NODE *)node; + text->text = value; + + write_insert_node( writer, writer->current, node ); + writer->state = WRITER_STATE_TEXT; + return S_OK; +} + /************************************************************************** * WsWriteText [webservices.@] */ @@ -961,13 +975,23 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E return E_OUTOFMEMORY; write_set_attribute_value( writer, &dst->text ); + return S_OK; } - else + + if ((hr = write_flush( writer )) != S_OK) return hr; + if (writer->state != WRITER_STATE_STARTCDATA) { - if ((hr = write_flush( writer )) != S_OK) return hr; - if ((hr = write_grow_buffer( writer, src->value.length )) != S_OK) return hr; - write_bytes( writer, src->value.bytes, src->value.length ); + if (!(dst = alloc_utf8_text( src->value.bytes, src->value.length ))) + return E_OUTOFMEMORY; + + if ((hr = write_add_text_node( writer, &dst->text )) != S_OK) + { + heap_free( dst ); + return hr; + } } + if ((hr = write_grow_buffer( writer, src->value.length )) != S_OK) return hr; + write_bytes( writer, src->value.bytes, src->value.length ); return S_OK; } @@ -1053,20 +1077,6 @@ static WS_XML_UTF8_TEXT *format_uint64( const UINT64 *ptr ) return alloc_utf8_text( (const unsigned char *)buf, len ); } -static HRESULT write_add_text_node( struct writer *writer, WS_XML_TEXT *value ) -{ - struct node *node; - WS_XML_TEXT_NODE *text; - - if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; - text = (WS_XML_TEXT_NODE *)node; - text->text = value; - - write_insert_node( writer, writer->current, node ); - writer->state = WRITER_STATE_TEXT; - return S_OK; -} - static HRESULT write_text_node( struct writer *writer ) { HRESULT hr;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
60
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 June 2016