wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Austin English : newdev: Add a stub for InstallSelectedDriver.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 8be6740b8dca447b5f75006750b21201d62c527e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be6740b8dca447b5f7500675… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 13 05:09:28 2015 -0500 newdev: Add a stub for InstallSelectedDriver. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/main.c | 14 ++++++++++++++ dlls/newdev/newdev.spec | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index f5d8ad3..6be8cd0 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -18,8 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #include "windef.h" #include "winerror.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "setupapi.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -35,6 +41,14 @@ BOOL WINAPI InstallNewDevice(HWND hwndParent, LPGUID ClassGuid, PDWORD pReboot) return TRUE; } +/*********************************************************************** + * InstallSelectedDriver (NEWDEV.@) + */ +BOOL WINAPI InstallSelectedDriver(HWND parent, HDEVINFO info, const WCHAR *reserved, BOOL backup, DWORD *reboot) +{ + FIXME("Stub! %p %p %s %u %p\n", parent, info, debugstr_w(reserved), backup, reboot); + return TRUE; +} /*********************************************************************** * UpdateDriverForPlugAndPlayDevicesA (NEWDEV.@) diff --git a/dlls/newdev/newdev.spec b/dlls/newdev/newdev.spec index d4d6551..ff15edd 100644 --- a/dlls/newdev/newdev.spec +++ b/dlls/newdev/newdev.spec @@ -1,3 +1,4 @@ @ stdcall InstallNewDevice(long ptr ptr) +@ stdcall InstallSelectedDriver(long ptr wstr long ptr) @ stdcall UpdateDriverForPlugAndPlayDevicesA(long str str long ptr) @ stdcall UpdateDriverForPlugAndPlayDevicesW(long wstr wstr long ptr)

1 0

Michael Stefaniuc : winspool.drv/tests: Remove always true sub-condition ( PVS-Studio).
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: c62a95d2dfaae05cd457582433b0b1da2c2dcd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62a95d2dfaae05cd45758243… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 09:34:10 2015 +0200 winspool.drv/tests: Remove always true sub-condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 71bf54b..ffa31ed 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -721,8 +721,7 @@ static void test_DeleteMonitor(void) AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); res = DeleteMonitorA(NULL, invalid_env, winetest); - ok( res || - (!res && GetLastError() == ERROR_INVALID_ENVIRONMENT) /* Vista/W2K8 */, + ok( res || GetLastError() == ERROR_INVALID_ENVIRONMENT /* Vista/W2K8 */, "returned %d with %d\n", res, GetLastError()); /* the monitor-name */ @@ -1012,7 +1011,7 @@ static void test_EnumMonitors(void) pcbNeeded = MAGIC_DEAD; pcReturned = MAGIC_DEAD; res = EnumMonitorsA(NULL, level, buffer, cbBuf, NULL, &pcReturned); - ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, "(%d) returned %d with %d (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1020,7 +1019,7 @@ static void test_EnumMonitors(void) pcReturned = MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = EnumMonitorsA(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); - ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, "(%d) returned %d with %d (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1230,7 +1229,7 @@ static void test_EnumPrinterDrivers(void) pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, NULL, &pcReturned); - ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, "(%u) got %u with %u (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1238,7 +1237,7 @@ static void test_EnumPrinterDrivers(void) pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, &pcbNeeded, NULL); - ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, "(%u) got %u with %u (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1790,7 +1789,7 @@ static void test_OpenPrinter(void) SetLastError(MAGIC_DEAD); res = OpenPrinterA(NULL, &hprinter, NULL); if (is_spooler_deactivated(res, GetLastError())) return; - ok(res || (!res && GetLastError() == ERROR_INVALID_PARAMETER), + ok(res || GetLastError() == ERROR_INVALID_PARAMETER, "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if(res) { @@ -1824,7 +1823,7 @@ static void test_OpenPrinter(void) hprinter = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); res = OpenPrinterA(local_server, &hprinter, NULL); - ok(res || (!res && GetLastError() == ERROR_INVALID_PARAMETER), + ok(res || GetLastError() == ERROR_INVALID_PARAMETER, "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -1965,21 +1964,21 @@ static void test_SetDefaultPrinter(void) WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(""); - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(NULL); - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(default_printer); - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); @@ -2000,7 +1999,7 @@ static void test_SetDefaultPrinter(void) goto restore_old_printer; /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); @@ -2008,14 +2007,14 @@ static void test_SetDefaultPrinter(void) SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(NULL); /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", NULL); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(default_printer); - ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, "returned %d with %d (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError());

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 14 Oct '15

14 Oct '15

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

Hans Leidekker : webservices: Implement WsSetOutput.
by Alexandre Julliard 14 Oct '15

14 Oct '15

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 WsGetWriterProperty.
by Alexandre Julliard 14 Oct '15

14 Oct '15

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 WsCreateWriter and WsFreeWriter.
by Alexandre Julliard 14 Oct '15

14 Oct '15

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 : include: Add missing Web Services declarations.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 11c0f05ac98912316e8ab6895b14b09d6a1eb90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c0f05ac98912316e8ab6895… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:04 2015 +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 | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/include/webservices.h b/include/webservices.h index d9d1052..7d9a0e2 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -27,6 +27,7 @@ typedef struct _WS_ERROR WS_ERROR; typedef struct _WS_HEAP WS_HEAP; typedef struct _WS_XML_BUFFER WS_XML_BUFFER; typedef struct _WS_XML_READER WS_XML_READER; +typedef struct _WS_XML_WRITER WS_XML_WRITER; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -81,6 +82,44 @@ typedef struct _WS_XML_READER_PROPERTY { } WS_XML_READER_PROPERTY; typedef enum { + WS_XML_WRITER_PROPERTY_MAX_DEPTH, + WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT, + WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES, + WS_XML_WRITER_PROPERTY_WRITE_DECLARATION, + WS_XML_WRITER_PROPERTY_INDENT, + WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE, + WS_XML_WRITER_PROPERTY_CHARSET, + WS_XML_WRITER_PROPERTY_BUFFERS, + WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, + WS_XML_WRITER_PROPERTY_BYTES, + WS_XML_WRITER_PROPERTY_IN_ATTRIBUTE, + WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE, + WS_XML_WRITER_PROPERTY_INITIAL_BUFFER, + WS_XML_WRITER_PROPERTY_ALLOW_INVALID_CHARACTER_REFERENCES, + WS_XML_WRITER_PROPERTY_MAX_NAMESPACES, + WS_XML_WRITER_PROPERTY_BYTES_WRITTEN, + WS_XML_WRITER_PROPERTY_BYTES_TO_CLOSE, + WS_XML_WRITER_PROPERTY_COMPRESS_EMPTY_ELEMENTS, + WS_XML_WRITER_PROPERTY_EMIT_UNCOMPRESSED_EMPTY_ELEMENTS +} WS_XML_WRITER_PROPERTY_ID; + +typedef struct _WS_XML_WRITER_PROPERTY { + WS_XML_WRITER_PROPERTY_ID id; + void *value; + ULONG valueSize; +} WS_XML_WRITER_PROPERTY; + +typedef struct _WS_BYTES { + ULONG length; + BYTE *bytes; +} WS_BYTES; + +typedef struct _WS_BUFFERS { + ULONG bufferCount; + WS_BYTES *buffers; +} WS_BUFFERS; + +typedef enum { WS_XML_READER_ENCODING_TYPE_TEXT = 1, WS_XML_READER_ENCODING_TYPE_BINARY = 2, WS_XML_READER_ENCODING_TYPE_MTOM = 3, @@ -92,6 +131,17 @@ typedef struct _WS_XML_READER_ENCODING { } WS_XML_READER_ENCODING; typedef enum { + WS_XML_WRITER_ENCODING_TYPE_TEXT = 1, + WS_XML_WRITER_ENCODING_TYPE_BINARY = 2, + WS_XML_WRITER_ENCODING_TYPE_MTOM = 3, + WS_XML_WRITER_ENCODING_TYPE_RAW = 4 +} WS_XML_WRITER_ENCODING_TYPE; + +typedef struct _WS_XML_WRITER_ENCODING { + WS_XML_WRITER_ENCODING_TYPE encodingType; +} WS_XML_WRITER_ENCODING; + +typedef enum { WS_CHARSET_AUTO, WS_CHARSET_UTF8, WS_CHARSET_UTF16LE, @@ -103,21 +153,39 @@ typedef struct _WS_XML_READER_TEXT_ENCODING { WS_CHARSET charSet; } WS_XML_READER_TEXT_ENCODING; +typedef struct _WS_XML_WRITER_TEXT_ENCODING { + WS_XML_WRITER_ENCODING encoding; + WS_CHARSET charSet; +} WS_XML_WRITER_TEXT_ENCODING; + typedef enum { WS_XML_READER_INPUT_TYPE_BUFFER = 1, WS_XML_READER_INPUT_TYPE_STREAM = 2 } WS_XML_READER_INPUT_TYPE; +typedef enum { + WS_XML_WRITER_OUTPUT_TYPE_BUFFER = 1, + WS_XML_WRITER_OUTPUT_TYPE_STREAM = 2 +} WS_XML_WRITER_OUTPUT_TYPE; + typedef struct _WS_XML_READER_INPUT { WS_XML_READER_INPUT_TYPE inputType; } WS_XML_READER_INPUT; +typedef struct _WS_XML_WRITER_OUTPUT { + WS_XML_WRITER_OUTPUT_TYPE outputType; +} WS_XML_WRITER_OUTPUT; + typedef struct _WS_XML_READER_BUFFER_INPUT { WS_XML_READER_INPUT input; void *encodedData; ULONG encodedDataSize; } WS_XML_READER_BUFFER_INPUT; +typedef struct _WS_XML_WRITER_BUFFER_OUTPUT { + WS_XML_WRITER_OUTPUT output; +} WS_XML_WRITER_BUFFER_OUTPUT; + typedef enum { WS_SHORT_CALLBACK, WS_LONG_CALLBACK @@ -208,6 +276,13 @@ typedef enum { } WS_READ_OPTION; typedef enum { + WS_WRITE_REQUIRED_VALUE = 1, + WS_WRITE_REQUIRED_POINTER = 2, + WS_WRITE_NILLABLE_VALUE = 3, + WS_WRITE_NILLABLE_POINTER = 4 +} WS_WRITE_OPTION; + +typedef enum { WS_TYPE_ATTRIBUTE_FIELD_MAPPING, WS_ATTRIBUTE_FIELD_MAPPING, WS_ELEMENT_FIELD_MAPPING, @@ -233,6 +308,15 @@ typedef struct _WS_ITEM_RANGE { ULONG maxItemCount; } WS_ITEM_RANGE; +enum +{ + WS_FIELD_POINTER = 0x1, + WS_FIELD_OPTIONAL = 0x2, + WS_FIELD_NILLABLE = 0x4, + WS_FIELD_NILLABLE_ITEM = 0x8, + WS_FIELD_OTHER_NAMESPACE = 0x10 +}; + typedef struct _WS_FIELD_DESCRIPTION { WS_FIELD_MAPPING mapping; WS_XML_STRING *localName; @@ -248,6 +332,13 @@ typedef struct _WS_FIELD_DESCRIPTION { WS_ITEM_RANGE *itemRange; } WS_FIELD_DESCRIPTION; +enum +{ + WS_STRUCT_ABSTRACT = 0x1, + WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT = 0x2, + WS_STRUCT_IGNORE_UNHANDLED_ATTRIBUTES = 0x4 +}; + typedef struct _WS_STRUCT_DESCRIPTION { ULONG size; ULONG alignment; @@ -353,18 +444,21 @@ typedef struct _WS_XML_NODE_POSITION { HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); HRESULT WINAPI WsCreateHeap(SIZE_T, SIZE_T, const WS_HEAP_PROPERTY*, ULONG, WS_HEAP**, WS_ERROR*); HRESULT WINAPI WsCreateReader(const WS_XML_READER_PROPERTY*, ULONG, WS_XML_READER**, WS_ERROR*); +HRESULT WINAPI WsCreateWriter(const WS_XML_WRITER_PROPERTY*, ULONG, WS_XML_WRITER**, WS_ERROR*); HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*); void WINAPI WsFreeError(WS_ERROR*); void WINAPI WsFreeHeap(WS_HEAP*); void WINAPI WsFreeReader(WS_XML_READER*); +void WINAPI WsFreeWriter(WS_XML_WRITER*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetReaderNode(WS_XML_READER*, const WS_XML_NODE**, WS_ERROR*); HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, void*, ULONG, 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*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, @@ -380,7 +474,10 @@ HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, 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*, const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); - +HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const WS_XML_WRITER_OUTPUT*, + const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, + const void*, ULONG, WS_ERROR*); #define WS_S_ASYNC 0x003d0000 #define WS_S_END 0x003d0001

1 0

Hans Leidekker : webservices: Accept single quote as attribute value delimiter.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 63e0b485168e483c75694a212d46842038139001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e0b485168e483c75694a212… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:03 2015 +0200 webservices: Accept single quote as attribute value delimiter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 +++++--- dlls/webservices/tests/reader.c | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a8990d8..f85b5e7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -746,7 +746,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { WS_XML_ATTRIBUTE *attr; WS_XML_UTF8_TEXT *text; - unsigned int len = 0, ch, skip; + unsigned int len = 0, ch, skip, quote; const char *start; HRESULT hr = WS_E_INVALID_FORMAT; @@ -775,7 +775,8 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) read_skip( reader, 1 ); read_skip_whitespace( reader ); - if (read_cmp( reader, "\"", 1 )) goto error; + if (read_cmp( reader, "\"", 1 ) && read_cmp( reader, "'", 1 )) goto error; + quote = read_utf8_char( reader, &skip ); read_skip( reader, 1 ); len = 0; @@ -783,7 +784,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) for (;;) { if (!(ch = read_utf8_char( reader, &skip ))) goto error; - if (ch == '"') break; + if (ch == quote) break; read_skip( reader, skip ); len += skip; } @@ -795,6 +796,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) return E_OUTOFMEMORY; } attr->value = (WS_XML_TEXT *)text; + attr->singleQuote = (quote == '\''); *ret = attr; return S_OK; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 0d32864..f4ac601 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -50,7 +50,7 @@ static const char data5[] = static const char data6[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" - "<text attr= \"value\" >test</text>"; + "<text attr= \"value\" attr2='value2'>test</text>"; static const char data8[] = "<node1><node2>test</node2></node1>"; @@ -872,7 +872,7 @@ static void test_WsReadNode(void) ok( elem->ns != NULL, "ns not set\n" ); ok( !elem->ns->length, "got %u\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); ok( elem->attributes != NULL, "attributes not set\n" ); ok( !elem->isEmpty, "isEmpty not zero\n" ); @@ -894,6 +894,25 @@ static void test_WsReadNode(void) ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); ok( text->value.length == 5, "got %u\n", text->value.length ); ok( !memcmp( text->value.bytes, "value", 5 ), "wrong data\n" ); + + attr = elem->attributes[1]; + ok( attr->singleQuote == 1, "got %u\n", attr->singleQuote ); + ok( !attr->isXmlNs, "got %u\n", attr->isXmlNs ); + ok( attr->prefix != NULL, "prefix not set\n" ); + ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( attr->prefix->bytes == NULL, "bytes set\n" ); + ok( attr->localName != NULL, "localName not set\n" ); + ok( attr->localName->length == 5, "got %u\n", attr->localName->length ); + ok( !memcmp( attr->localName->bytes, "attr2", 5 ), "wrong data\n" ); + ok( attr->ns != NULL, "ns not set\n" ); + ok( !attr->ns->length, "got %u\n", attr->ns->length ); + ok( attr->ns->bytes == NULL, "bytes set\n" ); + ok( attr->value != NULL, "value not set\n" ); + + text = (WS_XML_UTF8_TEXT *)attr->value; + ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); + ok( text->value.length == 6, "got %u\n", text->value.length ); + ok( !memcmp( text->value.bytes, "value2", 6 ), "wrong data\n" ); } WsFreeReader( reader );

1 0

Hans Leidekker : webservices: Add a stub implementation of WsGetErrorString.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 935e9eb8bb4c0a2c26c501d263e4727386919367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935e9eb8bb4c0a2c26c501d26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:02 2015 +0200 webservices: Add a stub implementation of WsGetErrorString. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index bfa16ec..a8990d8 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -513,6 +513,15 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo } /************************************************************************** + * WsGetErrorString [webservices.@] + */ +HRESULT WINAPI WsGetErrorString( WS_ERROR *handle, ULONG index, WS_STRING *str ) +{ + FIXME( "%p %u %p: stub\n", handle, index, str ); + return E_NOTIMPL; +} + +/************************************************************************** * WsGetHeapProperty [webservices.@] */ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void *buf, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 508645b..85014bf 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -63,7 +63,7 @@ @ stub WsGetCustomHeader @ stub WsGetDictionary @ stdcall WsGetErrorProperty(ptr long ptr long) -@ stub WsGetErrorString +@ stdcall WsGetErrorString(ptr long ptr) @ stub WsGetFaultErrorDetail @ stub WsGetFaultErrorProperty @ stub WsGetHeader diff --git a/include/webservices.h b/include/webservices.h index 0a8b206..d9d1052 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -360,7 +360,7 @@ void WINAPI WsFreeError(WS_ERROR*); void WINAPI WsFreeHeap(WS_HEAP*); void WINAPI WsFreeReader(WS_XML_READER*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); -HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING**); +HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetReaderNode(WS_XML_READER*, const WS_XML_NODE**, WS_ERROR*); HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERROR*);

1 0

Alexandre Julliard : wineps: Avoid sizeof in a trace.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 36a88cdb1132d95af0f641746485fe0c4430cca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a88cdb1132d95af0f641746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 14 20:37:40 2015 +0900 wineps: Avoid sizeof in a trace. --- dlls/wineps.drv/download.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 30eb0db..dc77cf1 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -656,7 +656,7 @@ static void get_post2_custom_glyph_name(BYTE *post2header, DWORD size, WORD inde if(name_offset + sizeof(BYTE) > size) { FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%d)\n", - name_offset + sizeof(BYTE), size); + name_offset + 1, size); return; } name_length = (post2header + name_offset)[0];

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
75
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 October 2015