October 2015 - Wine-commits

Jacek Caban : windns.h: Added missing DNS_QUERY_* constants.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 8d357fc11c41fe1505196ac50c94db4ccefd6e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d357fc11c41fe1505196ac50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 22 11:29:20 2015 +0200 windns.h: Added missing DNS_QUERY_* constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windns.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/windns.h b/include/windns.h index 7b11e3a..f150919 100644 --- a/include/windns.h +++ b/include/windns.h @@ -96,8 +96,16 @@ extern "C" { #define DNS_QUERY_NO_NETBT 0x00000080 #define DNS_QUERY_WIRE_ONLY 0x00000100 #define DNS_QUERY_RETURN_MESSAGE 0x00000200 +#define DNS_QUERY_MULTICAST_ONLY 0x00000400 +#define DNS_QUERY_NO_MULTICAST 0x00000800 #define DNS_QUERY_TREAT_AS_FQDN 0x00001000 +#define DNS_QUERY_ADDRCONFIG 0x00002000 +#define DNS_QUERY_DUAL_ADDR 0x00004000 #define DNS_QUERY_DONT_RESET_TTL_VALUES 0x00100000 +#define DNS_QUERY_DISABLE_IDN_ENCODING 0x00200000 +#define DNS_QUERY_APPEND_MULTILABEL 0x00800000 +#define DNS_QUERY_DNSSEC_OK 0x01000000 +#define DNS_QUERY_DNSSEC_CHECKING_DISABLED 0x02000000 #define DNS_QUERY_RESERVED 0xff000000 typedef enum _DNS_NAME_FORMAT

1 0

Hans Leidekker : webservices: Parse comment nodes.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 2eab71185980221075949cd4225f72fb35a32ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eab71185980221075949cd42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:06 2015 +0200 webservices: Parse comment nodes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 46 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 29 ++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ac61890..d888223 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -287,6 +287,11 @@ static void free_node( struct node *node ) heap_free( text->text ); break; } + case WS_XML_NODE_TYPE_COMMENT: + { + WS_XML_COMMENT_NODE *comment = (WS_XML_COMMENT_NODE *)node; + heap_free( comment->value.bytes ); + } case WS_XML_NODE_TYPE_END_ELEMENT: case WS_XML_NODE_TYPE_EOF: case WS_XML_NODE_TYPE_BOF: @@ -342,6 +347,7 @@ enum reader_state READER_STATE_STARTELEMENT, READER_STATE_TEXT, READER_STATE_ENDELEMENT, + READER_STATE_COMMENT, READER_STATE_EOF }; @@ -954,6 +960,45 @@ static HRESULT read_endelement( struct reader *reader ) return S_OK; } +static HRESULT read_comment( struct reader *reader ) +{ + unsigned int len = 0, ch, skip; + const char *start; + struct node *node; + WS_XML_COMMENT_NODE *comment; + + if (read_cmp( reader, "", 3 )) + { + read_skip( reader, 3 ); + break; + } + if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + read_skip( reader, skip ); + len += skip; + } + + if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; + comment = (WS_XML_COMMENT_NODE *)node; + if (!(comment->value.bytes = heap_alloc( len ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + memcpy( comment->value.bytes, start, len ); + comment->value.length = len; + + list_add_after( &reader->current->entry, &node->entry ); + reader->current = node; + reader->state = READER_STATE_COMMENT; + return S_OK; +} + static HRESULT read_node( struct reader *reader ) { HRESULT hr; @@ -972,6 +1017,7 @@ static HRESULT read_node( struct reader *reader ) if (FAILED( hr )) return hr; } else if (!read_cmp( reader, "</", 2 )) return read_endelement( reader ); + else if (!read_cmp( reader, "<!", 2 )) return read_comment( reader ); else if (!read_cmp( reader, "<", 1 )) return read_startelement( reader ); else return read_text( reader ); } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index f4ac601..31587e1 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -52,6 +52,9 @@ static const char data6[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" "<text attr= \"value\" attr2='value2'>test</text>"; +static const char data7[] = + ""; + static const char data8[] = "<node1><node2>test</node2></node1>"; @@ -780,6 +783,9 @@ static void test_WsReadNode(void) static const char str12[] = "<text>test</text>"; static const char str13[] = "<?xml version=\"1.0\"?><text>test</text>"; static const char str14[] = ""; + static const char str15[] = ""; + static const char str17[] = ""; HRESULT hr; WS_XML_READER *reader; const WS_XML_NODE *node; @@ -808,6 +814,9 @@ static void test_WsReadNode(void) { str12, S_OK, WS_XML_NODE_TYPE_ELEMENT }, { str13, S_OK, WS_XML_NODE_TYPE_ELEMENT }, { str14, WS_E_INVALID_FORMAT, 0, 1 }, + { str15, WS_E_INVALID_FORMAT, 0 }, + { str16, S_OK, WS_XML_NODE_TYPE_COMMENT }, + { str17, S_OK, WS_XML_NODE_TYPE_COMMENT }, }; hr = WsCreateReader( NULL, 0, &reader, NULL ) ; @@ -915,6 +924,26 @@ static void test_WsReadNode(void) ok( !memcmp( text->value.bytes, "value2", 6 ), "wrong data\n" ); } + hr = set_input( reader, data7, sizeof(data7) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data7) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) + { + WS_XML_COMMENT_NODE *comment = (WS_XML_COMMENT_NODE *)node; + + ok( comment->node.nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", comment->node.nodeType ); + ok( comment->value.length == 9, "got %u\n", comment->value.length ); + ok( !memcmp( comment->value.bytes, " comment ", 9 ), "wrong data\n" ); + } + WsFreeReader( reader ); }

1 0

Hans Leidekker : webservices: Add support for character set detection.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: ce71c50f30749465f0de4959ce0a197b20ada8f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce71c50f30749465f0de4959c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:07 2015 +0200 webservices: Add support for character set detection. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 77 +++++++++++++++++++++++++++++---- dlls/webservices/tests/reader.c | 95 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 154 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce71c50f30749465f0de4…

1 0

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

22 Oct '15

Module: wine Branch: master Commit: 9eee37f53feeaa9454a86afa09f5efafc05e4a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eee37f53feeaa9454a86afa0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:08 2015 +0200 webservices: Add a stub implementation of WsGetXmlAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 +++++++ dlls/webservices/tests/reader.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ca59f33..7ae4e34 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -565,6 +565,16 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT return get_reader_prop( reader, id, buf, size ); } +/************************************************************************** + * WsGetXmlAttribute [webservices.@] + */ +HRESULT WINAPI WsGetXmlAttribute( WS_XML_READER *handle, const WS_XML_STRING *attr, + WS_HEAP *heap, WCHAR **str, ULONG *len, WS_ERROR *error ) +{ + FIXME( "%p %p %p %p %p %p: stub\n", handle, debugstr_xmlstr(attr), heap, str, len, error ); + return E_NOTIMPL; +} + static WS_XML_STRING *alloc_xml_string( const char *data, ULONG len ) { WS_XML_STRING *ret; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index f0c7077..03dd569 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -58,6 +58,9 @@ static const char data7[] = static const char data8[] = "<node1><node2>test</node2></node1>"; +static const char data9[] = + "<text xml:attr=\"value\">test</text>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -1286,6 +1289,62 @@ static void test_WsReadType(void) WsFreeHeap( heap ); } +static void test_WsGetXmlAttribute(void) +{ + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + HRESULT hr; + WS_XML_READER *reader; + WS_XML_STRING xmlstr; + WS_HEAP *heap; + WCHAR *str; + ULONG count; + int found; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, data9, sizeof(data9) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(data9) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + xmlstr.bytes = (BYTE *)"attr"; + xmlstr.length = sizeof("attr") - 1; + xmlstr.dictionary = NULL; + xmlstr.id = 0; + str = NULL; + count = 0; + hr = WsGetXmlAttribute( reader, &xmlstr, heap, &str, &count, NULL ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( str != NULL, "str not set\n" ); + todo_wine ok( count == 5, "got %u\n", count ); + /* string is not null-terminated */ + if (str) ok( !memcmp( str, valueW, count * sizeof(WCHAR) ), "wrong data\n" ); + + xmlstr.bytes = (BYTE *)"none"; + xmlstr.length = sizeof("none") - 1; + xmlstr.dictionary = NULL; + xmlstr.id = 0; + str = (WCHAR *)0xdeadbeef; + count = 0xdeadbeef; + hr = WsGetXmlAttribute( reader, &xmlstr, heap, &str, &count, NULL ); + todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + todo_wine ok( str == NULL, "str not set\n" ); + todo_wine ok( !count, "got %u\n", count ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1298,4 +1357,5 @@ START_TEST(reader) test_WsReadEndElement(); test_WsReadNode(); test_WsReadType(); + test_WsGetXmlAttribute(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 15c2c89..b666a08 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -89,7 +89,7 @@ @ stub WsGetServiceProxyProperty @ stub WsGetWriterPosition @ stdcall WsGetWriterProperty(ptr long ptr long ptr) -@ stub WsGetXmlAttribute +@ stdcall WsGetXmlAttribute(ptr ptr ptr ptr ptr ptr) @ stub WsInitializeMessage @ stub WsMarkHeaderAsUnderstood @ stub WsMatchPolicyAlternative

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: e7d44ee61e809cc70609b143c4a220fa36ba9eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d44ee61e809cc70609b143c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:09 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 7d9a0e2..8bef315 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -57,6 +57,14 @@ typedef struct _WS_HEAP_PROPERTY { ULONG valueSize; } WS_HEAP_PROPERTY; +typedef ULONG WS_XML_BUFFER_PROPERTY_ID; + +typedef struct _WS_XML_BUFFER_PROPERTY { + WS_XML_BUFFER_PROPERTY_ID id; + void *value; + ULONG valueSize; +} WS_XML_BUFFER_PROPERTY; + typedef enum { WS_XML_READER_PROPERTY_MAX_DEPTH, WS_XML_READER_PROPERTY_ALLOW_FRAGMENT, @@ -445,6 +453,8 @@ 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 WsCreateXmlBuffer(WS_HEAP*, const WS_XML_BUFFER_PROPERTY*, ULONG, WS_XML_BUFFER**, + 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*); @@ -474,8 +484,18 @@ 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 WsSetInputToBuffer(WS_XML_READER*, WS_XML_BUFFER*, 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 WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_PROPERTY*, + ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, + const WS_XML_STRING*, BOOL, WS_ERROR*); +HRESULT WINAPI WsWriteStartElement(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, + const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsCreateXmlBuffer.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 096348607b6da1be353116bc6afa666979192818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096348607b6da1be353116bc6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:10 2015 +0200 webservices: Implement WsCreateXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 20 +++++++++++++------- dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 11 +++++++++++ dlls/webservices/writer.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7ae4e34..870e7de 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -158,6 +158,18 @@ struct heap WS_HEAP_PROPERTY prop[sizeof(heap_props)/sizeof(heap_props[0])]; }; +void *ws_alloc( WS_HEAP *handle, SIZE_T size ) +{ + struct heap *heap = (struct heap *)handle; + return HeapAlloc( heap->handle, 0, size ); +} + +void ws_free( WS_HEAP *handle, void *ptr ) +{ + struct heap *heap = (struct heap *)handle; + HeapFree( heap->handle, 0, ptr ); +} + static struct heap *alloc_heap(void) { static const ULONG count = sizeof(heap_props)/sizeof(heap_props[0]); @@ -1103,12 +1115,6 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING return read_to_startelement( reader, found ); } -static void *read_alloc( WS_HEAP *handle, SIZE_T size ) -{ - struct heap *heap = (struct heap *)handle; - return HeapAlloc( heap->handle, 0, size ); -} - static WCHAR *xmltext_to_widechar( WS_HEAP *heap, const WS_XML_TEXT *text ) { WCHAR *ret; @@ -1119,7 +1125,7 @@ static WCHAR *xmltext_to_widechar( WS_HEAP *heap, const WS_XML_TEXT *text ) { const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; int len = MultiByteToWideChar( CP_UTF8, 0, (char *)utf8->value.bytes, utf8->value.length, NULL, 0 ); - if (!(ret = read_alloc( heap, (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!(ret = ws_alloc( heap, (len + 1) * sizeof(WCHAR) ))) return NULL; MultiByteToWideChar( CP_UTF8, 0, (char *)utf8->value.bytes, utf8->value.length, ret, len ); ret[len] = 0; break; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index b666a08..c070d2f 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -35,7 +35,7 @@ @ stub WsCreateServiceProxy @ stub WsCreateServiceProxyFromTemplate @ stdcall WsCreateWriter(ptr long ptr ptr) -@ stub WsCreateXmlBuffer +@ stdcall WsCreateXmlBuffer(ptr ptr long ptr ptr) @ stub WsCreateXmlSecurityToken @ stub WsDateTimeToFileTime @ stub WsDecodeUrl diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 20d3f0b..369ccbb 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -16,6 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +struct xmlbuf +{ + WS_HEAP *heap; + void *ptr; + SIZE_T size_allocated; + SIZE_T size; +}; + +void *ws_alloc( WS_HEAP *, SIZE_T ) DECLSPEC_HIDDEN; +void ws_free( WS_HEAP *, void * ) DECLSPEC_HIDDEN; + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 620cc46..821b082 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -152,6 +152,40 @@ void WINAPI WsFreeWriter( WS_XML_WRITER *handle ) heap_free( writer ); } +#define XML_BUFFER_INITIAL_ALLOCATED_SIZE 256 +static struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap ) +{ + struct xmlbuf *ret; + + if (!(ret = ws_alloc( heap, sizeof(*ret) ))) return NULL; + if (!(ret->ptr = ws_alloc( heap, XML_BUFFER_INITIAL_ALLOCATED_SIZE ))) + { + ws_free( heap, ret ); + return NULL; + } + ret->heap = heap; + ret->size_allocated = XML_BUFFER_INITIAL_ALLOCATED_SIZE; + ret->size = 0; + return ret; +} + +/************************************************************************** + * WsCreateXmlBuffer [webservices.@] + */ +HRESULT WINAPI WsCreateXmlBuffer( WS_HEAP *heap, const WS_XML_BUFFER_PROPERTY *properties, + ULONG count, WS_XML_BUFFER **handle, WS_ERROR *error ) +{ + struct xmlbuf *xmlbuf; + + if (!heap || !handle) return E_INVALIDARG; + if (count) FIXME( "properties not implemented\n" ); + + if (!(xmlbuf = alloc_xmlbuf( heap ))) return E_OUTOFMEMORY; + + *handle = (WS_XML_BUFFER *)xmlbuf; + return S_OK; +} + /************************************************************************** * WsGetWriterProperty [webservices.@] */

1 0

Hans Leidekker : webservices: Implement WsSetOutputToBuffer.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 354bd532915205e48ef08c2f26445de09439345f URL: http://source.winehq.org/git/wine.git/?a=commit;h=354bd532915205e48ef08c2f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:11 2015 +0200 webservices: Implement WsSetOutputToBuffer. 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 | 82 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index c070d2f..4a8b88e 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -155,7 +155,7 @@ @ stub WsSetListenerProperty @ stub WsSetMessageProperty @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) -@ stub WsSetOutputToBuffer +@ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stub WsSetReaderPosition @ stub WsSetWriterPosition @ stub WsShutdownSessionChannel diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 821b082..5523926 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -57,7 +57,11 @@ writer_props[] = struct writer { + ULONG write_pos; + char *write_bufptr; WS_XML_WRITER_OUTPUT_TYPE output_type; + struct xmlbuf *output_buf; + WS_HEAP *output_heap; ULONG prop_count; WS_XML_WRITER_PROPERTY prop[sizeof(writer_props)/sizeof(writer_props[0])]; }; @@ -102,6 +106,12 @@ static HRESULT get_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID return S_OK; } +static void free_writer( struct writer *writer ) +{ + WsFreeHeap( writer->output_heap ); + heap_free( writer ); +} + /************************************************************************** * WsCreateWriter [webservices.@] */ @@ -132,11 +142,25 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); if (hr != S_OK) { - heap_free( writer ); + free_writer( writer ); return hr; } } + hr = get_writer_prop( writer, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, &max_size, sizeof(max_size) ); + if (hr != S_OK) + { + free_writer( writer ); + return hr; + } + + hr = WsCreateHeap( max_size, 0, NULL, 0, &writer->output_heap, NULL ); + if (hr != S_OK) + { + free_writer( writer ); + return hr; + } + *handle = (WS_XML_WRITER *)writer; return S_OK; } @@ -149,7 +173,7 @@ void WINAPI WsFreeWriter( WS_XML_WRITER *handle ) struct writer *writer = (struct writer *)handle; TRACE( "%p\n", handle ); - heap_free( writer ); + free_writer( writer ); } #define XML_BUFFER_INITIAL_ALLOCATED_SIZE 256 @@ -169,6 +193,13 @@ static struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap ) return ret; } +static void free_xmlbuf( struct xmlbuf *xmlbuf ) +{ + if (!xmlbuf) return; + ws_free( xmlbuf->heap, xmlbuf->ptr ); + ws_free( xmlbuf->heap, xmlbuf ); +} + /************************************************************************** * WsCreateXmlBuffer [webservices.@] */ @@ -201,6 +232,19 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT return get_writer_prop( writer, id, buf, size ); } +static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf ) +{ + /* free current buffer if it's ours */ + if (writer->output_buf && writer->output_buf->heap == writer->output_heap) + { + free_xmlbuf( writer->output_buf ); + } + writer->output_buf = xmlbuf; + writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + writer->write_bufptr = xmlbuf->ptr; + writer->write_pos = 0; +} + /************************************************************************** * WsSetOutput [webservices.@] */ @@ -217,6 +261,12 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING if (!writer) return E_INVALIDARG; + 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; + } + switch (encoding->encodingType) { case WS_XML_WRITER_ENCODING_TYPE_TEXT: @@ -236,18 +286,44 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING switch (output->outputType) { case WS_XML_WRITER_OUTPUT_TYPE_BUFFER: - writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + { + struct xmlbuf *xmlbuf; + + if (!(xmlbuf = alloc_xmlbuf( writer->output_heap ))) return E_OUTOFMEMORY; + set_output_buffer( writer, xmlbuf ); break; + } default: FIXME( "output type %u not supported\n", output->outputType ); return E_NOTIMPL; } + return S_OK; +} + +/************************************************************************** + * WsSetOutputToBuffer [webservices.@] + */ +HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, + const WS_XML_WRITER_PROPERTY *properties, ULONG count, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + struct xmlbuf *xmlbuf = (struct xmlbuf *)buffer; + HRESULT hr; + ULONG i; + + TRACE( "%p %p %p %u %p\n", handle, buffer, properties, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !xmlbuf) return E_INVALIDARG; + 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; } + set_output_buffer( writer, xmlbuf ); return S_OK; }

1 0

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

22 Oct '15

Module: wine Branch: master Commit: c09c6916f053ab7b86b3b4e12e8e5bbfe7cf56d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09c6916f053ab7b86b3b4e12… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:12 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/writer.c | 107 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 99 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index b1c9062..26b8c78 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -31,8 +31,7 @@ static HRESULT set_output( WS_XML_WRITER *writer ) 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 ); + return WsSetOutput( writer, &encoding.encoding, &output.output, NULL, 0, NULL ); } static void test_WsCreateWriter(void) @@ -191,6 +190,50 @@ static void test_WsCreateWriter(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); } +static void test_WsCreateXmlBuffer(void) +{ + HRESULT hr; + WS_HEAP *heap; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buffer; + WS_BYTES bytes; + ULONG size; + + hr = WsCreateXmlBuffer( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( NULL, NULL, 0, &buffer, 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 = WsCreateXmlBuffer( heap, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + buffer = NULL; + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( buffer != NULL, "buffer not set\n" ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + size = sizeof(bytes); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + size = sizeof(bytes); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeWriter( writer ); + WsFreeHeap( heap ); +} + static void test_WsSetOutput(void) { HRESULT hr; @@ -211,13 +254,11 @@ static void test_WsSetOutput(void) 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 ); + hr = WsSetOutput( writer, &encoding.encoding, &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 ); + hr = WsSetOutput( writer, &encoding.encoding, &output.output, NULL, 0, NULL ); ok( hr == S_OK, "got %08x\n", hr ); /* writer properties can be set with WsSetOutput */ @@ -225,8 +266,7 @@ static void test_WsSetOutput(void) 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 ); + hr = WsSetOutput( writer, &encoding.encoding, &output.output, &prop, 1, NULL ); ok( hr == S_OK, "got %08x\n", hr ); max_depth = 0xdeadbeef; @@ -237,8 +277,59 @@ static void test_WsSetOutput(void) WsFreeWriter( writer ); } +static void test_WsSetOutputToBuffer(void) +{ + HRESULT hr; + WS_HEAP *heap; + WS_XML_BUFFER *buffer; + WS_XML_WRITER *writer; + WS_XML_WRITER_PROPERTY prop; + ULONG size, max_depth; + + hr = WsSetOutputToBuffer( NULL, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, NULL, NULL, 0, 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 = 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 ); + + /* multiple calls are allowed */ + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* writer properties can be set with WsSetOutputToBuffer */ + max_depth = 16; + prop.id = WS_XML_WRITER_PROPERTY_MAX_DEPTH; + prop.value = &max_depth; + prop.valueSize = sizeof(max_depth); + hr = WsSetOutputToBuffer( writer, buffer, &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 ); + WsFreeHeap( heap ); +} + START_TEST(writer) { test_WsCreateWriter(); + test_WsCreateXmlBuffer(); test_WsSetOutput(); + test_WsSetOutputToBuffer(); }

1 0

Hans Leidekker : webservices: Implement WsSetInputToBuffer.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 506e981d08788f165606013ac3c4fe229574e513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=506e981d08788f165606013ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:13 2015 +0200 webservices: Implement WsSetInputToBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 137 ++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 74 ++++++++++++++++++-- dlls/webservices/webservices.spec | 2 +- 3 files changed, 164 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=506e981d08788f1656060…

1 0

Bruno Jesus : msvfw32: Better tracing of ICERR codes and general trace improvements.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 060db73ab67517df7c021d5fb51787c757db55e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060db73ab67517df7c021d5fb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 22 14:10:29 2015 +0800 msvfw32: Better tracing of ICERR codes and general trace improvements. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 123 +++++++++++++++++++++++++++----------------- 1 file changed, 77 insertions(+), 46 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 717bcf9..c48479d 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -46,16 +46,58 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvideo); +/* This one is a macro in order to work for both ASCII and Unicode */ +#define fourcc_to_string(str, fcc) do { \ + (str)[0] = LOBYTE(LOWORD(fcc)); \ + (str)[1] = HIBYTE(LOWORD(fcc)); \ + (str)[2] = LOBYTE(HIWORD(fcc)); \ + (str)[3] = HIBYTE(HIWORD(fcc)); \ + } while(0) + static inline const char *wine_dbgstr_fcc( DWORD fcc ) { - char fcc_str[5] = {LOBYTE(LOWORD(fcc)), HIBYTE(LOWORD(fcc)), - LOBYTE(HIWORD(fcc)), HIBYTE(HIWORD(fcc)), '\0'}; - if (isalnum(fcc_str[0]) && isalnum(fcc_str[1]) - && isalnum(fcc_str[2]) && isalnum(fcc_str[3])) + char fcc_str[5]; + fourcc_to_string(fcc_str, fcc); + fcc_str[4] = '\0'; + /* Last byte may be ' ' in some cases like "DIB " */ + if (isalnum(fcc_str[0]) && isalnum(fcc_str[1]) && isalnum(fcc_str[2]) + && (isalnum(fcc_str[3]) || isspace(fcc_str[3]))) return wine_dbg_sprintf("%s", fcc_str); return wine_dbg_sprintf("0x%08x", fcc); } +static const char *wine_dbgstr_icerr( int ret ) +{ + const char *str; + if (ret <= ICERR_CUSTOM) + return wine_dbg_sprintf("ICERR_CUSTOM (%d)", ret); +#define XX(x) case (x): str = #x; break + switch (ret) + { + XX(ICERR_OK); + XX(ICERR_DONTDRAW); + XX(ICERR_NEWPALETTE); + XX(ICERR_GOTOKEYFRAME); + XX(ICERR_STOPDRAWING); + XX(ICERR_UNSUPPORTED); + XX(ICERR_BADFORMAT); + XX(ICERR_MEMORY); + XX(ICERR_INTERNAL); + XX(ICERR_BADFLAGS); + XX(ICERR_BADPARAM); + XX(ICERR_BADSIZE); + XX(ICERR_BADHANDLE); + XX(ICERR_CANTUPDATE); + XX(ICERR_ABORT); + XX(ICERR_ERROR); + XX(ICERR_BADBITDEPTH); + XX(ICERR_BADIMAGESIZE); + default: str = wine_dbg_sprintf("UNKNOWN (%d)", ret); + } +#undef XX + return str; +} + static WINE_HIC* MSVIDEO_FirstHic /* = NULL */; typedef struct _reg_driver reg_driver; @@ -70,14 +112,6 @@ struct _reg_driver static reg_driver* reg_driver_list = NULL; -/* This one is a macro in order to work for both ASCII and Unicode */ -#define fourcc_to_string(str, fcc) do { \ - (str)[0] = LOBYTE(LOWORD(fcc)); \ - (str)[1] = HIBYTE(LOWORD(fcc)); \ - (str)[2] = LOBYTE(HIWORD(fcc)); \ - (str)[3] = HIBYTE(HIWORD(fcc)); \ - } while(0) - HMODULE MSVFW32_hModule; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) @@ -176,7 +210,7 @@ static LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, ret = SendDriverMessage(whic->hdrv, msg, lParam1, lParam2); } - TRACE(" -> 0x%08lx\n", ret); + TRACE(" -> %s\n", wine_dbgstr_icerr(ret)); return ret; } @@ -293,8 +327,8 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) */ BOOL VFWAPI ICInfo( DWORD fccType, DWORD fccHandler, ICINFO *lpicinfo) { - TRACE("(%s,%s/%08x,%p)\n", - wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), fccHandler, lpicinfo); + TRACE("(%s,%s,%p)\n", + wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), lpicinfo); lpicinfo->fccType = fccType; lpicinfo->fccHandler = fccHandler; @@ -420,16 +454,16 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the * same layout as ICOPEN */ - icopen.dwSize = sizeof(ICOPEN); - icopen.fccType = fccType; - icopen.fccHandler = fccHandler; - icopen.dwVersion = 0x00001000; /* FIXME */ - icopen.dwFlags = wMode; - icopen.dwError = 0; - icopen.pV1Reserved = NULL; - icopen.pV2Reserved = NULL; - icopen.dnDevNode = 0; /* FIXME */ - + icopen.dwSize = sizeof(ICOPEN); + icopen.fccType = fccType; + icopen.fccHandler = fccHandler; + icopen.dwVersion = 0x00001000; /* FIXME */ + icopen.dwFlags = wMode; + icopen.dwError = 0; + icopen.pV1Reserved = NULL; + icopen.pV2Reserved = NULL; + icopen.dnDevNode = 0; /* FIXME */ + if (!driver) { /* normalize to lower case as in 'vidc' */ ((char*)&fccType)[0] = tolower(((char*)&fccType)[0]); @@ -438,9 +472,9 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) ((char*)&fccType)[3] = tolower(((char*)&fccType)[3]); icopen.fccType = fccType; /* Seek the driver in the registry */ - fourcc_to_string(codecname, fccType); + fourcc_to_string(codecname, fccType); codecname[4] = '.'; - fourcc_to_string(codecname + 5, fccHandler); + fourcc_to_string(codecname + 5, fccHandler); codecname[9] = '\0'; hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen); @@ -483,15 +517,15 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO TRACE("(%s,%s,%d,%p)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode, lpfnHandler); - icopen.dwSize = sizeof(ICOPEN); - icopen.fccType = fccType; - icopen.fccHandler = fccHandler; - icopen.dwVersion = ICVERSION; - icopen.dwFlags = wMode; - icopen.dwError = 0; - icopen.pV1Reserved = NULL; - icopen.pV2Reserved = NULL; - icopen.dnDevNode = 0; /* FIXME */ + icopen.dwSize = sizeof(ICOPEN); + icopen.fccType = fccType; + icopen.fccHandler = fccHandler; + icopen.dwVersion = ICVERSION; + icopen.dwFlags = wMode; + icopen.dwError = 0; + icopen.pV1Reserved = NULL; + icopen.pV2Reserved = NULL; + icopen.dnDevNode = 0; /* FIXME */ whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); if (!whic) return 0; @@ -567,7 +601,7 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb) lstrcpyW(picinfo->szDriver, ii.szDriver); } - TRACE(" -> 0x%08lx\n", ret); + TRACE(" -> %s\n", wine_dbgstr_icerr(ret)); return ret; } @@ -764,7 +798,7 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat, icd.ckid = 0; ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS)); - TRACE("-> %d\n",ret); + TRACE("-> %s\n",wine_dbgstr_icerr(ret)); return ret; } @@ -1378,7 +1412,6 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL icComp->lpPrev = pc->lpBitsPrev; ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(*icComp)); - TRACE(" -- 0x%08x\n", ret); if (ret == ICERR_OK) { LPVOID oldprev, oldout; @@ -1426,10 +1459,8 @@ static void clear_compvars(PCOMPVARS pc) */ void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS pc) { - DWORD ret; TRACE("(%p)\n", pc); - ret = ICSendMessage(pc->hic, ICM_COMPRESS_END, 0, 0); - TRACE(" -- %x\n", ret); + ICSendMessage(pc->hic, ICM_COMPRESS_END, 0, 0); clear_compvars(pc); } @@ -1514,15 +1545,15 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) "\tsize: %i\n" "\tflags: 0x%x\n" "\thic: %p\n" - "\ttype: 0x%x\n" + "\ttype: %s\n" "\thandler: %s\n" "\tin/out: %p/%p\n" "\tkey/data/quality: %i/%i/%i\n", - pc->cbSize, pc->dwFlags, pc->hic, pc->fccType, wine_dbgstr_fcc(pc->fccHandler), - pc->lpbiIn, pc->lpbiOut, pc->lKey, pc->lDataRate, pc->lQ); + pc->cbSize, pc->dwFlags, pc->hic, wine_dbgstr_fcc(pc->fccType), + wine_dbgstr_fcc(pc->fccHandler), pc->lpbiIn, pc->lpbiOut, pc->lKey, + pc->lDataRate, pc->lQ); ret = ICSendMessage(pc->hic, ICM_COMPRESS_BEGIN, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); - TRACE(" -- %x\n", ret); if (ret == ICERR_OK) { icComp = pc->lpState;

1 0