September 2017 - Wine-Commits

Alexandre Julliard : ntdll: Allocate views out of a memory block instead of using a heap.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: a0f64e1231a88417fe8b6e3eb459b2c8a098aec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f64e1231a88417fe8b6e3eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 6 09:58:18 2017 +0200 ntdll: Allocate views out of a memory block instead of using a heap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 62 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9f1b6da..9a69a15 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -143,8 +143,6 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); #define VIRTUAL_DEBUG_DUMP_VIEW(view) \ do { if (TRACE_ON(virtual)) VIRTUAL_DumpView(view); } while (0) -#define VIRTUAL_HEAP_SIZE (sizeof(void*)*1024*1024) - #ifdef _WIN64 /* on 64-bit the page protection bytes use a 2-level table */ static const size_t pages_vprot_shift = 20; static const size_t pages_vprot_mask = (1 << 20) - 1; @@ -154,7 +152,8 @@ static BYTE **pages_vprot; static BYTE *pages_vprot; #endif -static HANDLE virtual_heap; +static struct file_view *view_block_start, *view_block_end, *next_free_view; +static const size_t view_block_size = 0x100000; static void *preload_reserve_start; static void *preload_reserve_end; static BOOL use_locks; @@ -587,6 +586,30 @@ static inline void unmap_area( void *addr, size_t size ) /*********************************************************************** + * alloc_view + * + * Allocate a new view. The csVirtual section must be held by caller. + */ +static struct file_view *alloc_view(void) +{ + if (next_free_view) + { + struct file_view *ret = next_free_view; + next_free_view = *(struct file_view **)ret; + return ret; + } + if (view_block_start == view_block_end) + { + void *ptr = wine_anon_mmap( NULL, view_block_size, PROT_READ | PROT_WRITE, 0 ); + if (ptr == (void *)-1) return NULL; + view_block_start = ptr; + view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); + } + return view_block_start++; +} + + +/*********************************************************************** * delete_view * * Deletes a view. The csVirtual section must be held by caller. @@ -596,7 +619,8 @@ static void delete_view( struct file_view *view ) /* [in] View */ if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); list_remove( &view->entry ); if (view->mapping) close_handle( view->mapping ); - RtlFreeHeap( virtual_heap, 0, view ); + *(struct file_view **)view = next_free_view; + next_free_view = view; } @@ -618,9 +642,9 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz /* Create the view structure */ - if (!(view = RtlAllocateHeap( virtual_heap, 0, sizeof(*view) ))) + if (!(view = alloc_view())) { - FIXME( "out of memory in virtual heap for %p-%p\n", base, (char *)base + size ); + FIXME( "out of memory for %p-%p\n", base, (char *)base + size ); return STATUS_NO_MEMORY; } @@ -1490,9 +1514,8 @@ static int alloc_virtual_heap( void *base, size_t size, void *arg ) void virtual_init(void) { const char *preload; - struct alloc_virtual_heap alloc_heap; + struct alloc_virtual_heap alloc_views; size_t size; - struct file_view *heap_view; #if !defined(__i386__) && !defined(__x86_64__) page_size = sysconf( _SC_PAGESIZE ); @@ -1518,21 +1541,22 @@ void virtual_init(void) } } - /* try to find space in a reserved area for the virtual heap and pages protection table */ + /* try to find space in a reserved area for the views and pages protection table */ #ifdef _WIN64 pages_vprot_size = ((size_t)address_space_limit >> page_shift >> pages_vprot_shift) + 1; - alloc_heap.size = VIRTUAL_HEAP_SIZE + pages_vprot_size * sizeof(*pages_vprot); + alloc_views.size = view_block_size + pages_vprot_size * sizeof(*pages_vprot); #else - alloc_heap.size = VIRTUAL_HEAP_SIZE + (1U << (32 - page_shift)); + alloc_views.size = view_block_size + (1U << (32 - page_shift)); #endif - if (!wine_mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_heap, 1 )) - alloc_heap.base = wine_anon_mmap( NULL, alloc_heap.size, PROT_READ|PROT_WRITE, 0 ); - - assert( alloc_heap.base != (void *)-1 ); - pages_vprot = (void *)((char *)alloc_heap.base + VIRTUAL_HEAP_SIZE); - virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, alloc_heap.base, VIRTUAL_HEAP_SIZE, - VIRTUAL_HEAP_SIZE, NULL, NULL ); - create_view( &heap_view, alloc_heap.base, alloc_heap.size, VPROT_COMMITTED|VPROT_READ|VPROT_WRITE ); + if (wine_mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) + wine_mmap_remove_reserved_area( alloc_views.base, alloc_views.size, 0 ); + else + alloc_views.base = wine_anon_mmap( NULL, alloc_views.size, PROT_READ | PROT_WRITE, 0 ); + + assert( alloc_views.base != (void *)-1 ); + view_block_start = alloc_views.base; + view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); + pages_vprot = (void *)((char *)alloc_views.base + view_block_size); /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ size = (char *)address_space_start - (char *)0x10000;

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: CopyPalette in PNG decoder.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 2ea95f895be3d07600cc2f8654c7e85ec174b952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea95f895be3d07600cc2f865… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 5 13:57:31 2017 -0500 windowscodecs: Implement IWICBitmapDecoder::CopyPalette in PNG decoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 815125fd..821e2c3 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -857,10 +857,10 @@ static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, } static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, palette); + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface,

1 0

Hans Leidekker : webservices: Include a RelatesTo header in reply messages.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 2946dc71aaf1478d97c1427ef9da69ac4c80b4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2946dc71aaf1478d97c1427ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:14 2017 +0200 webservices: Include a RelatesTo header in reply messages. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 3 + dlls/webservices/msg.c | 161 ++++++++++++++++++++++++++------- dlls/webservices/webservices_private.h | 2 + 3 files changed, 131 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2946dc71aaf1478d97c14…

1 0

Hans Leidekker : webservices: Parse the MessageID header.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: ab522ac59b0c1c73c96e9fed8edf9462559805c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab522ac59b0c1c73c96e9fed8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:13 2017 +0200 webservices: Parse the MessageID header. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 7b7b526..add5526 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -64,6 +64,7 @@ struct msg WS_MESSAGE_INITIALIZATION init; WS_MESSAGE_STATE state; GUID id; + GUID id_req; WS_ENVELOPE_VERSION version_env; WS_ADDRESSING_VERSION version_addr; BOOL is_addressed; @@ -126,6 +127,7 @@ static void reset_msg( struct msg *msg ) msg->state = WS_MESSAGE_STATE_EMPTY; msg->init = 0; UuidCreate( &msg->id ); + memset( &msg->id_req, 0, sizeof(msg->id_req) ); msg->is_addressed = FALSE; heap_free( msg->addr.chars ); msg->addr.chars = NULL; @@ -779,10 +781,31 @@ static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *l return WsXmlStringEquals( elem->localName, localname, NULL ) == S_OK; } -static HRESULT read_envelope_start( WS_XML_READER *reader ) +static HRESULT read_message_id( WS_XML_READER *reader, GUID *ret ) +{ + const WS_XML_NODE *node; + const WS_XML_TEXT_NODE *text; + const WS_XML_UNIQUE_ID_TEXT *id; + HRESULT hr; + + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if ((hr = WsGetReaderNode( reader, &node, NULL )) != S_OK) return hr; + if (node->nodeType != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; + text = (const WS_XML_TEXT_NODE *)node; + if (text->text->textType != WS_XML_TEXT_TYPE_UNIQUE_ID) + { + FIXME( "unhandled text type %u\n", text->text->textType ); + return E_NOTIMPL; + } + id = (const WS_XML_UNIQUE_ID_TEXT *)text->text; + *ret = id->value; + return S_OK; +} + +static HRESULT read_envelope_start( struct msg *msg, WS_XML_READER *reader ) { static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, body = {4, (BYTE *)"Body"}; - static const WS_XML_STRING header = {6, (BYTE *)"Header"}; + static const WS_XML_STRING header = {6, (BYTE *)"Header"}, msgid = {9, (BYTE *)"MessageID"}; HRESULT hr; if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; @@ -793,6 +816,8 @@ static HRESULT read_envelope_start( WS_XML_READER *reader ) for (;;) { if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if (match_current_element( reader, &msgid ) && (hr = read_message_id( reader, &msg->id_req )) != S_OK) + return hr; if (match_current_element( reader, &body )) break; } } @@ -833,7 +858,7 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W return WS_E_INVALID_OPERATION; } - if ((hr = read_envelope_start( reader )) == S_OK && + if ((hr = read_envelope_start( msg, reader )) == S_OK && (hr = create_header_buffer( reader, msg->heap, &msg->buf )) == S_OK) { msg->reader_body = reader;

1 0

Hans Leidekker : webservices: Store the action header as WS_XML_STRING.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 7727e001783c2042c1ed7fb60300e87ce2b3d84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7727e001783c2042c1ed7fb60… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:08 2017 +0200 webservices: Store the action header as WS_XML_STRING. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 8d416eb..37ce3a3 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -68,7 +68,7 @@ struct msg WS_ADDRESSING_VERSION version_addr; BOOL is_addressed; WS_STRING addr; - WS_STRING action; + WS_XML_STRING *action; WS_HEAP *heap; WS_XML_BUFFER *buf; WS_XML_WRITER *writer; @@ -131,9 +131,8 @@ static void reset_msg( struct msg *msg ) msg->addr.chars = NULL; msg->addr.length = 0; - heap_free( msg->action.chars ); - msg->action.chars = NULL; - msg->action.length = 0; + free_xml_string( msg->action ); + msg->action = NULL; WsResetHeap( msg->heap, NULL ); msg->buf = NULL; /* allocated on msg->heap */ @@ -546,13 +545,12 @@ static HRESULT write_headers( struct msg *msg, WS_XML_WRITER *writer, const WS_X if ((hr = WsWriteXmlnsAttribute( writer, prefix_addr, ns_addr, FALSE, NULL )) != S_OK) return hr; if ((hr = WsWriteStartElement( writer, prefix_env, &header, ns_env, NULL )) != S_OK) return hr; - if (msg->action.length) + if (msg->action) { - WS_XML_UTF16_TEXT utf16 = {{WS_XML_TEXT_TYPE_UTF16}, (BYTE *)msg->action.chars, - msg->action.length * sizeof(WCHAR)}; + WS_XML_UTF8_TEXT utf8 = {{WS_XML_TEXT_TYPE_UTF8}, {msg->action->length, msg->action->bytes}}; if ((hr = WsWriteStartElement( writer, prefix_addr, action, ns_addr, NULL )) != S_OK) return hr; if ((hr = write_must_understand( writer, prefix_env, ns_env )) != S_OK) return hr; - if ((hr = WsWriteText( writer, &utf16.text, NULL )) != S_OK) return hr; + if ((hr = WsWriteText( writer, &utf8.text, NULL )) != S_OK) return hr; if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:Action> */ } if (msg->addr.length) @@ -600,7 +598,7 @@ static HRESULT write_headers_transport( struct msg *msg, WS_XML_WRITER *writer, HRESULT hr = S_OK; ULONG i; - if ((msg->header_count || !msg->action.length) && + if ((msg->header_count || !msg->action) && (hr = WsWriteStartElement( writer, prefix, &header, ns, NULL )) != S_OK) return hr; for (i = 0; i < msg->header_count; i++) @@ -609,7 +607,7 @@ static HRESULT write_headers_transport( struct msg *msg, WS_XML_WRITER *writer, if ((hr = WsWriteXmlBuffer( writer, msg->header[i]->u.buf, NULL )) != S_OK) return hr; } - if (msg->header_count || !msg->action.length) hr = WsWriteEndElement( writer, NULL ); /* </s:Header> */ + if (msg->header_count || !msg->action) hr = WsWriteEndElement( writer, NULL ); /* </s:Header> */ return hr; } @@ -1681,12 +1679,13 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { static const WCHAR soapactionW[] = {'S','O','A','P','A','c','t','i','o','n',':',' ',0}; - if (!(len = msg->action.length)) break; + if (!(len = MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, NULL, 0 ))) + break; hr = E_OUTOFMEMORY; if (!(buf = heap_alloc( (len + 3) * sizeof(WCHAR) ))) goto done; buf[0] = '"'; - memcpy( buf + 1, msg->action.chars, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, buf + 1, len ); buf[len + 1] = '"'; buf[len + 2] = 0; @@ -1702,12 +1701,13 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) static const WCHAR actionW[] = {'a','c','t','i','o','n','=','"'}; ULONG len_action = sizeof(actionW)/sizeof(actionW[0]); - if (!(len = msg->action.length)) break; + if (!(len = MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, NULL, 0 ))) + break; hr = E_OUTOFMEMORY; if (!(buf = heap_alloc( (len + len_action + 2) * sizeof(WCHAR) ))) goto done; memcpy( buf, actionW, len_action * sizeof(WCHAR) ); - memcpy( buf + len_action, msg->action.chars, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, buf + len_action, len ); len += len_action; buf[len++] = '"'; buf[len] = 0; @@ -1827,21 +1827,17 @@ HRESULT message_set_action( WS_MESSAGE *handle, const WS_XML_STRING *action ) if (!action || !action->length) { - heap_free( msg->action.chars ); - msg->action.chars = NULL; - msg->action.length = 0; + free_xml_string( msg->action ); + msg->action = NULL; } else { - WCHAR *chars; - int len = MultiByteToWideChar( CP_UTF8, 0, (char *)action->bytes, action->length, NULL, 0 ); - if (!(chars = heap_alloc( len * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; + WS_XML_STRING *str; + if (!(str = dup_xml_string( action ))) hr = E_OUTOFMEMORY; else { - MultiByteToWideChar( CP_UTF8, 0, (char *)action->bytes, action->length, chars, len ); - heap_free( msg->action.chars ); - msg->action.chars = chars; - msg->action.length = len; + free_xml_string( msg->action ); + msg->action = str; } }

1 0

Hans Leidekker : webservices: Return HRESULT from insert_string.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 1a28e34a91b84c8aa6d188a08c398b6436b28045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a28e34a91b84c8aa6d188a08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:07 2017 +0200 webservices: Return HRESULT from insert_string. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 4 ++-- dlls/webservices/string.c | 43 +++++++++++++++++----------------- dlls/webservices/webservices_private.h | 2 +- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 87184c7..1300da8 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1497,10 +1497,10 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic ptr += size; continue; } - if (!insert_string( dict, bytes, size, index, NULL )) + if ((hr = insert_string( dict, bytes, size, index, NULL )) != S_OK) { clear_dict( dict ); - return E_OUTOFMEMORY; + return hr; } ptr += size; } diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 1d1ef61..e53a364 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -87,37 +87,37 @@ int find_string( const struct dictionary *dict, const unsigned char *data, ULONG #define MIN_DICTIONARY_SIZE 256 #define MAX_DICTIONARY_SIZE 2048 -static BOOL grow_dict( struct dictionary *dict, ULONG size ) +static HRESULT grow_dict( struct dictionary *dict, ULONG size ) { WS_XML_STRING *tmp; ULONG new_size, *tmp_sorted; assert( !dict->dict.isConst ); - if (dict->size >= dict->dict.stringCount + size) return TRUE; - if (dict->size + size > MAX_DICTIONARY_SIZE) return FALSE; + if (dict->size >= dict->dict.stringCount + size) return S_OK; + if (dict->size + size > MAX_DICTIONARY_SIZE) return WS_E_QUOTA_EXCEEDED; if (!dict->dict.strings) { new_size = max( MIN_DICTIONARY_SIZE, size ); - if (!(dict->dict.strings = heap_alloc( new_size * sizeof(*dict->dict.strings) ))) return FALSE; + if (!(dict->dict.strings = heap_alloc( new_size * sizeof(*dict->dict.strings) ))) return E_OUTOFMEMORY; if (!(dict->sorted = heap_alloc( new_size * sizeof(*dict->sorted) ))) { heap_free( dict->dict.strings ); dict->dict.strings = NULL; - return FALSE; + return E_OUTOFMEMORY; } dict->size = new_size; - return TRUE; + return S_OK; } new_size = max( dict->size * 2, size ); - if (!(tmp = heap_realloc( dict->dict.strings, new_size * sizeof(*tmp) ))) return FALSE; + if (!(tmp = heap_realloc( dict->dict.strings, new_size * sizeof(*tmp) ))) return E_OUTOFMEMORY; dict->dict.strings = tmp; - if (!(tmp_sorted = heap_realloc( dict->sorted, new_size * sizeof(*tmp_sorted) ))) return FALSE; + if (!(tmp_sorted = heap_realloc( dict->sorted, new_size * sizeof(*tmp_sorted) ))) return E_OUTOFMEMORY; dict->sorted = tmp_sorted; dict->size = new_size; - return TRUE; + return S_OK; } void clear_dict( struct dictionary *dict ) @@ -133,11 +133,13 @@ void clear_dict( struct dictionary *dict ) dict->size = 0; } -BOOL insert_string( struct dictionary *dict, unsigned char *data, ULONG len, int i, ULONG *ret_id ) +HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, int i, ULONG *ret_id ) { ULONG id = dict->dict.stringCount; + HRESULT hr; + assert( !dict->dict.isConst ); - if (!grow_dict( dict, 1 )) return FALSE; + if ((hr = grow_dict( dict, 1 )) != S_OK) return hr; memmove( &dict->sorted[i] + 1, &dict->sorted[i], (dict->dict.stringCount - i) * sizeof(*dict->sorted) ); dict->sorted[i] = id; @@ -147,22 +149,24 @@ BOOL insert_string( struct dictionary *dict, unsigned char *data, ULONG len, int dict->dict.strings[id].id = id; dict->dict.stringCount++; if (ret_id) *ret_id = id; - return TRUE; + return S_OK; } HRESULT CALLBACK insert_string_cb( void *state, const WS_XML_STRING *str, BOOL *found, ULONG *id, WS_ERROR *error ) { struct dictionary *dict = state; int index = find_string( dict, str->bytes, str->length, id ); + HRESULT hr = S_OK; assert( !dict->dict.isConst ); - if (index == -1 || insert_string( dict, str->bytes, str->length, index, id )) *found = TRUE; + if (index == -1 || (hr = insert_string( dict, str->bytes, str->length, index, id )) == S_OK) *found = TRUE; else *found = FALSE; - return S_OK; + return hr; } HRESULT add_xml_string( WS_XML_STRING *str ) { + HRESULT hr = S_OK; int index; ULONG id; @@ -172,17 +176,13 @@ HRESULT add_xml_string( WS_XML_STRING *str ) { heap_free( str->bytes ); *str = dict_builtin.dict.strings[id]; - LeaveCriticalSection( &dict_cs ); - return S_OK; } - if (insert_string( &dict_builtin, str->bytes, str->length, index, &id )) + else if ((hr = insert_string( &dict_builtin, str->bytes, str->length, index, &id )) == S_OK) { *str = dict_builtin.dict.strings[id]; - LeaveCriticalSection( &dict_cs ); - return S_OK; } LeaveCriticalSection( &dict_cs ); - return WS_E_QUOTA_EXCEEDED; + return hr; } WS_XML_STRING *alloc_xml_string( const unsigned char *data, ULONG len ) @@ -214,6 +214,7 @@ WS_XML_STRING *dup_xml_string( const WS_XML_STRING *src ) { WS_XML_STRING *ret; unsigned char *data; + HRESULT hr; int index; ULONG id; @@ -237,7 +238,7 @@ WS_XML_STRING *dup_xml_string( const WS_XML_STRING *src ) return NULL; } memcpy( data, src->bytes, src->length ); - if (insert_string( &dict_builtin, data, src->length, index, &id )) + if ((hr = insert_string( &dict_builtin, data, src->length, index, &id )) == S_OK) { *ret = dict_builtin.dict.strings[id]; LeaveCriticalSection( &dict_cs ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 9572a02..958733c 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -48,7 +48,7 @@ struct dictionary dict_builtin DECLSPEC_HIDDEN; const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; -BOOL insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; +HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; HRESULT CALLBACK insert_string_cb( void *, const WS_XML_STRING *, BOOL *, ULONG *, WS_ERROR * ) DECLSPEC_HIDDEN; void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Implement WsSendReplyMessage.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 19f540dbcb851f698c5718eb9e1255f0ea07074f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f540dbcb851f698c5718eb9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:06 2017 +0200 webservices: Implement WsSendReplyMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5db6f1d..87184c7 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1126,6 +1126,45 @@ done: return hr; } +/************************************************************************** + * WsSendReplyMessage [webservices.@] + */ +HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESSAGE_DESCRIPTION *desc, + WS_WRITE_OPTION option, const void *body, ULONG size, WS_MESSAGE *request, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + HRESULT hr; + + TRACE( "%p %p %p %08x %p %u %p %p %p\n", handle, msg, desc, option, body, size, request, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!channel || !msg || !desc || !request) return E_INVALIDARG; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + if ((hr = WsInitializeMessage( msg, WS_REPLY_MESSAGE, NULL, NULL )) != S_OK) goto done; + if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; + 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; + hr = send_message( channel, msg ); + +done: + LeaveCriticalSection( &channel->cs ); + FIXME( "returning %08x\n", hr ); + return hr; +} + static HRESULT resize_read_buffer( struct channel *channel, ULONG size ) { if (!channel->read_buf) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 5f9cce8..53fe547 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -144,7 +144,7 @@ @ stub WsRevokeSecurityContext @ stub WsSendFaultMessageForError @ stdcall WsSendMessage(ptr ptr ptr long ptr long ptr ptr) -@ stub WsSendReplyMessage +@ stdcall WsSendReplyMessage(ptr ptr ptr long ptr long ptr ptr ptr) @ stdcall WsSetChannelProperty(ptr long ptr long ptr) @ stdcall WsSetErrorProperty(ptr long ptr long) @ stub WsSetFaultErrorDetail

1 0

Hans Leidekker : webservices: Store headers in WsReadEnvelopeStart.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: ffbddae5420e6ae33f76f23a7d2af8a1ab5b0b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbddae5420e6ae33f76f23a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:05 2017 +0200 webservices: Store headers in WsReadEnvelopeStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/heap.c | 15 +++++++++++---- dlls/webservices/msg.c | 4 ++-- dlls/webservices/reader.c | 29 +++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 6 +++++- dlls/webservices/writer.c | 5 +++-- 5 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index a135cff..1104cf0 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -315,21 +315,25 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } #define XML_BUFFER_INITIAL_ALLOCATED_SIZE 256 -struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap, WS_XML_WRITER_ENCODING_TYPE encoding, WS_CHARSET charset ) +struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap, SIZE_T size, WS_XML_WRITER_ENCODING_TYPE encoding, WS_CHARSET charset, + const WS_XML_DICTIONARY *dict_static, WS_XML_DICTIONARY *dict ) { struct xmlbuf *ret; + if (!size) size = XML_BUFFER_INITIAL_ALLOCATED_SIZE; if (!(ret = ws_alloc( heap, sizeof(*ret) ))) return NULL; - if (!(ret->bytes.bytes = ws_alloc( heap, XML_BUFFER_INITIAL_ALLOCATED_SIZE ))) + if (!(ret->bytes.bytes = ws_alloc( heap, size ))) { ws_free( heap, ret, sizeof(*ret) ); return NULL; } ret->heap = heap; - ret->size = XML_BUFFER_INITIAL_ALLOCATED_SIZE; + ret->size = size; ret->bytes.length = 0; ret->encoding = encoding; ret->charset = charset; + ret->dict_static = dict_static; + ret->dict = dict; return ret; } @@ -348,10 +352,13 @@ HRESULT WINAPI WsCreateXmlBuffer( WS_HEAP *heap, const WS_XML_BUFFER_PROPERTY *p { struct xmlbuf *xmlbuf; + TRACE( "%p %p %u %p %p\n", heap, properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (!heap || !handle) return E_INVALIDARG; if (count) FIXME( "properties not implemented\n" ); - if (!(xmlbuf = alloc_xmlbuf( heap, WS_XML_WRITER_ENCODING_TYPE_TEXT, WS_CHARSET_UTF8 ))) + if (!(xmlbuf = alloc_xmlbuf( heap, 0, WS_XML_WRITER_ENCODING_TYPE_TEXT, WS_CHARSET_UTF8, NULL, NULL ))) { return WS_E_QUOTA_EXCEEDED; } diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index d6f0144..8d416eb 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -794,7 +794,6 @@ static HRESULT read_envelope_start( WS_XML_READER *reader ) { for (;;) { - /* FIXME: store headers */ if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; if (match_current_element( reader, &body )) break; } @@ -836,7 +835,8 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W return WS_E_INVALID_OPERATION; } - if ((hr = read_envelope_start( reader )) == S_OK) + if ((hr = read_envelope_start( reader )) == S_OK && + (hr = create_header_buffer( reader, msg->heap, &msg->buf )) == S_OK) { msg->reader_body = reader; msg->state = WS_MESSAGE_STATE_READING; diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0028334..50431bf 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6931,6 +6931,8 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, reader->input_enc = xmlbuf->encoding; reader->input_charset = xmlbuf->charset; + reader->dict_static = xmlbuf->dict_static; + reader->dict = xmlbuf->dict; set_input_buffer( reader, xmlbuf, xmlbuf->bytes.bytes, xmlbuf->bytes.length ); if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; @@ -7268,6 +7270,33 @@ done: return hr; } +HRESULT create_header_buffer( WS_XML_READER *handle, WS_HEAP *heap, WS_XML_BUFFER **ret ) +{ + struct reader *reader = (struct reader *)handle; + HRESULT hr = WS_E_QUOTA_EXCEEDED; + struct xmlbuf *xmlbuf; + + EnterCriticalSection( &reader->cs ); + + if (reader->magic != READER_MAGIC) + { + LeaveCriticalSection( &reader->cs ); + return E_INVALIDARG; + } + + if ((xmlbuf = alloc_xmlbuf( heap, reader->read_pos, reader->input_enc, reader->input_charset, + reader->dict_static, reader->dict ))) + { + memcpy( xmlbuf->bytes.bytes, reader->read_bufptr, reader->read_pos ); + xmlbuf->bytes.length = reader->read_pos; + *ret = (WS_XML_BUFFER *)xmlbuf; + hr = S_OK; + } + + LeaveCriticalSection( &reader->cs ); + return hr; +} + HRESULT get_param_desc( const WS_STRUCT_DESCRIPTION *desc, USHORT index, const WS_FIELD_DESCRIPTION **ret ) { if (index >= desc->fieldCount) return E_INVALIDARG; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 5ce88b2..9572a02 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -25,6 +25,8 @@ struct xmlbuf SIZE_T size; WS_XML_WRITER_ENCODING_TYPE encoding; WS_CHARSET charset; + const WS_XML_DICTIONARY *dict_static; + WS_XML_DICTIONARY *dict; }; void *ws_alloc( WS_HEAP *, SIZE_T ) DECLSPEC_HIDDEN; @@ -32,7 +34,8 @@ void *ws_alloc_zero( WS_HEAP *, SIZE_T ) DECLSPEC_HIDDEN; void *ws_realloc( WS_HEAP *, void *, SIZE_T, SIZE_T ) DECLSPEC_HIDDEN; void *ws_realloc_zero( WS_HEAP *, void *, SIZE_T, SIZE_T ) DECLSPEC_HIDDEN; void ws_free( WS_HEAP *, void *, SIZE_T ) DECLSPEC_HIDDEN; -struct xmlbuf *alloc_xmlbuf( WS_HEAP *, WS_XML_WRITER_ENCODING_TYPE, WS_CHARSET ) DECLSPEC_HIDDEN; +struct xmlbuf *alloc_xmlbuf( WS_HEAP *, SIZE_T, WS_XML_WRITER_ENCODING_TYPE, WS_CHARSET, + const WS_XML_DICTIONARY *, WS_XML_DICTIONARY * ) DECLSPEC_HIDDEN; void free_xmlbuf( struct xmlbuf * ) DECLSPEC_HIDDEN; struct dictionary @@ -62,6 +65,7 @@ void restore_fpword( unsigned short ) DECLSPEC_HIDDEN; ULONG get_type_size( WS_TYPE, const void * ) DECLSPEC_HIDDEN; HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING *, WS_TYPE, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ) DECLSPEC_HIDDEN; +HRESULT create_header_buffer( WS_XML_READER *, WS_HEAP *, WS_XML_BUFFER ** ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 2071a95..7216fc1 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -85,7 +85,7 @@ struct writer WS_XML_WRITER_OUTPUT_TYPE output_type; struct xmlbuf *output_buf; WS_HEAP *output_heap; - WS_XML_DICTIONARY *dict; + const WS_XML_DICTIONARY *dict; WS_DYNAMIC_STRING_CALLBACK dict_cb; void *dict_cb_state; ULONG prop_count; @@ -408,7 +408,8 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING case WS_XML_WRITER_OUTPUT_TYPE_BUFFER: { struct xmlbuf *xmlbuf; - if (!(xmlbuf = alloc_xmlbuf( writer->output_heap, writer->output_enc, writer->output_charset ))) + if (!(xmlbuf = alloc_xmlbuf( writer->output_heap, 0, writer->output_enc, writer->output_charset, + writer->dict, NULL ))) { hr = WS_E_QUOTA_EXCEEDED; goto done;

1 0

Matteo Bruni : d3d9/tests: Add a test for "NULL" FourCC format.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 99168377865927cf4f93d65cfea8d7de7e511018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99168377865927cf4f93d65cf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 6 01:39:16 2017 +0200 d3d9/tests: Add a test for "NULL" FourCC format. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ef91296..822e6e4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16101,7 +16101,7 @@ static void resz_test(void) 0x02000001, 0x800f0800, 0x80e40001, /* mov oC0, r1 */ 0x0000ffff, /* end */ }; - struct + static const struct { float x, y, z; float s, t, p, q; @@ -16113,7 +16113,7 @@ static void resz_test(void) { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; - struct + static const struct { UINT x, y; D3DCOLOR color; @@ -22850,7 +22850,198 @@ static void test_mvp_software_vertex_shaders(void) done: IDirect3D9_Release(d3d); DestroyWindow(window); +} + +static void test_null_format(void) +{ + static const D3DVIEWPORT9 vp_lower = {0, 60, 640, 420, 0.0f, 1.0f}; + static const D3DVIEWPORT9 vp_560 = {0, 180, 560, 300, 0.0f, 1.0f}; + static const D3DVIEWPORT9 vp_full = {0, 0, 640, 480, 0.0f, 1.0f}; + static const DWORD null_fourcc = MAKEFOURCC('N','U','L','L'); + static const struct + { + struct vec3 pos; + DWORD diffuse; + } + quad_partial[] = + { + {{-1.0f, 0.5f, 0.1f}, 0x000000ff}, + {{ 0.5f, 0.5f, 0.1f}, 0x000000ff}, + {{-1.0f, -1.0f, 0.1f}, 0x000000ff}, + {{ 0.5f, -1.0f, 0.1f}, 0x000000ff}, + }, + quad[] = + { + {{-1.0f, 1.0f, 0.5f}, 0x00ff0000}, + {{ 1.0f, 1.0f, 0.5f}, 0x00ff0000}, + {{-1.0f, -1.0f, 0.5f}, 0x00ff0000}, + {{ 1.0f, -1.0f, 0.5f}, 0x00ff0000}, + }, + quad_far[] = + { + {{-1.0f, 1.0f, 1.0f}, 0x0000ff00}, + {{ 1.0f, 1.0f, 1.0f}, 0x0000ff00}, + {{-1.0f, -1.0f, 1.0f}, 0x0000ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0x0000ff00}, + }; + static const struct + { + unsigned int x, y; + D3DCOLOR color; + BOOL todo; + } + expected_colors[] = + { + {200, 30, 0x0000ff00, FALSE}, + {440, 30, 0x0000ff00, FALSE}, + {520, 30, 0x0000ff00, FALSE}, + {600, 30, 0x0000ff00, FALSE}, + {200, 90, 0x00000000, FALSE}, + {440, 90, 0x0000ff00, FALSE}, + {520, 90, 0x0000ff00, FALSE}, + {600, 90, 0x0000ff00, FALSE}, + {200, 150, 0x000000ff, FALSE}, + {440, 150, 0x000000ff, FALSE}, + {520, 150, 0x0000ff00, FALSE}, + {600, 150, 0x0000ff00, FALSE}, + {200, 320, 0x000000ff, FALSE}, + {440, 320, 0x000000ff, FALSE}, + {520, 320, 0x00000000, TRUE}, + {600, 320, 0x0000ff00, FALSE}, + }; + IDirect3DSurface9 *original_rt, *small_rt, *null_rt, *small_null_rt; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + unsigned int i; + D3DCOLOR color; + HWND window; + HRESULT hr; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, null_fourcc))) + { + skip("No NULL format support, skipping NULL test.\n"); + IDirect3D9_Release(d3d); + return; + } + + window = create_window(); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 400, 300, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &small_rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, null_fourcc, + D3DMULTISAMPLE_NONE, 0, FALSE, &null_rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 400, 300, null_fourcc, + D3DMULTISAMPLE_NONE, 0, FALSE, &small_null_rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "Failed to enable depth test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "Failed to set depth function, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable depth write, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + /* Clear extends to viewport size > RT size even if format is not + * "NULL". */ + hr = IDirect3DDevice9_SetRenderTarget(device, 0, small_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetViewport(device, &vp_full); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.2f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, null_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + /* Draw only extends to viewport size > RT size if format is "NULL". */ + hr = IDirect3DDevice9_SetRenderTarget(device, 0, small_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetViewport(device, &vp_lower); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, small_null_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetViewport(device, &vp_560); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad_partial, sizeof(*quad_partial)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad_far, sizeof(*quad_far)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + todo_wine_if(expected_colors[i].todo) ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DSurface9_Release(small_null_rt); + IDirect3DSurface9_Release(null_rt); + IDirect3DSurface9_Release(small_rt); + IDirect3DSurface9_Release(original_rt); + cleanup_device(device); + IDirect3D9_Release(d3d); } START_TEST(visual) @@ -22984,4 +23175,5 @@ START_TEST(visual) test_drawindexedprimitiveup(); test_vertex_texture(); test_mvp_software_vertex_shaders(); + test_null_format(); }

1 0

Alexandre Julliard : ntdll: Don' t do partial writes in virtual_uninterrupted_write_memory.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 3bfd7973a432450492607a4dfe54f774370e9318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfd7973a432450492607a4df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 6 17:16:25 2017 +0200 ntdll: Don't do partial writes in virtual_uninterrupted_write_memory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_i386.c | 7 +++--- dlls/ntdll/virtual.c | 56 ++++++++++++++++-------------------------------- 3 files changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c97b1e1..7b13448 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -171,7 +171,7 @@ extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_st extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; -extern SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_release_address_space(void) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f33c43f..ab8d114 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1808,8 +1808,8 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) if (thunk_len >= sizeof(thunk_copy.t1) && thunk_copy.t1.movl == 0x042444c7 && thunk_copy.t1.jmp == 0xe9) { - if (virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, - &thunk_copy.t1.this, sizeof(DWORD) ) == sizeof(DWORD)) + if (!virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, + &thunk_copy.t1.this, sizeof(DWORD) )) { context->Eip = (DWORD_PTR)(&thunk->t1.func + 1) + thunk_copy.t1.func; TRACE( "emulating ATL thunk type 1 at %p, func=%08x arg=%08x\n", @@ -1856,8 +1856,7 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) stack, sizeof(stack) ) == sizeof(stack) && virtual_uninterrupted_read_memory( (DWORD *)stack[1] + 1, &func, sizeof(DWORD) ) == sizeof(DWORD) && - virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, - &stack[0], sizeof(stack[0]) ) == sizeof(stack[0])) + !virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, &stack[0], sizeof(stack[0]) )) { context->Ecx = stack[0]; context->Eax = stack[1]; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9a69a15..a730417 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1907,54 +1907,36 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T * permissions are checked before accessing each page, to ensure that no * exceptions can happen. */ -SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) +NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) { struct file_view *view; sigset_t sigset; - SIZE_T bytes_written = 0; + NTSTATUS ret = STATUS_ACCESS_VIOLATION; - if (!size) return 0; + if (!size) return STATUS_SUCCESS; server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( addr, size ))) + if ((view = VIRTUAL_FindView( addr, size )) && !(view->protect & VPROT_SYSTEM)) { - if (!(view->protect & VPROT_SYSTEM)) - { - while (bytes_written < size) - { - void *page = ROUND_ADDR( addr, page_mask ); - BYTE vprot = get_page_vprot( page ); - SIZE_T block_size; - - /* If the page is not writable then check for write watches - * before giving up. This can be done without raising a real - * exception. Similar to virtual_handle_fault. */ - if (!(VIRTUAL_GetUnixProt( vprot ) & PROT_WRITE)) - { - if (!(view->protect & VPROT_WRITEWATCH)) - break; - - if (vprot & VPROT_WRITEWATCH) - { - set_page_vprot_bits( page, page_size, 0, VPROT_WRITEWATCH ); - mprotect_range( view, page, page_size, 0, 0 ); - } - /* ignore fault if page is writable now */ - if (!(VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_WRITE)) - break; - } - - block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); - memcpy( addr, buffer, block_size ); + char *page = ROUND_ADDR( addr, page_mask ); + size_t i, total = ROUND_SIZE( addr, size ); - addr = (void *)((char *)addr + block_size); - buffer = (const void *)((const char *)buffer + block_size); - bytes_written += block_size; - } + for (i = 0; i < total; i += page_size) + { + int prot = VIRTUAL_GetUnixProt( get_page_vprot( page + i ) & ~VPROT_WRITEWATCH ); + if (!(prot & PROT_WRITE)) goto done; } + if (view->protect & VPROT_WRITEWATCH) /* enable write access by clearing write watches */ + { + set_page_vprot_bits( addr, size, 0, VPROT_WRITEWATCH ); + mprotect_range( view, addr, size, 0, 0 ); + } + memcpy( addr, buffer, size ); + ret = STATUS_SUCCESS; } +done: server_leave_uninterrupted_section( &csVirtual, &sigset ); - return bytes_written; + return ret; }

1 0