June 2018 - Wine-devel - list.winehq.org

[PATCH] user32: Always release menu item in EnableMenuItem
by Fabian Maurer 20 Jun '18

20 Jun '18

The menu must be release on all code-paths, else the underlying lock will never be released. Fixes bug 45355. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/menu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 8c541cc4f91..0b1133bbc41 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -590,6 +590,7 @@ static POPUPMENU *find_menu_item(HMENU hmenu, UINT id, UINT flags, UINT *pos) POPUPMENU *menu; menu = grab_menu_ptr(hmenu); + if (!menu) return NULL; @@ -3763,6 +3764,8 @@ BOOL WINAPI EnableMenuItem( HMENU hMenu, UINT id, UINT wFlags ) rc.bottom = 0; RedrawWindow(hwnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); } + else + release_menu_ptr(menu); } else release_menu_ptr(menu); -- 2.17.1

2 2

[PATCH v7 1/8] include: Add SYSTEM_FIRMWARE_TABLE_INFORMATION to winternl.h
by Alex Henrie 20 Jun '18

20 Jun '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/winternl.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 58c475dfff..6e0bd987b6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1579,6 +1579,23 @@ typedef struct _SYSTEM_TIME_ADJUSTMENT { BOOLEAN TimeAdjustmentDisabled; } SYSTEM_TIME_ADJUSTMENT, *PSYSTEM_TIME_ADJUSTMENT; +typedef enum _SYSTEM_FIRMWARE_TABLE_ACTION +{ + SystemFirmwareTable_Enumerate = 0, + SystemFirmwareTable_Get = 1 +} SYSTEM_FIRMWARE_TABLE_ACTION, *PSYSTEM_FIRMWARE_TABLE_ACTION; + +/* System Information Class 0x4C */ + +typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION +{ + ULONG ProviderSignature; + SYSTEM_FIRMWARE_TABLE_ACTION Action; + ULONG TableID; + ULONG TableBufferLength; + UCHAR TableBuffer[1]; +} SYSTEM_FIRMWARE_TABLE_INFORMATION, *PSYSTEM_FIRMWARE_TABLE_INFORMATION; + typedef struct _TIME_FIELDS { CSHORT Year; CSHORT Month; -- 2.17.1

4 13

[PATCH v3 2/2] gdiplus: Avoid calling GdipFillPath() with an empty path.
by Zhiyi Zhang 20 Jun '18

20 Jun '18

There is no point filling an empty path. And an empty path will cause SelectClipPath() used in brush_fill_path() to return error. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 3 +++ dlls/gdiplus/tests/graphics.c | 47 +++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a793665683..2d23085e8a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4264,6 +4264,9 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p if(graphics->busy) return ObjectBusy; + if (!path->pathdata.Count) + return Ok; + if (graphics->image && graphics->image->type == ImageTypeMetafile) return METAFILE_FillPath((GpMetafile*)graphics->image, brush, path); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ae75c0efc1..5eb0a8a4d0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1539,6 +1539,52 @@ static void test_GdipFillClosedCurveI(void) ReleaseDC(hwnd, hdc); } +static void test_GdipFillPath(void) +{ + GpStatus status; + GpGraphics *graphics; + GpSolidFill *brush; + GpPath *path; + HDC hdc = GetDC(hwnd); + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + status = GdipCreateSolidFill((ARGB)0xffffffff, &brush); + expect(Ok, status); + ok(brush != NULL, "Expected brush to be initialized\n"); + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + ok(path != NULL, "Expected path to be initialized\n"); + + /* Empty path */ + GdipResetPath(path); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + /* Not closed path */ + GdipResetPath(path); + status = GdipAddPathLineI(path, 0, 0, 2, 2); + expect(Ok, status); + status = GdipAddPathLineI(path, 2, 2, 4, 0); + expect(Ok, status); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + /* Closed path */ + GdipResetPath(path); + status = GdipAddPathRectangle(path, 0, 0, 4, 4); + expect(Ok, status); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + GdipDeletePath(path); + GdipDeleteBrush((GpBrush *)brush); + GdipDeleteGraphics(graphics); + ReleaseDC(hwnd, hdc); +} + static void test_Get_Release_DC(void) { GpStatus status; @@ -6795,6 +6841,7 @@ START_TEST(graphics) test_GdipDrawImagePointsRect(); test_GdipFillClosedCurve(); test_GdipFillClosedCurveI(); + test_GdipFillPath(); test_GdipDrawString(); test_GdipGetNearestColor(); test_GdipGetVisibleClipBounds(); -- 2.17.1

2 1

[PATCH v3 1/2] gdiplus: Report error for brush_fill_path().
by Zhiyi Zhang 20 Jun '18

20 Jun '18

Operation should be skipped if SelectClipPath() returns any error. And we should report unexpected error to the caller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 894e879233..a793665683 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1050,8 +1050,9 @@ static BOOL brush_can_fill_path(GpBrush *brush, BOOL is_fill) } } -static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) +static GpStatus brush_fill_path(GpGraphics *graphics, GpBrush *brush) { + GpStatus status = Ok; switch (brush->bt) { case BrushTypeSolidColor: @@ -1064,13 +1065,19 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) RECT rc; /* partially transparent fill */ - SelectClipPath(graphics->hdc, RGN_AND); + if (!SelectClipPath(graphics->hdc, RGN_AND)) + { + status = GenericError; + DeleteObject(bmp); + break; + } if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); if (!hdc) { + status = OutOfMemory; DeleteObject(bmp); break; } @@ -1091,7 +1098,11 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) HBRUSH gdibrush, old_brush; gdibrush = create_gdi_brush(brush); - if (!gdibrush) return; + if (!gdibrush) + { + status = OutOfMemory; + break; + } old_brush = SelectObject(graphics->hdc, gdibrush); FillPath(graphics->hdc); @@ -1100,6 +1111,8 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) break; } } + + return status; } static BOOL brush_can_fill_pixels(GpBrush *brush) @@ -4205,7 +4218,7 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath if(retval == Ok) { EndPath(graphics->hdc); - brush_fill_path(graphics, brush); + retval = brush_fill_path(graphics, brush); } gdi_transform_release(graphics); @@ -4511,13 +4524,13 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, Rectangle(graphics->hdc, rc.left, rc.top, rc.right, rc.bottom); EndPath(graphics->hdc); - brush_fill_path(graphics, brush); + status = brush_fill_path(graphics, brush); } RestoreDC(graphics->hdc, save_state); - return Ok; + return status; } static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, -- 2.17.1

2 1

[PATCH 5/5] webservices: Send incremental string table updates with messages in the same session.
by Hans Leidekker 20 Jun '18

20 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 31 +++++++++++++++++-------------- dlls/webservices/string.c | 18 +++++++++++++++++- dlls/webservices/webservices_private.h | 3 +++ dlls/webservices/writer.c | 19 +++++++++++++++++++ 4 files changed, 56 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 79d431f279..5963faf00d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1009,22 +1009,26 @@ static inline ULONG size_length( ULONG size ) return 5; } -static ULONG string_table_size( const WS_XML_DICTIONARY *dict ) +static ULONG string_table_size( const struct dictionary *dict ) { ULONG i, size = 0; - for (i = 0; i < dict->stringCount; i++) - size += size_length( dict->strings[i].length ) + dict->strings[i].length; + for (i = 0; i < dict->dict.stringCount; i++) + { + if (dict->sequence[i] == dict->current_sequence) + size += size_length( dict->dict.strings[i].length ) + dict->dict.strings[i].length; + } return size; } -static HRESULT send_string_table( SOCKET socket, const WS_XML_DICTIONARY *dict ) +static HRESULT send_string_table( SOCKET socket, const struct dictionary *dict ) { ULONG i; HRESULT hr; - for (i = 0; i < dict->stringCount; i++) + for (i = 0; i < dict->dict.stringCount; i++) { - if ((hr = send_size( socket, dict->strings[i].length )) != S_OK) return hr; - if ((hr = send_bytes( socket, dict->strings[i].bytes, dict->strings[i].length )) != S_OK) return hr; + if (dict->sequence[i] != dict->current_sequence) continue; + if ((hr = send_size( socket, dict->dict.strings[i].length )) != S_OK) return hr; + if ((hr = send_bytes( socket, dict->dict.strings[i].bytes, dict->dict.strings[i].length )) != S_OK) return hr; } return S_OK; } @@ -1154,13 +1158,13 @@ static HRESULT receive_preamble_ack( struct channel *channel ) static HRESULT send_sized_envelope( struct channel *channel, BYTE *data, ULONG len ) { - ULONG table_size = string_table_size( &channel->dict_send.dict ); + ULONG table_size = string_table_size( &channel->dict_send ); HRESULT hr; if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_SIZED_ENVELOPE )) != S_OK) return hr; if ((hr = send_size( channel->u.tcp.socket, size_length(table_size) + table_size + len )) != S_OK) return hr; if ((hr = send_size( channel->u.tcp.socket, table_size )) != S_OK) return hr; - if ((hr = send_string_table( channel->u.tcp.socket, &channel->dict_send.dict )) != S_OK) return hr; + if ((hr = send_string_table( channel->u.tcp.socket, &channel->dict_send )) != S_OK) return hr; return send_bytes( channel->u.tcp.socket, data, len ); } @@ -1285,11 +1289,8 @@ static HRESULT init_writer( struct channel *channel ) return WsSetOutput( channel->writer, &text.encoding, &buf.output, NULL, 0, NULL ); case WS_ENCODING_XML_BINARY_SESSION_1: - clear_dict( &channel->dict_send ); - bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; - bin.dynamicStringCallback = dict_cb; - bin.dynamicStringCallbackState = &channel->dict_send; - return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; + /* fall through */ case WS_ENCODING_XML_BINARY_1: return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); @@ -1307,6 +1308,8 @@ static HRESULT write_message( struct channel *channel, WS_MESSAGE *msg, const WS if ((hr = writer_set_lookup( channel->writer, TRUE )) != S_OK) return hr; if ((hr = WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL )) != S_OK) return hr; if ((hr = writer_set_lookup( channel->writer, FALSE )) != S_OK) return hr; + channel->dict_send.current_sequence++; + if ((hr = writer_set_dict_callback( channel->writer, dict_cb, &channel->dict_send )) != S_OK) return hr; if ((hr = WsWriteBody( msg, desc, option, body, size, NULL )) != S_OK) return hr; return WsWriteEnvelopeEnd( msg, NULL ); } diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 18c55e3833..0bb77df946 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -91,7 +91,7 @@ int find_string( const struct dictionary *dict, const unsigned char *data, ULONG static HRESULT grow_dict( struct dictionary *dict, ULONG size ) { WS_XML_STRING *tmp; - ULONG new_size, *tmp_sorted; + ULONG new_size, *tmp_sorted, *tmp_sequence; assert( !dict->dict.isConst ); if (dict->size >= dict->dict.stringCount + size) return S_OK; @@ -107,6 +107,14 @@ static HRESULT grow_dict( struct dictionary *dict, ULONG size ) dict->dict.strings = NULL; return E_OUTOFMEMORY; } + if (!(dict->sequence = heap_alloc( new_size * sizeof(*dict->sequence) ))) + { + heap_free( dict->dict.strings ); + dict->dict.strings = NULL; + heap_free( dict->sorted ); + dict->sorted = NULL; + return E_OUTOFMEMORY; + } dict->size = new_size; return S_OK; } @@ -116,6 +124,8 @@ static HRESULT grow_dict( struct dictionary *dict, ULONG size ) dict->dict.strings = tmp; if (!(tmp_sorted = heap_realloc( dict->sorted, new_size * sizeof(*tmp_sorted) ))) return E_OUTOFMEMORY; dict->sorted = tmp_sorted; + if (!(tmp_sequence = heap_realloc( dict->sequence, new_size * sizeof(*tmp_sequence) ))) return E_OUTOFMEMORY; + dict->sequence = tmp_sequence; dict->size = new_size; return S_OK; @@ -131,6 +141,9 @@ void clear_dict( struct dictionary *dict ) dict->dict.stringCount = 0; heap_free( dict->sorted ); dict->sorted = NULL; + heap_free( dict->sequence ); + dict->sequence = NULL; + dict->current_sequence = 0; dict->size = 0; } @@ -149,6 +162,9 @@ HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, dict->dict.strings[id].dictionary = &dict->dict; dict->dict.strings[id].id = id; dict->dict.stringCount++; + + dict->sequence[id] = dict->current_sequence; + if (ret_id) *ret_id = id; return S_OK; } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index bfc3202a64..d981527bb2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -43,6 +43,8 @@ struct dictionary WS_XML_DICTIONARY dict; ULONG *sorted; ULONG size; + ULONG current_sequence; + ULONG *sequence; }; struct dictionary dict_builtin DECLSPEC_HIDDEN; const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; @@ -51,6 +53,7 @@ int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; HRESULT writer_set_lookup( WS_XML_WRITER *, BOOL ) DECLSPEC_HIDDEN; +HRESULT writer_set_dict_callback( WS_XML_WRITER *, WS_DYNAMIC_STRING_CALLBACK, void * ) DECLSPEC_HIDDEN; const char *debugstr_xmlstr( const WS_XML_STRING * ) DECLSPEC_HIDDEN; WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b3d130a52c..95d4caddb9 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -4866,3 +4866,22 @@ HRESULT writer_set_lookup( WS_XML_WRITER *handle, BOOL enable ) LeaveCriticalSection( &writer->cs ); return S_OK; } + +HRESULT writer_set_dict_callback( WS_XML_WRITER *handle, WS_DYNAMIC_STRING_CALLBACK cb, void *state ) +{ + struct writer *writer = (struct writer *)handle; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + writer->dict_cb = cb; + writer->dict_cb_state = state; + + LeaveCriticalSection( &writer->cs ); + return S_OK; +} -- 2.11.0

1 0

[PATCH 4/5] webservices: Use the static dictionary only while writing the message header.
by Hans Leidekker 20 Jun '18

20 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 30 ++++++++++++++---------------- dlls/webservices/webservices_private.h | 2 +- dlls/webservices/writer.c | 4 ++-- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 6c7c8affa3..79d431f279 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -967,15 +967,6 @@ static HRESULT connect_channel( struct channel *channel ) } } -static HRESULT write_message( WS_MESSAGE *handle, WS_XML_WRITER *writer, const WS_ELEMENT_DESCRIPTION *desc, - WS_WRITE_OPTION option, const void *body, ULONG size ) -{ - HRESULT hr; - if ((hr = WsWriteEnvelopeStart( handle, writer, NULL, NULL, NULL )) != S_OK) return hr; - if ((hr = WsWriteBody( handle, desc, option, body, size, NULL )) != S_OK) return hr; - return WsWriteEnvelopeEnd( handle, NULL ); -} - static HRESULT send_message_http( HINTERNET request, BYTE *data, ULONG len ) { if (!WinHttpSendRequest( request, NULL, 0, data, len, len, 0 )) @@ -1298,8 +1289,7 @@ static HRESULT init_writer( struct channel *channel ) bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; bin.dynamicStringCallback = dict_cb; bin.dynamicStringCallbackState = &channel->dict_send; - if ((hr = WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL )) != S_OK) return hr; - return writer_enable_lookup( channel->writer ); + return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); case WS_ENCODING_XML_BINARY_1: return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); @@ -1310,6 +1300,17 @@ static HRESULT init_writer( struct channel *channel ) } } +static HRESULT write_message( struct channel *channel, WS_MESSAGE *msg, const WS_ELEMENT_DESCRIPTION *desc, + WS_WRITE_OPTION option, const void *body, ULONG size ) +{ + HRESULT hr; + if ((hr = writer_set_lookup( channel->writer, TRUE )) != S_OK) return hr; + if ((hr = WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL )) != S_OK) return hr; + if ((hr = writer_set_lookup( channel->writer, FALSE )) != S_OK) return hr; + if ((hr = WsWriteBody( msg, desc, option, body, size, NULL )) != S_OK) return hr; + return WsWriteEnvelopeEnd( msg, NULL ); +} + /************************************************************************** * WsSendMessage [webservices.@] */ @@ -1339,8 +1340,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS if ((hr = message_set_action( msg, desc->action )) != S_OK) goto done; if ((hr = init_writer( channel )) != S_OK) goto done; - if ((hr = write_message( msg, channel->writer, desc->bodyElementDescription, option, body, size )) != S_OK) - goto done; + if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; hr = send_message( channel, msg ); done: @@ -1380,13 +1380,11 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS if ((hr = message_set_request_id( msg, &req_id )) != S_OK) goto done; if ((hr = init_writer( channel )) != S_OK) goto done; - if ((hr = write_message( msg, channel->writer, desc->bodyElementDescription, option, body, size )) != S_OK) - goto done; + if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; hr = send_message( channel, msg ); done: LeaveCriticalSection( &channel->cs ); - FIXME( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index cce49cce14..bfc3202a64 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -50,7 +50,7 @@ const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; -HRESULT writer_enable_lookup( WS_XML_WRITER * ) DECLSPEC_HIDDEN; +HRESULT writer_set_lookup( WS_XML_WRITER *, BOOL ) DECLSPEC_HIDDEN; const char *debugstr_xmlstr( const WS_XML_STRING * ) DECLSPEC_HIDDEN; WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 33c1be70b5..b3d130a52c 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -4849,7 +4849,7 @@ done: return hr; } -HRESULT writer_enable_lookup( WS_XML_WRITER *handle ) +HRESULT writer_set_lookup( WS_XML_WRITER *handle, BOOL enable ) { struct writer *writer = (struct writer *)handle; @@ -4861,7 +4861,7 @@ HRESULT writer_enable_lookup( WS_XML_WRITER *handle ) return E_INVALIDARG; } - writer->dict_do_lookup = TRUE; + writer->dict_do_lookup = enable; LeaveCriticalSection( &writer->cs ); return S_OK; -- 2.11.0

1 0

[PATCH 3/5] webservices: Implement WsShutdownSessionChannel.
by Hans Leidekker 20 Jun '18

20 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 98 +++++++++++++++++++++++++++++---------- dlls/webservices/tests/channel.c | 12 +++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 87 insertions(+), 26 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 685e13d99d..6c7c8affa3 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -193,6 +193,7 @@ enum session_state { SESSION_STATE_UNINITIALIZED, SESSION_STATE_SETUP_COMPLETE, + SESSION_STATE_SHUTDOWN, }; struct channel @@ -664,6 +665,78 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return hr; } +enum frame_record_type +{ + FRAME_RECORD_TYPE_VERSION, + FRAME_RECORD_TYPE_MODE, + FRAME_RECORD_TYPE_VIA, + FRAME_RECORD_TYPE_KNOWN_ENCODING, + FRAME_RECORD_TYPE_EXTENSIBLE_ENCODING, + FRAME_RECORD_TYPE_UNSIZED_ENVELOPE, + FRAME_RECORD_TYPE_SIZED_ENVELOPE, + FRAME_RECORD_TYPE_END, + FRAME_RECORD_TYPE_FAULT, + FRAME_RECORD_TYPE_UPGRADE_REQUEST, + FRAME_RECORD_TYPE_UPGRADE_RESPONSE, + FRAME_RECORD_TYPE_PREAMBLE_ACK, + FRAME_RECORD_TYPE_PREAMBLE_END, +}; + +static HRESULT send_byte( SOCKET socket, BYTE byte ) +{ + int count = send( socket, (char *)&byte, 1, 0 ); + if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); + if (count != 1) return WS_E_OTHER; + return S_OK; +} + +static HRESULT shutdown_session( struct channel *channel ) +{ + HRESULT hr; + + if (channel->state != WS_CHANNEL_STATE_OPEN || + (channel->type != WS_CHANNEL_TYPE_OUTPUT_SESSION && + channel->type != WS_CHANNEL_TYPE_DUPLEX_SESSION) || + channel->session_state >= SESSION_STATE_SHUTDOWN) return WS_E_INVALID_OPERATION; + + switch (channel->binding) + { + case WS_TCP_CHANNEL_BINDING: + if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_END )) != S_OK) return hr; + channel->session_state = SESSION_STATE_SHUTDOWN; + return S_OK; + + default: + FIXME( "unhandled binding %u\n", channel->binding ); + return E_NOTIMPL; + } +} + +HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + HRESULT hr; + + TRACE( "%p %p %p\n", handle, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!channel) return E_INVALIDARG; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + hr = shutdown_session( channel ); + + LeaveCriticalSection( &channel->cs ); + return hr; +} + static void close_channel( struct channel *channel ) { reset_channel( channel ); @@ -913,14 +986,6 @@ static HRESULT send_message_http( HINTERNET request, BYTE *data, ULONG len ) return S_OK; } -static HRESULT send_byte( SOCKET socket, BYTE byte ) -{ - int count = send( socket, (char *)&byte, 1, 0 ); - if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); - if (count != 1) return WS_E_OTHER; - return S_OK; -} - static HRESULT send_bytes( SOCKET socket, BYTE *bytes, int len ) { int count = send( socket, (char *)bytes, len, 0 ); @@ -944,23 +1009,6 @@ static HRESULT send_size( SOCKET socket, ULONG size ) return E_INVALIDARG; } -enum frame_record_type -{ - FRAME_RECORD_TYPE_VERSION, - FRAME_RECORD_TYPE_MODE, - FRAME_RECORD_TYPE_VIA, - FRAME_RECORD_TYPE_KNOWN_ENCODING, - FRAME_RECORD_TYPE_EXTENSIBLE_ENCODING, - FRAME_RECORD_TYPE_UNSIZED_ENVELOPE, - FRAME_RECORD_TYPE_SIZED_ENVELOPE, - FRAME_RECORD_TYPE_END, - FRAME_RECORD_TYPE_FAULT, - FRAME_RECORD_TYPE_UPGRADE_REQUEST, - FRAME_RECORD_TYPE_UPGRADE_RESPONSE, - FRAME_RECORD_TYPE_PREAMBLE_ACK, - FRAME_RECORD_TYPE_PREAMBLE_END, -}; - static inline ULONG size_length( ULONG size ) { if (size < 0x80) return 1; diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index c995a08829..db17893138 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -496,6 +496,9 @@ static void test_message_read_write( const struct listener_info *info ) hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -627,6 +630,9 @@ static void test_duplex_session( const struct listener_info *info ) hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, fmt, info->port ); addr.url.chars = buf; @@ -655,6 +661,12 @@ static void test_duplex_session( const struct listener_info *info ) err = WaitForSingleObject( info->wait, 3000 ); ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 55f3e2eaac..8ba34b4209 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -158,7 +158,7 @@ @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stdcall WsSetReaderPosition(ptr ptr ptr) @ stdcall WsSetWriterPosition(ptr ptr ptr) -@ stub WsShutdownSessionChannel +@ stdcall WsShutdownSessionChannel(ptr ptr ptr) @ stdcall WsSkipNode(ptr ptr) @ stub WsStartReaderCanonicalization @ stub WsStartWriterCanonicalization diff --git a/include/webservices.h b/include/webservices.h index 1f823ddc27..928819fc3d 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1732,6 +1732,7 @@ HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_ ULONG, WS_ERROR*); HRESULT WINAPI WsSetReaderPosition(WS_XML_READER*, const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsSetWriterPosition(WS_XML_WRITER*, const WS_XML_NODE_POSITION*, WS_ERROR*); +HRESULT WINAPI WsShutdownSessionChannel(WS_CHANNEL*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSkipNode(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsWriteArray(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, WS_VALUE_TYPE, const void*, ULONG, ULONG, ULONG, WS_ERROR*); -- 2.11.0

1 0

[PATCH 2/5] webservices: Avoid accessing the old user buffer in WsSetOutput/ToBuffer.
by Hans Leidekker 20 Jun '18

20 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/writer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 9cba4e60a2..33c1be70b5 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -39,7 +39,7 @@ static const struct prop_desc 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(ULONG), FALSE }, /* WS_XML_WRITER_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 */ @@ -85,6 +85,7 @@ struct writer WS_CHARSET output_charset; WS_XML_WRITER_OUTPUT_TYPE output_type; struct xmlbuf *output_buf; + BOOL output_buf_user; WS_HEAP *output_heap; const WS_XML_DICTIONARY *dict; BOOL dict_do_lookup; @@ -332,7 +333,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT 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) + if (writer->output_buf && !writer->output_buf_user) { free_xmlbuf( writer->output_buf ); } @@ -419,6 +420,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING goto done; } set_output_buffer( writer, xmlbuf ); + writer->output_buf_user = FALSE; break; } default: @@ -472,6 +474,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer writer->output_enc = xmlbuf->encoding; writer->output_charset = xmlbuf->charset; set_output_buffer( writer, xmlbuf ); + writer->output_buf_user = TRUE; if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; else write_insert_bof( writer, node ); -- 2.11.0

1 0

[PATCH 1/5] webservices: Avoid a warning from HeapDestroy.
by Hans Leidekker 20 Jun '18

20 Jun '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 5e1a273329..e44cf72e74 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -216,7 +216,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR static void reset_heap( struct heap *heap ) { - HeapDestroy( heap->handle ); + if (heap->handle) HeapDestroy( heap->handle ); heap->handle = NULL; heap->max_size = heap->allocated = 0; } -- 2.11.0

1 0

[PATCH 6/6] wined3d: Call wined3d_cs_emit_update_sub_resource() directly in buffer_init().
by Józef Kucia 20 Jun '18

20 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/buffer.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4b14d684e542..181be6bbe487 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1325,6 +1325,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id, usage); + struct wined3d_resource *resource = &buffer->resource; + struct wined3d_box box; BOOL dynamic_buffer_ok; HRESULT hr; @@ -1346,7 +1348,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return E_INVALIDARG; } - if (FAILED(hr = resource_init(&buffer->resource, device, WINED3D_RTYPE_BUFFER, format, WINED3D_MULTISAMPLE_NONE, + if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, WINED3D_MULTISAMPLE_NONE, 0, usage, access, size, 1, 1, size, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); @@ -1386,7 +1388,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); } - else if (!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) + else if (!dynamic_buffer_ok && (resource->usage & WINED3DUSAGE_DYNAMIC)) { TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); } @@ -1398,16 +1400,19 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) { ERR("Out of memory.\n"); - buffer_unload(&buffer->resource); - resource_cleanup(&buffer->resource); - wined3d_resource_wait_idle(&buffer->resource); + buffer_unload(resource); + resource_cleanup(resource); + wined3d_resource_wait_idle(resource); return E_OUTOFMEMORY; } buffer->maps_size = 1; if (data) - wined3d_device_update_sub_resource(device, &buffer->resource, - 0, NULL, data->data, data->row_pitch, data->slice_pitch, 0); + { + wined3d_box_set(&box, 0, 0, resource->size, 1, 0, 1); + wined3d_cs_emit_update_sub_resource(device->cs, resource, + 0, &box, data->data, data->row_pitch, data->slice_pitch); + } return WINED3D_OK; } -- 2.16.4

2 1