wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Hans Leidekker : webservices: Implement WsSetHeader.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: dff16756e9e4e31f47c7ce0126591a427c24c250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff16756e9e4e31f47c7ce012… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:55 2016 +0200 webservices: Implement WsSetHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 145 +++++++++++++++++++++++++++++++++++--- dlls/webservices/webservices.spec | 2 +- 2 files changed, 138 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index d7898a2..2c8fb3b 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -48,6 +48,12 @@ static const struct prop_desc msg_props[] = { sizeof(BOOL), TRUE }, /* WS_MESSAGE_PROPERTY_IS_ADDRESSED */ }; +struct header +{ + WS_HEADER_TYPE type; + WS_XML_UTF8_TEXT text; +}; + struct msg { WS_MESSAGE_INITIALIZATION init; @@ -61,10 +67,14 @@ struct msg WS_XML_BUFFER *buf; WS_XML_WRITER *writer; WS_XML_WRITER *writer_body; + ULONG header_count; + ULONG header_size; + struct header **header; ULONG prop_count; struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; }; +#define HEADER_ARRAY_SIZE 2 static struct msg *alloc_msg(void) { static const ULONG count = sizeof(msg_props)/sizeof(msg_props[0]); @@ -72,23 +82,36 @@ static struct msg *alloc_msg(void) ULONG size = sizeof(*ret) + prop_size( msg_props, count ); if (!(ret = heap_alloc_zero( size ))) return NULL; - ret->state = WS_MESSAGE_STATE_EMPTY; + if (!(ret->header = heap_alloc( HEADER_ARRAY_SIZE * sizeof(struct header *) ))) + { + heap_free( ret ); + return NULL; + } + ret->state = WS_MESSAGE_STATE_EMPTY; + ret->header_size = HEADER_ARRAY_SIZE; prop_init( msg_props, count, ret->prop, &ret[1] ); - ret->prop_count = count; + ret->prop_count = count; return ret; } +static void free_headers( struct header **header, ULONG count ) +{ + ULONG i; + for (i = 0; i < count; i++) heap_free( header[i] ); +} + static void free_msg( struct msg *msg ) { if (!msg) return; WsFreeWriter( msg->writer ); WsFreeHeap( msg->heap ); heap_free( msg->addr.chars ); + free_headers( msg->header, msg->header_count ); + heap_free( msg->header ); heap_free( msg ); } #define HEAP_MAX_SIZE (1 << 16) - static HRESULT create_msg( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_VERSION addr_version, const WS_MESSAGE_PROPERTY *properties, ULONG count, WS_MESSAGE **handle ) { @@ -403,6 +426,16 @@ static HRESULT write_envelope_end( struct msg *msg, WS_XML_WRITER *writer ) return WsWriteEndElement( writer, NULL ); /* </s:Envelope> */ } +static HRESULT write_envelope( struct msg *msg ) +{ + HRESULT hr; + if (!msg->writer && (hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) return hr; + if (!msg->buf && (hr = WsCreateXmlBuffer( msg->heap, NULL, 0, &msg->buf, NULL )) != S_OK) return hr; + if ((hr = WsSetOutputToBuffer( msg->writer, msg->buf, NULL, 0, NULL )) != S_OK) return hr; + if ((hr = write_envelope_start( msg, msg->writer )) != S_OK) return hr; + return write_envelope_end( msg, msg->writer ); +} + /************************************************************************** * WsWriteEnvelopeStart [webservices.@] */ @@ -420,14 +453,11 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer, return E_NOTIMPL; } - if (!handle) return E_INVALIDARG; + if (!handle || !writer) return E_INVALIDARG; if (msg->state != WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; - if ((hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) return hr; - if ((hr = WsSetOutputToBuffer( msg->writer, msg->buf, NULL, 0, NULL )) != S_OK) return hr; - if ((hr = write_envelope_start( msg, msg->writer )) != S_OK) return hr; + if ((hr = write_envelope( msg )) != S_OK) return hr; if ((hr = write_envelope_start( msg, writer )) != S_OK) return hr; - if ((hr = write_envelope_end( msg, msg->writer )) != S_OK) return hr; msg->writer_body = writer; msg->state = WS_MESSAGE_STATE_WRITING; @@ -479,3 +509,102 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de if (desc->elementLocalName) hr = WsWriteEndElement( msg->writer_body, NULL ); return hr; } + +static inline void set_utf8_text( WS_XML_UTF8_TEXT *text, BYTE *bytes, ULONG len ) +{ + text->text.textType = WS_XML_TEXT_TYPE_UTF8; + text->value.bytes = bytes; + text->value.length = len; +} + +static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_OPTION option, + const void *value, ULONG size, struct header **ret ) +{ + struct header *header; + + switch (value_type) + { + case WS_WSZ_TYPE: + { + int len; + const WCHAR *src; + + if (option != WS_WRITE_REQUIRED_POINTER || size != sizeof(WCHAR *)) return E_INVALIDARG; + + src = *(const WCHAR **)value; + len = WideCharToMultiByte( CP_UTF8, 0, src, -1, NULL, 0, NULL, NULL ) - 1; + if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + set_utf8_text( &header->text, (BYTE *)(header + 1), len ); + WideCharToMultiByte( CP_UTF8, 0, src, -1, (char *)header->text.value.bytes, len, NULL, NULL ); + break; + } + case WS_XML_STRING_TYPE: + { + const WS_XML_STRING *str = value; + + if (option != WS_WRITE_REQUIRED_VALUE) + { + FIXME( "unhandled write option %u\n", option ); + return E_NOTIMPL; + } + if (size != sizeof(*str)) return E_INVALIDARG; + if (!(header = heap_alloc( sizeof(*header) + str->length ))) return E_OUTOFMEMORY; + set_utf8_text( &header->text, (BYTE *)(header + 1), str->length ); + memcpy( header->text.value.bytes, str->bytes, str->length ); + break; + } + default: + FIXME( "unhandled type %u\n", value_type ); + return E_NOTIMPL; + } + + header->type = type; + *ret = header; + return S_OK; +} + +/************************************************************************** + * WsSetHeader [webservices.@] + */ +HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE value_type, + WS_WRITE_OPTION option, const void *value, ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + struct header *header; + BOOL found = FALSE; + HRESULT hr; + ULONG i; + + TRACE( "%p %u %u %08x %p %u %p\n", handle, type, value_type, option, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type == type) + { + found = TRUE; + break; + } + } + + if (found) heap_free( msg->header[i] ); + else + { + if (msg->header_count == msg->header_size) + { + struct header **tmp; + if (!(tmp = heap_realloc( msg->header, 2 * msg->header_size * sizeof(struct header *) ))) + return E_OUTOFMEMORY; + msg->header = tmp; + msg->header_size *= 2; + } + i = msg->header_count++; + } + + if ((hr = alloc_header( type, value_type, option, value, size, &header )) != S_OK) return hr; + msg->header[i] = header; + return write_envelope( msg ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 29b09c6..477f236 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -149,7 +149,7 @@ @ stdcall WsSetErrorProperty(ptr long ptr long) @ stub WsSetFaultErrorDetail @ stub WsSetFaultErrorProperty -@ stub WsSetHeader +@ stdcall WsSetHeader(ptr long long long ptr long ptr) @ stdcall WsSetInput(ptr ptr ptr ptr long ptr) @ stdcall WsSetInputToBuffer(ptr ptr ptr long ptr) @ stub WsSetListenerProperty

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 58cf38b796bf0ed7b6ffc8009395a8ce240b6a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cf38b796bf0ed7b6ffc8009… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:54 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index e35e389..c227a17 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -493,6 +493,11 @@ typedef struct _WS_STRING { WCHAR *chars; } WS_STRING; +typedef struct _WS_UNIQUE_ID { + WS_STRING uri; + GUID guid; +} WS_UNIQUE_ID; + typedef enum { WS_XML_NODE_TYPE_ELEMENT = 1, WS_XML_NODE_TYPE_TEXT = 2, @@ -906,6 +911,11 @@ struct _WS_HTTP_SSL_BINDING_TEMPLATE { WS_SSL_TRANSPORT_SECURITY_BINDING_TEMPLATE sslTransportSecurityBinding; }; +enum { + WS_MUST_UNDERSTAND_HEADER_ATTRIBUTE = 0x1, + WS_RELAY_HEADER_ATTRIBUTE = 0x2 +}; + typedef enum { WS_ADDRESSING_VERSION_0_9 = 1, WS_ADDRESSING_VERSION_1_0 = 2, @@ -971,6 +981,16 @@ typedef enum { } WS_MESSAGE_INITIALIZATION; typedef enum { + WS_ACTION_HEADER = 1, + WS_TO_HEADER = 2, + WS_MESSAGE_ID_HEADER = 3, + WS_RELATES_TO_HEADER = 4, + WS_FROM_HEADER = 5, + WS_REPLY_TO_HEADER = 6, + WS_FAULT_TO_HEADER = 7 +} WS_HEADER_TYPE; + +typedef enum { WS_DNS_ENDPOINT_IDENTITY_TYPE = 1, WS_UPN_ENDPOINT_IDENTITY_TYPE = 2, WS_SPN_ENDPOINT_IDENTITY_TYPE = 3, @@ -1401,8 +1421,10 @@ HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCR WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); +HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); +HRESULT WINAPI WsResetMessage(WS_MESSAGE*, WS_ERROR*); HRESULT WINAPI WsRequestReply(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); @@ -1413,6 +1435,8 @@ HRESULT WINAPI WsSendReplyMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DES const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); +HRESULT WINAPI WsSetHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_TYPE, WS_WRITE_OPTION, const void*, ULONG, + WS_ERROR*); 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*,

1 0

Hans Leidekker : webservices/tests: Add some tests for WsSetWriterPosition.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 9c5b9399fc04ad93fdf31e8cda5431fa6170a0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5b9399fc04ad93fdf31e8cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:53 2016 +0200 webservices/tests: Add some tests for WsSetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3343ae5..65828a4 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1576,6 +1576,7 @@ static void test_WsGetWriterPosition(void) static void test_WsSetWriterPosition(void) { + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; WS_HEAP *heap; WS_XML_WRITER *writer; WS_XML_BUFFER *buf1, *buf2; @@ -1617,6 +1618,29 @@ static void test_WsSetWriterPosition(void) hr = WsSetWriterPosition( writer, &pos, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + hr = WsSetOutputToBuffer( writer, buf1, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* try to write at non-final position */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer == buf1, "wrong buffer\n" ); + ok( pos.node != NULL, "node not set\n" ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_buffer( buf1, "<t/>", __LINE__ ); + + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeWriter( writer ); WsFreeHeap( heap ); }

1 0

Nikolay Sivov : comctl32/treeview: Fix item dragging and selection for TVS_FULLROWSELECT style.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: af02e1082818a45a135a32686c77b84f0c699f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af02e1082818a45a135a32686… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 15:11:02 2016 +0300 comctl32/treeview: Fix item dragging and selection for TVS_FULLROWSELECT style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dc31a9b..55e22e2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4197,9 +4197,9 @@ TREEVIEW_LButtonDoubleClick(TREEVIEW_INFO *infoPtr, LPARAM lParam) static LRESULT TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) { + BOOL do_track, do_select, bDoLabelEdit; HWND hwnd = infoPtr->hwnd; TVHITTESTINFO ht; - BOOL bTrack, bDoLabelEdit; /* If Edit control is active - kill it and return. * The best way to do it is to set focus to itself. @@ -4219,15 +4219,32 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, ht.hItem)); /* update focusedItem and redraw both items */ - if(ht.hItem && (ht.flags & TVHT_ONITEM)) + if (ht.hItem) { - infoPtr->focusedItem = ht.hItem; - TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); - TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + BOOL do_focus; + + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_focus = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + do_focus = ht.flags & TVHT_ONITEM; + + if (do_focus) + { + infoPtr->focusedItem = ht.hItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + } } - bTrack = (ht.flags & TVHT_ONITEM) - && !(infoPtr->dwStyle & TVS_DISABLEDRAGDROP); + if (!(infoPtr->dwStyle & TVS_DISABLEDRAGDROP)) + { + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_track = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + do_track = ht.flags & TVHT_ONITEM; + } + else + do_track = FALSE; /* * If the style allows editing and the node is already selected @@ -4237,16 +4254,15 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) (ht.flags & TVHT_ONITEMLABEL) && (infoPtr->selectedItem == ht.hItem); /* Send NM_CLICK right away */ - if (!bTrack) - if (TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) - goto setfocus; + if (!do_track && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) + goto setfocus; if (ht.flags & TVHT_ONITEMBUTTON) { TREEVIEW_Toggle(infoPtr, ht.hItem, TRUE); goto setfocus; } - else if (bTrack) + else if (do_track) { /* if TREEVIEW_TrackMouse == 1 dragging occurred and the cursor left the dragged item's rectangle */ if (TREEVIEW_TrackMouse(infoPtr, ht.pt)) { @@ -4268,9 +4284,14 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } } - if (bTrack && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) + if (do_track && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) goto setfocus; + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_select = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMRIGHT); + else + do_select = ht.flags & (TVHT_ONITEMICON | TVHT_ONITEMLABEL); + if (bDoLabelEdit) { if (infoPtr->Timer & TV_EDIT_TIMER_SET) @@ -4279,7 +4300,7 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) SetTimer(hwnd, TV_EDIT_TIMER, GetDoubleClickTime(), 0); infoPtr->Timer |= TV_EDIT_TIMER_SET; } - else if (ht.flags & (TVHT_ONITEMICON|TVHT_ONITEMLABEL)) /* select the item if the hit was inside of the icon or text */ + else if (do_select) { TREEVIEW_ITEM *selection = infoPtr->selectedItem;

1 0

Michael Stefaniuc : comctl32/tests: Use todo_wine_if().
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 6531b9b8af2abd2e14ffd19f552f861abcb3c471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6531b9b8af2abd2e14ffd19f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 13:08:35 2016 +0200 comctl32/tests: Use todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index efad00a..7dcdadb 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1235,11 +1235,8 @@ static DWORD tbsize_alt_numtests = 0; EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \ win_skip("Alternate rect found\n"); \ tbsize_alt_numtests++; \ - } else if (!(mask&1)) { \ + } else todo_wine_if(mask&1) \ check_rect("button = %d, tbsize_numtests = %d", rc, res->prcButtons[i], i, tbsize_numtests); \ - } else {\ - todo_wine { check_rect("button = %d, tbsize_numtests = %d", rc, res->prcButtons[i], i, tbsize_numtests); } \ - } \ mask >>= 1; \ } \ tbsize_numtests++; \

1 0

Michael Stefaniuc : user32/tests: Remove an identical if/else branch.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: d8a970f94a0b4084d1d1adb4faaf3afbf9ed5e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a970f94a0b4084d1d1adb4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 13:05:46 2016 +0200 user32/tests: Remove an identical if/else branch. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index c90bac9..d63a0f6 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2511,12 +2511,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(!lstrcmpW((WCHAR*)buffer, cmd_w), "Expected %s, msg_index=%d\n", wine_dbgstr_w(cmd_w), msg_index); } - else if (unicode_client) - { - ok(size == size_w_to_a, "Wrong size %d/%d, msg_index=%d\n", size, size_w_to_a, msg_index); - ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", - test_cmd_w_to_a, buffer, msg_index); - } else { ok(size == size_w_to_a, "Wrong size %d/%d, msg_index=%d\n",

1 0

Michael Stefaniuc : quartz: There is no point in tracing the GUID pointer too.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: fd992823192e8f85074c30f350517cc3239c15ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd992823192e8f85074c30f35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 13:03:39 2016 +0200 quartz: There is no point in tracing the GUID pointer too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 6 +++--- dlls/quartz/filtergraph.c | 50 +++++++++++++++++++++++++++------------------ dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- 4 files changed, 37 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd992823192e8f85074c3…

1 0

Nikolay Sivov : winhttp/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 1895345df813dfb728b40a0f0f6f7f9ba89c6e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1895345df813dfb728b40a0f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 13:19:04 2016 +0300 winhttp/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6be7598..1cc9ba0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3822,8 +3822,8 @@ static void test_IWinHttpRequest_Invoke(void) ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); VariantInit(&ret); -if (0) /* crashes */ - hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, &ret, NULL, &err); + if (0) /* crashes */ + hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, &ret, NULL, &err); params.cArgs = 1; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err);

1 0

Nikolay Sivov : rpcrt4/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 6ac3c09a7640529e425cd51c9b24caa859c88b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac3c09a7640529e425cd51c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 13:19:03 2016 +0300 rpcrt4/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index aeecf8c..21baba7 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2433,9 +2433,9 @@ static void test_MesEncodeFixedBufferHandleCreate(void) status = MesEncodeFixedBufferHandleCreate(buffer, 0, &encoded_size, &handle); todo_wine ok(status == RPC_S_INVALID_ARG, "got %d\n", status); -if (status == RPC_S_OK) +if (status == RPC_S_OK) { MesHandleFree(handle); - +} status = MesEncodeFixedBufferHandleCreate(buffer, 32, NULL, &handle); ok(status == RPC_S_INVALID_ARG, "got %d\n", status);

1 0

Nikolay Sivov : ole32/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 4d0a353bccc9a750502a6de8312e94589d9d0432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0a353bccc9a750502a6de83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 13:19:02 2016 +0300 ole32/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3b523d1..b8bdaff 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2879,8 +2879,8 @@ static void test_CoGetMalloc(void) IMalloc *imalloc; HRESULT hr; -if (0) /* crashes on native */ - hr = CoGetMalloc(0, NULL); + if (0) /* crashes on native */ + hr = CoGetMalloc(0, NULL); imalloc = (void*)0xdeadbeef; hr = CoGetMalloc(0, &imalloc);

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
78
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 August 2016