October 2015 - Wine-Commits

Frédéric Delanoy : cmd: Simplify boolean expressions (PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 23e7b5a6b0fcb787d4b322f508054a8fdbcc9cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e7b5a6b0fcb787d4b322f50… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 14 01:58:38 2015 +0200 cmd: Simplify boolean expressions (PVS-Studio). Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5661c69..e9b9ddd 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1005,7 +1005,7 @@ void WCMD_copy(WCHAR * args) { if (!srcisdevice) FindClose (hff); } else { /* Error if the first file was not found */ - if (!anyconcats || (anyconcats && !writtenoneconcat)) { + if (!anyconcats || !writtenoneconcat) { WCMD_print_error (); errorlevel = 1; } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7666329..ba7d9ca 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -879,7 +879,7 @@ static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) { if (startchar == '%' && forvaridx != -1 && forloopcontext.variable[forvaridx]) { /* Replace the 2 characters, % and for variable character */ WCMD_strsubstW(p, p + 2, forloopcontext.variable[forvaridx], -1); - } else if (!atExecute || (atExecute && startchar == '!')) { + } else if (!atExecute || startchar == '!') { p = WCMD_expand_envvar(p, startchar); /* In a FOR loop, see if this is the variable to replace */

1 0

Huw Davies : ole32: Call the cache's OnRun and OnStop methods.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 79598c48034066f4cbd80a7b7e563e6206645b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79598c48034066f4cbd80a7b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:50 2015 +0100 ole32: Call the cache's OnRun and OnStop methods. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 9f6fa2b..dd5a37a 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -459,12 +459,20 @@ static void release_delegates(DefaultHandler *This) /* undoes the work done by DefaultHandler_Run */ static void DefaultHandler_Stop(DefaultHandler *This) { + IOleCacheControl *cache_ctrl; + HRESULT hr; + if (!object_is_running(This)) return; - IOleObject_Unadvise(This->pOleDelegate, This->dwAdvConn); + hr = IUnknown_QueryInterface( This->dataCache, &IID_IOleCacheControl, (void **)&cache_ctrl ); + if (SUCCEEDED(hr)) + { + hr = IOleCacheControl_OnStop( cache_ctrl ); + IOleCacheControl_Release( cache_ctrl ); + } - /* FIXME: call IOleCache_OnStop */ + IOleObject_Unadvise(This->pOleDelegate, This->dwAdvConn); if (This->dataAdviseHolder) DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); @@ -1331,6 +1339,7 @@ static HRESULT WINAPI DefaultHandler_Run( { DefaultHandler *This = impl_from_IRunnableObject(iface); HRESULT hr; + IOleCacheControl *cache_ctrl; FIXME("(%p): semi-stub\n", pbc); @@ -1374,7 +1383,6 @@ static HRESULT WINAPI DefaultHandler_Run( /* FIXME: do more stuff here: * - IOleObject_GetMiscStatus * - IOleObject_GetMoniker - * - IOleCache_OnRun */ hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, @@ -1389,6 +1397,12 @@ static HRESULT WINAPI DefaultHandler_Run( if (FAILED(hr)) goto fail; } + hr = IUnknown_QueryInterface( This->dataCache, &IID_IOleCacheControl, (void **)&cache_ctrl ); + if (FAILED(hr)) goto fail; + hr = IOleCacheControl_OnRun( cache_ctrl, This->pDataDelegate ); + IOleCacheControl_Release( cache_ctrl ); + if (FAILED(hr)) goto fail; + return hr; fail:

1 0

Hans Leidekker : webservices: Implement WsGetWriterProperty.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 9dfe9ec8bb3a6a26e5d2bcc8e0553b1d27707eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dfe9ec8bb3a6a26e5d2bcc8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:06 2015 +0200 webservices: Implement WsGetWriterProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index a8e82ec..0a77d45 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -88,7 +88,7 @@ @ stub WsGetServiceHostProperty @ stub WsGetServiceProxyProperty @ stub WsGetWriterPosition -@ stub WsGetWriterProperty +@ stdcall WsGetWriterProperty(ptr long ptr long ptr) @ stub WsGetXmlAttribute @ stub WsInitializeMessage @ stub WsMarkHeaderAsUnderstood diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e9147fc..51711e4 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -92,6 +92,15 @@ static HRESULT set_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID return S_OK; } +static HRESULT get_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID id, void *buf, ULONG size ) +{ + if (id >= writer->prop_count || size != writer_props[id].size) + return E_INVALIDARG; + + memcpy( buf, writer->prop[id].value, writer->prop[id].valueSize ); + return S_OK; +} + /************************************************************************** * WsCreateWriter [webservices.@] */ @@ -141,3 +150,17 @@ void WINAPI WsFreeWriter( WS_XML_WRITER *handle ) TRACE( "%p\n", handle ); heap_free( writer ); } + +/************************************************************************** + * WsGetWriterProperty [webservices.@] + */ +HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERTY_ID id, + void *buf, ULONG size, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + return get_writer_prop( writer, id, buf, size ); +}

1 0

Hans Leidekker : webservices: Implement WsSetOutput.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 8c3bf0e95e8a9ab2f4b3396f0d3d97524098dfd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3bf0e95e8a9ab2f4b3396f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:07 2015 +0200 webservices: Implement WsSetOutput. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 53 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 0a77d45..15c2c89 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -154,7 +154,7 @@ @ stub WsSetInputToBuffer @ stub WsSetListenerProperty @ stub WsSetMessageProperty -@ stub WsSetOutput +@ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stub WsSetOutputToBuffer @ stub WsSetReaderPosition @ stub WsSetWriterPosition diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 51711e4..620cc46 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -57,6 +57,7 @@ writer_props[] = struct writer { + WS_XML_WRITER_OUTPUT_TYPE output_type; ULONG prop_count; WS_XML_WRITER_PROPERTY prop[sizeof(writer_props)/sizeof(writer_props[0])]; }; @@ -162,5 +163,57 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (!writer->output_type) return WS_E_INVALID_OPERATION; return get_writer_prop( writer, id, buf, size ); } + +/************************************************************************** + * WsSetOutput [webservices.@] + */ +HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING *encoding, + const WS_XML_WRITER_OUTPUT *output, const WS_XML_WRITER_PROPERTY *properties, + ULONG count, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + ULONG i; + + TRACE( "%p %p %p %p %u %p\n", handle, encoding, output, properties, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + switch (encoding->encodingType) + { + case WS_XML_WRITER_ENCODING_TYPE_TEXT: + { + WS_XML_WRITER_TEXT_ENCODING *text = (WS_XML_WRITER_TEXT_ENCODING *)encoding; + if (text->charSet != WS_CHARSET_UTF8) + { + FIXME( "charset %u not supported\n", text->charSet ); + return E_NOTIMPL; + } + break; + } + default: + FIXME( "encoding type %u not supported\n", encoding->encodingType ); + return E_NOTIMPL; + } + switch (output->outputType) + { + case WS_XML_WRITER_OUTPUT_TYPE_BUFFER: + writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + break; + default: + FIXME( "output type %u not supported\n", output->outputType ); + return E_NOTIMPL; + } + + for (i = 0; i < count; i++) + { + hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) return hr; + } + + return S_OK; +}

1 0

Hans Leidekker : webservices: Implement WsCreateWriter and WsFreeWriter.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 65e04e006e8902ac90eecb8267c57ad7b2dc93fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e04e006e8902ac90eecb826… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:05 2015 +0200 webservices: Implement WsCreateWriter and WsFreeWriter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 3 +- dlls/webservices/reader.c | 21 +---- dlls/webservices/webservices.spec | 4 +- dlls/webservices/webservices_private.h | 37 +++++++++ dlls/webservices/writer.c | 143 +++++++++++++++++++++++++++++++++ 5 files changed, 185 insertions(+), 23 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index e11a2e7..c3fea85 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -3,4 +3,5 @@ IMPORTLIB = webservices C_SRCS = \ main.c \ - reader.c + reader.c \ + writer.c diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f85b5e7..ac61890 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -25,6 +25,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "webservices_private.h" WINE_DEFAULT_DEBUG_CHANNEL(webservices); @@ -34,26 +35,6 @@ static const char *debugstr_xmlstr( const WS_XML_STRING *str ) return debugstr_an( (const char *)str->bytes, str->length ); } -static inline void *heap_alloc( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static inline void *heap_alloc_zero( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); -} - -static inline void *heap_realloc( void *mem, SIZE_T size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, size ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - static const struct { ULONG size; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 85014bf..a8e82ec 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -34,7 +34,7 @@ @ stub WsCreateServiceHost @ stub WsCreateServiceProxy @ stub WsCreateServiceProxyFromTemplate -@ stub WsCreateWriter +@ stdcall WsCreateWriter(ptr long ptr ptr) @ stub WsCreateXmlBuffer @ stub WsCreateXmlSecurityToken @ stub WsDateTimeToFileTime @@ -58,7 +58,7 @@ @ stub WsFreeSecurityToken @ stub WsFreeServiceHost @ stub WsFreeServiceProxy -@ stub WsFreeWriter +@ stdcall WsFreeWriter(ptr) @ stub WsGetChannelProperty @ stub WsGetCustomHeader @ stub WsGetDictionary diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h new file mode 100644 index 0000000..20d3f0b --- /dev/null +++ b/dlls/webservices/webservices_private.h @@ -0,0 +1,37 @@ +/* + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void *heap_alloc_zero( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); +} + +static inline void *heap_realloc( void *mem, SIZE_T size ) +{ + return HeapReAlloc( GetProcessHeap(), 0, mem, size ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c new file mode 100644 index 0000000..e9147fc --- /dev/null +++ b/dlls/webservices/writer.c @@ -0,0 +1,143 @@ +/* + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "webservices.h" + +#include "wine/debug.h" +#include "webservices_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(webservices); + +static const struct +{ + ULONG size; + BOOL readonly; +} +writer_props[] = +{ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_DEPTH */ + { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_ATTRIBUTES */ + { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_WRITE_DECLARATION */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_INDENT */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE */ + { sizeof(WS_CHARSET), FALSE }, /* WS_XML_WRITER_PROPERTY_CHARSET */ + { sizeof(WS_BUFFERS), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFERS */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE */ + { sizeof(WS_BYTES), FALSE }, /* WS_XML_WRITER_PROPERTY_BYTES */ + { sizeof(BOOL), TRUE }, /* WS_XML_WRITER_PROPERTY_IN_ATTRIBUTE */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE */ + { sizeof(WS_BYTES), FALSE }, /* WS_XML_WRITER_PROPERTY_INITIAL_BUFFER */ + { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_ALLOW_INVALID_CHARACTER_REFERENCES */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_NAMESPACES */ + { sizeof(ULONG), TRUE }, /* WS_XML_WRITER_PROPERTY_BYTES_WRITTEN */ + { sizeof(ULONG), TRUE }, /* WS_XML_WRITER_PROPERTY_BYTES_TO_CLOSE */ + { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_COMPRESS_EMPTY_ELEMENTS */ + { sizeof(BOOL), FALSE } /* WS_XML_WRITER_PROPERTY_EMIT_UNCOMPRESSED_EMPTY_ELEMENTS */ +}; + +struct writer +{ + ULONG prop_count; + WS_XML_WRITER_PROPERTY prop[sizeof(writer_props)/sizeof(writer_props[0])]; +}; + +static struct writer *alloc_writer(void) +{ + static const ULONG count = sizeof(writer_props)/sizeof(writer_props[0]); + struct writer *ret; + ULONG i, size = sizeof(*ret) + count * sizeof(WS_XML_WRITER_PROPERTY); + char *ptr; + + for (i = 0; i < count; i++) size += writer_props[i].size; + if (!(ret = heap_alloc_zero( size ))) return NULL; + + ptr = (char *)&ret->prop[count]; + for (i = 0; i < count; i++) + { + ret->prop[i].value = ptr; + ret->prop[i].valueSize = writer_props[i].size; + ptr += ret->prop[i].valueSize; + } + ret->prop_count = count; + return ret; +} + +static HRESULT set_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID id, const void *value, + ULONG size ) +{ + if (id >= writer->prop_count || size != writer_props[id].size || writer_props[id].readonly) + return E_INVALIDARG; + + memcpy( writer->prop[id].value, value, size ); + return S_OK; +} + +/************************************************************************** + * WsCreateWriter [webservices.@] + */ +HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG count, + WS_XML_WRITER **handle, WS_ERROR *error ) +{ + struct writer *writer; + ULONG i, max_depth = 32, max_attrs = 128, trim_size = 4096, max_size = 65536, max_ns = 32; + WS_CHARSET charset = WS_CHARSET_UTF8; + HRESULT hr; + + TRACE( "%p %u %p %p\n", properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle) return E_INVALIDARG; + if (!(writer = alloc_writer())) return E_OUTOFMEMORY; + + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, sizeof(max_depth) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, sizeof(max_attrs) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE, &trim_size, sizeof(trim_size) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_CHARSET, &charset, sizeof(charset) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, &max_size, sizeof(max_size) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE, &max_size, sizeof(max_size) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_MAX_NAMESPACES, &max_ns, sizeof(max_ns) ); + + for (i = 0; i < count; i++) + { + hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) + { + heap_free( writer ); + return hr; + } + } + + *handle = (WS_XML_WRITER *)writer; + return S_OK; +} + +/************************************************************************** + * WsFreeWriter [webservices.@] + */ +void WINAPI WsFreeWriter( WS_XML_WRITER *handle ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p\n", handle ); + heap_free( writer ); +}

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 7894033af570d3568973675216e934f004cbf69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7894033af570d356897367521… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:08 2015 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 3 +- dlls/webservices/tests/writer.c | 244 +++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index d19fdc2..1456b44 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = webservices.dll IMPORTS = webservices C_SRCS = \ - reader.c + reader.c \ + writer.c diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c new file mode 100644 index 0000000..b1c9062 --- /dev/null +++ b/dlls/webservices/tests/writer.c @@ -0,0 +1,244 @@ +/* + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include "windows.h" +#include "webservices.h" +#include "wine/test.h" + +static HRESULT set_output( WS_XML_WRITER *writer ) +{ + WS_XML_WRITER_TEXT_ENCODING encoding; + WS_XML_WRITER_BUFFER_OUTPUT output; + + encoding.encoding.encodingType = WS_XML_WRITER_ENCODING_TYPE_TEXT; + encoding.charSet = WS_CHARSET_UTF8; + + output.output.outputType = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + + return WsSetOutput( writer, (const WS_XML_WRITER_ENCODING *)&encoding, + (const WS_XML_WRITER_OUTPUT *)&output, NULL, 0, NULL ); +} + +static void test_WsCreateWriter(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_WRITER_PROPERTY prop; + ULONG size, max_depth, max_attrs, indent, trim_size, max_size, max_ns; + BOOL allow_fragment, write_decl, in_attr; + WS_CHARSET charset; + WS_BUFFERS buffers; + WS_BYTES bytes; + + hr = WsCreateWriter( NULL, 0, NULL, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + writer = NULL; + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + ok( writer != NULL, "writer not set\n" ); + + /* can't retrieve properties before output is set */ + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( max_depth == 0xdeadbeef, "max_depth set\n" ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* check some defaults */ + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 32, "got %u\n", max_depth ); + + allow_fragment = TRUE; + size = sizeof(allow_fragment); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT, &allow_fragment, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !allow_fragment, "got %d\n", allow_fragment ); + + max_attrs = 0xdeadbeef; + size = sizeof(max_attrs); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_attrs == 128, "got %u\n", max_attrs ); + + write_decl = TRUE; + size = sizeof(write_decl); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_WRITE_DECLARATION, &write_decl, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !write_decl, "got %d\n", write_decl ); + + indent = 0xdeadbeef; + size = sizeof(indent); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_INDENT, &indent, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !indent, "got %u\n", indent ); + + trim_size = 0xdeadbeef; + size = sizeof(trim_size); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE, &trim_size, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( trim_size == 4096, "got %u\n", trim_size ); + + charset = 0xdeadbeef; + size = sizeof(charset); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_CHARSET, &charset, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); + + buffers.bufferCount = 0xdeadbeef; + buffers.buffers = (WS_BYTES *)0xdeadbeef; + size = sizeof(buffers); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFERS, &buffers, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !buffers.bufferCount, "got %u\n", buffers.bufferCount ); + ok( !buffers.buffers, "got %p\n", buffers.buffers ); + + max_size = 0xdeadbeef; + size = sizeof(max_size); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, &max_size, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_size == 65536, "got %u\n", max_size ); + + buffers.bufferCount = 0xdeadbeef; + buffers.buffers = (WS_BYTES *)0xdeadbeef; + size = sizeof(buffers); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &buffers, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !buffers.bufferCount, "got %u\n", buffers.bufferCount ); + todo_wine ok( buffers.buffers != NULL, "got %p\n", buffers.buffers ); + + max_size = 0xdeadbeef; + size = sizeof(max_size); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE, &max_size, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_size == 65536, "got %u\n", max_size ); + + bytes.length = 0xdeadbeef; + bytes.bytes = (BYTE *)0xdeadbeef; + size = sizeof(bytes); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_INITIAL_BUFFER, &bytes, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !bytes.length, "got %u\n", bytes.length ); + ok( !bytes.bytes, "got %p\n", bytes.bytes ); + + max_ns = 0xdeadbeef; + size = sizeof(max_ns); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_NAMESPACES, &max_ns, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_ns == 32, "got %u\n", max_ns ); + WsFreeWriter( writer ); + + /* change a property */ + max_depth = 16; + prop.id = WS_XML_WRITER_PROPERTY_MAX_DEPTH; + prop.value = &max_depth; + prop.valueSize = sizeof(max_depth); + hr = WsCreateWriter( &prop, 1, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 16, "got %u\n", max_depth ); + WsFreeWriter( writer ); + + /* show that some properties are read-only */ + in_attr = TRUE; + prop.id = WS_XML_WRITER_PROPERTY_IN_ATTRIBUTE; + prop.value = &in_attr; + prop.valueSize = sizeof(in_attr); + hr = WsCreateWriter( &prop, 1, &writer, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + size = 1; + prop.id = WS_XML_WRITER_PROPERTY_BYTES_WRITTEN; + prop.value = &size; + prop.valueSize = sizeof(size); + hr = WsCreateWriter( &prop, 1, &writer, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + size = 1; + prop.id = WS_XML_WRITER_PROPERTY_BYTES_TO_CLOSE; + prop.value = &size; + prop.valueSize = sizeof(size); + hr = WsCreateWriter( &prop, 1, &writer, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); +} + +static void test_WsSetOutput(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_WRITER_PROPERTY prop; + WS_XML_WRITER_TEXT_ENCODING encoding; + WS_XML_WRITER_BUFFER_OUTPUT output; + ULONG size, max_depth; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutput( NULL, NULL, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + encoding.encoding.encodingType = WS_XML_WRITER_ENCODING_TYPE_TEXT; + encoding.charSet = WS_CHARSET_UTF8; + + output.output.outputType = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + + hr = WsSetOutput( writer, (const WS_XML_WRITER_ENCODING *)&encoding, + (const WS_XML_WRITER_OUTPUT *)&output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* multiple calls are allowed */ + hr = WsSetOutput( writer, (const WS_XML_WRITER_ENCODING *)&encoding, + (const WS_XML_WRITER_OUTPUT *)&output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* writer properties can be set with WsSetOutput */ + max_depth = 16; + prop.id = WS_XML_WRITER_PROPERTY_MAX_DEPTH; + prop.value = &max_depth; + prop.valueSize = sizeof(max_depth); + hr = WsSetOutput( writer, (const WS_XML_WRITER_ENCODING *)&encoding, + (const WS_XML_WRITER_OUTPUT *)&output, &prop, 1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 16, "got %u\n", max_depth ); + WsFreeWriter( writer ); +} + +START_TEST(writer) +{ + test_WsCreateWriter(); + test_WsSetOutput(); +}

1 0

Jacek Caban : windns.h: Added DnsCancelQuery declaration.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 61ee6d25ddb492e9892cfbdfa0b7c05886149de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ee6d25ddb492e9892cfbdfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 15:50:41 2015 +0200 windns.h: Added DnsCancelQuery declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windns.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/windns.h b/include/windns.h index fc2a49c..7b11e3a 100644 --- a/include/windns.h +++ b/include/windns.h @@ -618,6 +618,67 @@ typedef struct _DnsRRSet _prrset->pLastRR->pNext = NULL; \ } +#define DNS_ADDR_MAX_SOCKADDR_LENGTH 32 + +#include <pshpack1.h> + +typedef struct _DnsAddr +{ + char MaxSa[DNS_ADDR_MAX_SOCKADDR_LENGTH]; + union { + DWORD DnsAddrUserDword[8]; + } Data; +} DNS_ADDR, *PDNS_ADDR; + +typedef struct _DnsAddrArray +{ + DWORD MaxCount; + DWORD AddrCount; + DWORD Tag; + WORD Family; + WORD WordReserved; + DWORD Flags; + DWORD MatchFlag; + DWORD Reserved1; + DWORD Reserved2; + DNS_ADDR AddrArray[1]; +} DNS_ADDR_ARRAY, *PDNS_ADDR_ARRAY; + +#include <poppack.h> + +#define DNS_QUERY_RESULTS_VERSION1 0x1 + +typedef struct _DNS_QUERY_RESULT +{ + ULONG Version; + DNS_STATUS QueryStatus; + ULONG64 QueryOptions; + DNS_RECORD *pQueryRecords; + void *Reserved; +} DNS_QUERY_RESULT, *PDNS_QUERY_RESULT; + +typedef void WINAPI DNS_QUERY_COMPLETION_ROUTINE(void*,DNS_QUERY_RESULT*); +typedef DNS_QUERY_COMPLETION_ROUTINE *PDNS_QUERY_COMPLETION_ROUTINE; + +#define DNS_QUERY_REQUEST_VERSION1 0x1 + +typedef struct _DNS_QUERY_REQUEST +{ + ULONG Version; + const WCHAR *QueryName; + WORD QueryType; + ULONG64 QueryOptions; + PDNS_ADDR_ARRAY pDnsServerList; + ULONG InterfaceIndex; + PDNS_QUERY_COMPLETION_ROUTINE pQueryCompletionCallback; + void *pQueryContext; +} DNS_QUERY_REQUEST, *PDNS_QUERY_REQUEST; + +typedef struct _DNS_QUERY_CANCEL +{ + char Reserved[32]; +} DNS_QUERY_CANCEL, *PDNS_QUERY_CANCEL; + DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,PHANDLE); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE); #define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_) @@ -635,6 +696,8 @@ DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PVOID,PDNS_RECORDW*,PVOID*); DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); #define DnsQuery WINELIB_NAME_AW(DnsQuery_) +DNS_STATUS WINAPI DnsQueryEx(DNS_QUERY_REQUEST*,DNS_QUERY_RESULT*,DNS_QUERY_CANCEL*); +DNS_STATUS WINAPI DnsCancelQuery(DNS_QUERY_CANCEL*); DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PCWSTR,PVOID,PVOID,PDWORD); BOOL WINAPI DnsRecordCompare(PDNS_RECORD,PDNS_RECORD); PDNS_RECORD WINAPI DnsRecordCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET);

1 0

Jacek Caban : ws2def.h: Added ADDRINFOEX declaration.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 59d123288c087f238339faa6a18662d72c6833ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d123288c087f238339faa6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 15:50:49 2015 +0200 ws2def.h: Added ADDRINFOEX declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2def.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/ws2def.h b/include/ws2def.h index 6255c68..5ea8ff3 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -110,4 +110,32 @@ typedef struct _WSAMSG { (((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)+WSA_CMSG_ALIGN(((WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))->cmsg_len) > ((unsigned char*)(mhdr)->Control.buf + (mhdr)->Control.len)) ? NULL : \ (WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))))) +typedef struct addrinfoexA { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + char *ai_canonname; + struct sockaddr *ai_addr; + void *ai_blob; + size_t ai_bloblen; + GUID *ai_provider; + struct addrinfoexA *ai_next; +} ADDRINFOEXA, *PADDRINFOEXA, *LPADDRINFOEXA; + +typedef struct addrinfoexW { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + WCHAR *ai_canonname; + struct sockaddr *ai_addr; + void *ai_blob; + size_t ai_bloblen; + GUID *ai_provider; + struct addrinfoexW *ai_next; +} ADDRINFOEXW, *PADDRINFOEXW, *LPADDRINFOEXW; + #endif /* _WS2DEF_ */

1 0

Huw Davies : ole32: Silence an incorrect fixme.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: afbb4afc6cb373038ec103d423db74839978d892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbb4afc6cb373038ec103d42… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:17 2015 +0100 ole32: Silence an incorrect fixme. The remote unknown object should not implement IExternalConnection. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stubmanager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index a7d00c5..57048c6 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -667,7 +667,8 @@ static HRESULT WINAPI RemUnknown_QueryInterface(IRemUnknown *iface, REFIID riid, return S_OK; } - FIXME("No interface for iid %s\n", debugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IExternalConnection)) + FIXME("No interface for iid %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE;

1 0

André Hentschel : dbghelp: Add more symbol types.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 59ba888e6742e1677350b187d639218336a12a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ba888e6742e1677350b187d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 13 21:12:20 2015 +0200 dbghelp: Add more symbol types. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 23b7a3a..4812a3f 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1700,6 +1700,11 @@ union codeview_symbol #define S_MSTOOLINFO_V3 0x113C #define S_MSTOOLENV_V3 0x113D +#define S_LOCAL_VS2013 0x113E +#define S_FPOFF_VS2013 0x1144 +#define S_LPROC32_VS2013 0x1146 +#define S_GPROC32_VS2013 0x1147 + /* ======================================== * * Line number information * ======================================== */

1 0