- wine-devel - winehq.org

[PATCH v4] server: Release of related atoms when destroying a, window class
by Ralf Habacker 27 Nov '18

27 Nov '18

1 0

[PATCH v2] server: Release related atoms when destroying a window class
by Ralf Habacker 27 Nov '18

27 Nov '18

3 6

[PATCH v3] server: Release of related atoms when destroying a, window class
by Ralf Habacker 27 Nov '18

27 Nov '18

1 0

[PATCH 6/6] webservices: Add support for stream input.
by Hans Leidekker 27 Nov '18

27 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 202 ++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 106 +++++++++++++++++++++ 2 files changed, 249 insertions(+), 59 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index cbce1f6afb..ba6a951e9c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -390,10 +390,13 @@ struct reader WS_XML_READER_ENCODING_TYPE input_enc; WS_CHARSET input_charset; WS_XML_READER_INPUT_TYPE input_type; + WS_READ_CALLBACK input_cb; + void *input_cb_state; struct xmlbuf *input_buf; const unsigned char *input_data; ULONG input_size; ULONG text_conv_offset; + unsigned char *stream_buf; const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; ULONG prop_count; @@ -515,6 +518,7 @@ static void free_reader( struct reader *reader ) destroy_nodes( reader->root ); clear_prefixes( reader->prefixes, reader->nb_prefixes ); heap_free( reader->prefixes ); + heap_free( reader->stream_buf ); #ifndef __MINGW32__ reader->cs.DebugInfo->Spare[0] = 0; @@ -615,6 +619,29 @@ void WINAPI WsFreeReader( WS_XML_READER *handle ) free_reader( reader ); } +static HRESULT read_more_data( struct reader *reader, ULONG min_size, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + ULONG size = 0, max_size; + + if (reader->read_size - reader->read_pos >= min_size) return S_OK; + if (reader->input_type != WS_XML_READER_INPUT_TYPE_STREAM) return WS_E_INVALID_FORMAT; + if (min_size > reader->input_size) return WS_E_QUOTA_EXCEEDED; + + if (min_size > reader->input_size - reader->read_pos) + { + memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); + reader->read_size -= reader->read_pos; + reader->read_pos = 0; + } + max_size = reader->input_size - reader->read_size; + + reader->input_cb( reader->input_cb_state, reader->stream_buf + reader->read_size, max_size, &size, ctx, error ); + if (size < min_size) return WS_E_QUOTA_EXCEEDED; + reader->read_size += size; + return S_OK; +} + /************************************************************************** * WsFillReader [webservices.@] */ @@ -622,7 +649,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; - HRESULT hr = S_OK; + HRESULT hr; TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -637,9 +664,16 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY return E_INVALIDARG; } - /* FIXME: add support for stream input */ - reader->read_size = min( min_size, reader->input_size ); - reader->read_pos = 0; + if (reader->input_type == WS_XML_READER_INPUT_TYPE_STREAM) + { + hr = read_more_data( reader, min_size, ctx, error ); + } + else + { + reader->read_size = min( min_size, reader->input_size ); + reader->read_pos = 0; + hr = S_OK; + } LeaveCriticalSection( &reader->cs ); TRACE( "returning %08x\n", hr ); @@ -931,7 +965,7 @@ WS_XML_DATETIME_TEXT *alloc_datetime_text( const WS_DATETIME *value ) static inline BOOL read_end_of_data( struct reader *reader ) { - return reader->read_pos >= reader->read_size; + return (read_more_data( reader, 1, NULL, NULL ) != S_OK); } static inline const unsigned char *read_current_ptr( struct reader *reader ) @@ -939,25 +973,35 @@ static inline const unsigned char *read_current_ptr( struct reader *reader ) return &reader->read_bufptr[reader->read_pos]; } +static inline void read_skip( struct reader *reader, unsigned int count ) +{ + assert( reader->read_pos + count <= reader->read_size ); + reader->read_pos += count; +} + static inline HRESULT read_peek( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; - memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); + HRESULT hr; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + memcpy( bytes, read_current_ptr( reader ), len ); return S_OK; } static inline HRESULT read_byte( struct reader *reader, unsigned char *byte ) { - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - *byte = reader->read_bufptr[reader->read_pos++]; + HRESULT hr; + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + *byte = *read_current_ptr( reader ); + read_skip( reader, 1 ); return S_OK; } static inline HRESULT read_bytes( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; - memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); - reader->read_pos += len; + HRESULT hr; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + memcpy( bytes, read_current_ptr( reader ), len ); + read_skip( reader, len ); return S_OK; } @@ -985,20 +1029,22 @@ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, unsigned int *skip ) { unsigned int len; - unsigned char ch = reader->read_bufptr[reader->read_pos]; + unsigned char ch; const unsigned char *end; + HRESULT hr; - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + ch = *read_current_ptr( reader ); if (ch < 0x80) { *ret = ch; *skip = 1; return S_OK; } + len = utf8_length[ch - 0x80]; - if (reader->read_pos + len >= reader->read_size) return WS_E_INVALID_FORMAT; - end = reader->read_bufptr + reader->read_pos + len + 1; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + end = read_current_ptr( reader ) + len + 1; *ret = ch & utf8_mask[len]; switch (len) @@ -1020,12 +1066,6 @@ static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, return WS_E_INVALID_FORMAT; } -static inline void read_skip( struct reader *reader, unsigned int count ) -{ - if (reader->read_pos + count > reader->read_size) return; - reader->read_pos += count; -} - static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1042,16 +1082,22 @@ static inline BOOL read_isspace( unsigned int ch ) static inline void read_skip_whitespace( struct reader *reader ) { - while (reader->read_pos < reader->read_size && read_isspace( reader->read_bufptr[reader->read_pos] )) - reader->read_pos++; + for (;;) + { + if (read_more_data( reader, 1, NULL, NULL ) != S_OK || !read_isspace( *read_current_ptr( reader ) )) break; + read_skip( reader, 1 ); + } } static inline HRESULT read_cmp( struct reader *reader, const char *str, int len ) { - const unsigned char *ptr = read_current_ptr( reader ); + const unsigned char *ptr; + HRESULT hr; if (len < 0) len = strlen( str ); - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + + ptr = read_current_ptr( reader ); while (len--) { if (*str != *ptr) return WS_E_INVALID_FORMAT; @@ -1064,9 +1110,8 @@ static HRESULT read_xmldecl( struct reader *reader ) { HRESULT hr; - if (!reader->read_size) return WS_E_INVALID_FORMAT; - - if (read_cmp( reader, "<", 1 ) != S_OK || read_cmp( reader, "<?", 2 ) != S_OK) + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + if (*read_current_ptr( reader ) != '<' || (hr = read_cmp( reader, "<?", 2 ) != S_OK)) { reader->state = READER_STATE_BOF; return S_OK; @@ -1075,8 +1120,11 @@ static HRESULT read_xmldecl( struct reader *reader ) read_skip( reader, 6 ); /* FIXME: parse attributes */ - while (reader->read_pos < reader->read_size && reader->read_bufptr[reader->read_pos] != '?') - reader->read_pos++; + for (;;) + { + if (read_more_data( reader, 1, NULL, NULL ) != S_OK || *read_current_ptr( reader ) == '?' ) break; + read_skip( reader, 1 ); + } if ((hr = read_cmp( reader, "?>", 2 )) != S_OK) return hr; read_skip( reader, 2 ); @@ -6829,19 +6877,15 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI static inline BOOL is_utf8( const unsigned char *data, ULONG size, ULONG *offset ) { static const char bom[] = {0xef,0xbb,0xbf}; - const unsigned char *p = data; - - return (size >= sizeof(bom) && !memcmp( p, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || + return (size >= sizeof(bom) && !memcmp( data, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || (size > 2 && !(*offset = 0)); } static inline BOOL is_utf16le( const unsigned char *data, ULONG size, ULONG *offset ) { static const char bom[] = {0xff,0xfe}; - const unsigned char *p = data; - - return (size >= sizeof(bom) && !memcmp( p, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || - (size >= 4 && p[0] == '<' && !p[1] && !(*offset = 0)); + return (size >= sizeof(bom) && !memcmp( data, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || + (size >= 4 && data[0] == '<' && !data[1] && !(*offset = 0)); } static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG *offset ) @@ -6862,10 +6906,10 @@ static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG * return ret; } -static void set_input_buffer( struct reader *reader, struct xmlbuf *buf, const unsigned char *data, ULONG size ) +static void set_input_buffer( struct reader *reader, const unsigned char *data, ULONG size ) { reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; - reader->input_buf = buf; + reader->input_buf = NULL; reader->input_data = data; reader->input_size = size; @@ -6876,6 +6920,28 @@ static void set_input_buffer( struct reader *reader, struct xmlbuf *buf, const u reader->text_conv_offset = 0; } +#define STREAM_BUFSIZE 4096 +static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, void *state ) +{ + reader->input_type = WS_XML_READER_INPUT_TYPE_STREAM; + reader->input_cb = callback; + reader->input_cb_state = state; + reader->input_buf = NULL; + reader->input_data = reader->stream_buf; + reader->input_size = STREAM_BUFSIZE; + + if (reader->read_pos >= reader->read_size) reader->read_size = 0; + else + { + memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); + reader->read_size -= reader->read_pos; + } + reader->read_pos = 0; + reader->read_bufptr = reader->input_data; + + reader->text_conv_offset = 0; +} + /************************************************************************** * WsSetInput [webservices.@] */ @@ -6914,19 +6980,14 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { case WS_XML_READER_ENCODING_TYPE_TEXT: { - WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; - - if (input->inputType != WS_XML_READER_INPUT_TYPE_BUFFER) + if (input->inputType == WS_XML_READER_INPUT_TYPE_BUFFER) { - FIXME( "charset detection on input type %u not supported\n", input->inputType ); - hr = E_NOTIMPL; - goto done; + WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; + WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + if (text->charSet != WS_CHARSET_AUTO) reader->input_charset = text->charSet; + else reader->input_charset = detect_charset( buf->encodedData, buf->encodedDataSize, &offset ); } - if (text->charSet != WS_CHARSET_AUTO) reader->input_charset = text->charSet; - else reader->input_charset = detect_charset( buf->encodedData, buf->encodedDataSize, &offset ); - reader->input_enc = WS_XML_READER_ENCODING_TYPE_TEXT; break; } @@ -6950,8 +7011,18 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * case WS_XML_READER_INPUT_TYPE_BUFFER: { WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; - set_input_buffer( reader, NULL, (const unsigned char *)buf->encodedData + offset, - buf->encodedDataSize - offset ); + set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); + break; + } + case WS_XML_READER_INPUT_TYPE_STREAM: + { + WS_XML_READER_STREAM_INPUT *stream = (WS_XML_READER_STREAM_INPUT *)input; + if (!reader->stream_buf && !(reader->stream_buf = heap_alloc( STREAM_BUFSIZE ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + set_input_stream( reader, stream->readCallback, stream->readCallbackState ); break; } default: @@ -6969,6 +7040,24 @@ done: return hr; } +static void set_input_xml_buffer( struct reader *reader, struct xmlbuf *buf ) +{ + reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; + reader->input_buf = buf; + reader->input_enc = buf->encoding; + reader->input_charset = buf->charset; + reader->input_data = buf->bytes.bytes; + reader->input_size = buf->bytes.length; + reader->dict_static = buf->dict_static; + reader->dict = buf->dict; + + reader->read_size = reader->input_size; + reader->read_pos = 0; + reader->read_bufptr = reader->input_data; + + reader->text_conv_offset = 0; +} + /************************************************************************** * WsSetInputToBuffer [webservices.@] */ @@ -7003,12 +7092,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, } if ((hr = init_reader( reader )) != S_OK) goto done; - - 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 ); + set_input_xml_buffer( reader, xmlbuf ); if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; else read_insert_bof( reader, node ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index b21e8396be..2b0475fddf 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -6689,6 +6689,111 @@ static void test_empty_text_field(void) WsFreeHeap( heap ); } +static const char stream_utf8[] = {0xef,0xbb,0xbf,'<','t','/','>',0}; +static const struct stream_test +{ + const char *xml; + HRESULT hr; + int todo; +} +stream_tests[] = +{ + { "", WS_E_QUOTA_EXCEEDED }, + { "<?xml version=\"1.0\" encoding=\"utf-8\"?><t/>", S_OK }, + { "<t/>", S_OK }, + { stream_utf8, S_OK, 1 }, +}; + +static CALLBACK HRESULT read_callback( void *state, void *buf, ULONG buflen, ULONG *retlen, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct stream_test *test = state; + ULONG len = strlen( test->xml ); + + ok( state != NULL, "NULL state\n" ); + ok( buf != NULL, "NULL buf\n" ); + ok( buflen > 0, "zero buflen\n" ); + ok( retlen != NULL, "NULL retlen\n" ); + if (buflen < len) return WS_E_QUOTA_EXCEEDED; + memcpy( buf, test->xml, len ); + *retlen = len; + return S_OK; +} + +static void test_stream_input(void) +{ + static WS_XML_STRING str_ns = {0, NULL}, str_t = {1, (BYTE *)"t"}; + WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}}; + WS_XML_READER_STREAM_INPUT stream; + WS_XML_READER *reader; + const WS_XML_NODE *node; + WS_CHARSET charset; + HRESULT hr; + BOOL found; + ULONG i, size; + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + stream.input.inputType = WS_XML_READER_INPUT_TYPE_STREAM; + stream.readCallback = read_callback; + stream.readCallbackState = (void *)&stream_tests[2]; + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + size = sizeof(charset); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); + todo_wine ok( hr == WS_E_QUOTA_EXCEEDED, "got %08x\n", hr ); + + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, strlen(stream_tests[2].xml), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + charset = 0xdeadbeef; + size = sizeof(charset); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); + + found = -1; + hr = WsReadToStartElement( reader, &str_t, &str_ns, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (i = 0; i < ARRAY_SIZE(stream_tests); i++) + { + stream.readCallbackState = (void *)&stream_tests[i]; + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsFillReader( reader, strlen( stream_tests[i].xml ), NULL, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + found = -1; + hr = WsReadToStartElement( reader, &str_t, &str_ns, &found, NULL ); + todo_wine_if(stream_tests[i].todo) ok( hr == stream_tests[i].hr, "%u: got %08x\n", i, hr ); + if (hr == S_OK) + { + ok( found == TRUE, "%u: got %d\n", i, found ); + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "%u: got %u\n", i, node->nodeType ); + } + } + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -6738,4 +6843,5 @@ START_TEST(reader) test_float(); test_repeating_element_choice(); test_empty_text_field(); + test_stream_input(); } -- 2.11.0

1 0

[PATCH 5/6] webservices: Return HRESULT from read_utf8_char.
by Hans Leidekker 27 Nov '18

27 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 57 +++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ff19254640..cbce1f6afb 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -982,41 +982,42 @@ static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; /* minimum Unicode value depending on UTF-8 sequence length */ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; -static inline unsigned int read_utf8_char( struct reader *reader, unsigned int *skip ) +static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, unsigned int *skip ) { - unsigned int len, res; + unsigned int len; unsigned char ch = reader->read_bufptr[reader->read_pos]; const unsigned char *end; - if (reader->read_pos >= reader->read_size) return 0; + if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; if (ch < 0x80) { + *ret = ch; *skip = 1; - return ch; + return S_OK; } len = utf8_length[ch - 0x80]; - if (reader->read_pos + len >= reader->read_size) return 0; + if (reader->read_pos + len >= reader->read_size) return WS_E_INVALID_FORMAT; end = reader->read_bufptr + reader->read_pos + len + 1; - res = ch & utf8_mask[len]; + *ret = ch & utf8_mask[len]; switch (len) { case 3: if ((ch = end[-3] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 2: if ((ch = end[-2] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 1: if ((ch = end[-1] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; - if (res < utf8_minval[len]) break; + *ret = (*ret << 6) | ch; + if (*ret < utf8_minval[len]) break; *skip = len + 1; - return res; + return S_OK; } - return 0; + return WS_E_INVALID_FORMAT; } static inline void read_skip( struct reader *reader, unsigned int count ) @@ -1303,14 +1304,14 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT read_skip_whitespace( reader ); if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; - quote = read_utf8_char( reader, &skip ); + if ((hr = read_utf8_char( reader, &quote, &skip )) != S_OK) return hr; read_skip( reader, 1 ); len = 0; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == quote) break; read_skip( reader, skip ); len += skip; @@ -1651,19 +1652,23 @@ static HRESULT read_attribute_text( struct reader *reader, WS_XML_ATTRIBUTE **re unsigned int len = 0, ch, skip; const unsigned char *start; WS_XML_STRING *prefix, *localname; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if ((hr = parse_qname( start, len, &prefix, &localname )) != S_OK) goto error; if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) @@ -1953,16 +1958,19 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; - hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if (!(parent = find_parent( reader ))) goto error; if ((hr = parse_qname( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; @@ -2107,7 +2115,7 @@ static HRESULT read_text_text( struct reader *reader ) for (;;) { if (read_end_of_data( reader )) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '<') break; read_skip( reader, skip ); len += skip; @@ -2741,7 +2749,7 @@ static HRESULT read_endelement_text( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '>') { read_skip( reader, 1 ); @@ -2821,7 +2829,7 @@ static HRESULT read_comment_text( struct reader *reader ) read_skip( reader, 3 ); break; } - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; } @@ -2907,12 +2915,13 @@ static HRESULT read_cdata( struct reader *reader ) struct node *node; WS_XML_TEXT_NODE *text; WS_XML_UTF8_TEXT *utf8; + HRESULT hr; start = read_current_ptr( reader ); for (;;) { if (read_cmp( reader, "]]>", 3 ) == S_OK) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; } -- 2.11.0

1 0

[PATCH 4/6] webservices: Get rid of read_rewind.
by Hans Leidekker 27 Nov '18

27 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b573153c97..ff19254640 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -939,10 +939,10 @@ static inline const unsigned char *read_current_ptr( struct reader *reader ) return &reader->read_bufptr[reader->read_pos]; } -static inline HRESULT read_peek( struct reader *reader, unsigned char *byte ) +static inline HRESULT read_peek( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - *byte = reader->read_bufptr[reader->read_pos]; + if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; + memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); return S_OK; } @@ -1025,11 +1025,6 @@ static inline void read_skip( struct reader *reader, unsigned int count ) reader->read_pos += count; } -static inline void read_rewind( struct reader *reader, unsigned int count ) -{ - reader->read_pos -= count; -} - static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1938,6 +1933,7 @@ static HRESULT read_element_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; + unsigned char buf[2]; struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; HRESULT hr; @@ -1950,13 +1946,9 @@ static HRESULT read_element_text( struct reader *reader ) return S_OK; } - if ((hr = read_cmp( reader, "<", 1 )) != S_OK) return hr; + if ((hr = read_peek( reader, buf, 2 )) != S_OK) return hr; + if (buf[0] != '<' || !read_isnamechar( buf[1] )) return WS_E_INVALID_FORMAT; read_skip( reader, 1 ); - if (!read_isnamechar( read_utf8_char( reader, &skip ))) - { - read_rewind( reader, 1 ); - return WS_E_INVALID_FORMAT; - } if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2000,7 +1992,7 @@ static HRESULT read_attributes_bin( struct reader *reader, WS_XML_ELEMENT_NODE * reader->current_attr = 0; for (;;) { - if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) break; if ((hr = read_attribute_bin( reader, &attr )) != S_OK) return hr; if ((hr = append_attribute( elem, attr )) != S_OK) @@ -2405,7 +2397,7 @@ static HRESULT read_text_bytes( struct reader *reader, unsigned char type ) node->flags |= NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT; break; } - if ((hr = read_peek( reader, &type )) != S_OK) goto error; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) goto error; if (type < RECORD_BYTES8_TEXT || type > RECORD_BYTES32_TEXT_WITH_ENDELEMENT) break; read_skip( reader, 1 ); } @@ -3008,7 +3000,7 @@ static HRESULT read_node_bin( struct reader *reader ) return S_OK; } - if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type == RECORD_ENDELEMENT) { return read_endelement_bin( reader ); -- 2.11.0

1 0

[PATCH 3/6] webservices: Return HRESULT from read_cmp.
by Hans Leidekker 27 Nov '18

27 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 87 +++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8cf3f24d29..b573153c97 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1050,37 +1050,39 @@ static inline void read_skip_whitespace( struct reader *reader ) reader->read_pos++; } -static inline int read_cmp( struct reader *reader, const char *str, int len ) +static inline HRESULT read_cmp( struct reader *reader, const char *str, int len ) { const unsigned char *ptr = read_current_ptr( reader ); if (len < 0) len = strlen( str ); - if (reader->read_pos + len > reader->read_size) return -1; + if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; while (len--) { - if (*str != *ptr) return *ptr - *str; + if (*str != *ptr) return WS_E_INVALID_FORMAT; str++; ptr++; } - return 0; + return S_OK; } static HRESULT read_xmldecl( struct reader *reader ) { + HRESULT hr; + if (!reader->read_size) return WS_E_INVALID_FORMAT; - if (read_cmp( reader, "<", 1 ) || read_cmp( reader, "<?", 2 )) + if (read_cmp( reader, "<", 1 ) != S_OK || read_cmp( reader, "<?", 2 ) != S_OK) { reader->state = READER_STATE_BOF; return S_OK; } - if (read_cmp( reader, "<?xml ", 6 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<?xml ", 6 )) != S_OK) return hr; read_skip( reader, 6 ); /* FIXME: parse attributes */ while (reader->read_pos < reader->read_size && reader->read_bufptr[reader->read_pos] != '?') reader->read_pos++; - if (read_cmp( reader, "?>", 2 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "?>", 2 )) != S_OK) return hr; read_skip( reader, 2 ); reader->state = READER_STATE_BOF; @@ -1295,17 +1297,17 @@ static HRESULT decode_text( const unsigned char *str, ULONG len, unsigned char * static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUTE *attr ) { - WS_XML_UTF8_TEXT *utf8 = NULL; + WS_XML_UTF8_TEXT *utf8; unsigned int len, ch, skip, quote; const unsigned char *start; - HRESULT hr = E_OUTOFMEMORY; + HRESULT hr; read_skip_whitespace( reader ); - if (read_cmp( reader, "=", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "=", 1 )) != S_OK) return hr; read_skip( reader, 1 ); read_skip_whitespace( reader ); - if (read_cmp( reader, "\"", 1 ) && read_cmp( reader, "'", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; quote = read_utf8_char( reader, &skip ); read_skip( reader, 1 ); @@ -1322,27 +1324,23 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT if (attr->isXmlNs) { - if (!(attr->ns = alloc_xml_string( start, len ))) goto error; - if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; - if (!(utf8 = alloc_utf8_text( NULL, 0 ))) - { - hr = E_OUTOFMEMORY; - goto error; - } + if (!(attr->ns = alloc_xml_string( start, len ))) return E_OUTOFMEMORY; + if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) return hr; + if (!(utf8 = alloc_utf8_text( NULL, 0 ))) return E_OUTOFMEMORY; } else { - if (!(utf8 = alloc_utf8_text( NULL, len ))) goto error; - if ((hr = decode_text( start, len, utf8->value.bytes, &utf8->value.length )) != S_OK) goto error; + if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; + if ((hr = decode_text( start, len, utf8->value.bytes, &utf8->value.length )) != S_OK) + { + heap_free( utf8 ); + return hr; + } } attr->value = &utf8->text; attr->singleQuote = (quote == '\''); return S_OK; - -error: - heap_free( utf8 ); - return hr; } static inline BOOL is_text_type( unsigned char type ) @@ -1924,7 +1922,7 @@ static HRESULT read_attributes_text( struct reader *reader, WS_XML_ELEMENT_NODE for (;;) { read_skip_whitespace( reader ); - if (!read_cmp( reader, ">", 1 ) || !read_cmp( reader, "/>", 2 )) break; + if (read_cmp( reader, ">", 1 ) == S_OK || read_cmp( reader, "/>", 2 ) == S_OK) break; if ((hr = read_attribute_text( reader, &attr )) != S_OK) return hr; if ((hr = append_attribute( elem, attr )) != S_OK) { @@ -1942,7 +1940,7 @@ static HRESULT read_element_text( struct reader *reader ) const unsigned char *start; struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (read_end_of_data( reader )) { @@ -1952,7 +1950,7 @@ static HRESULT read_element_text( struct reader *reader ) return S_OK; } - if (read_cmp( reader, "<", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<", 1 )) != S_OK) return hr; read_skip( reader, 1 ); if (!read_isnamechar( read_utf8_char( reader, &skip ))) { @@ -1963,6 +1961,7 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; + hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { @@ -2609,7 +2608,7 @@ static HRESULT read_node_text( struct reader * ); static HRESULT read_startelement_text( struct reader *reader ) { read_skip_whitespace( reader ); - if (!read_cmp( reader, "/>", 2 )) + if (read_cmp( reader, "/>", 2 ) == S_OK) { read_skip( reader, 2 ); reader->current = LIST_ENTRY( list_tail( &reader->current->children ), struct node, entry ); @@ -2617,7 +2616,7 @@ static HRESULT read_startelement_text( struct reader *reader ) reader->state = READER_STATE_ENDELEMENT; return S_OK; } - else if (!read_cmp( reader, ">", 1 )) + else if (read_cmp( reader, ">", 1 ) == S_OK) { read_skip( reader, 1 ); return read_node_text( reader ); @@ -2744,7 +2743,7 @@ static HRESULT read_endelement_text( struct reader *reader ) WS_XML_STRING prefix, localname; HRESULT hr; - if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "</", 2 )) != S_OK) return hr; read_skip( reader, 2 ); start = read_current_ptr( reader ); @@ -2817,14 +2816,15 @@ static HRESULT read_comment_text( struct reader *reader ) const unsigned char *start; struct node *node, *parent; WS_XML_COMMENT_NODE *comment; + HRESULT hr; - if (read_cmp( reader, "", 3 )) + if (read_cmp( reader, "-->", 3 ) == S_OK) { read_skip( reader, 3 ); break; @@ -2887,8 +2887,9 @@ static HRESULT read_comment_bin( struct reader *reader ) static HRESULT read_startcdata( struct reader *reader ) { struct node *node, *endnode, *parent; + HRESULT hr; - if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<![CDATA[", 9 )) != S_OK) return hr; read_skip( reader, 9 ); if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2918,7 +2919,7 @@ static HRESULT read_cdata( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!read_cmp( reader, "]]>", 3 )) break; + if (read_cmp( reader, "]]>", 3 ) == S_OK) break; if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; read_skip( reader, skip ); len += skip; @@ -2941,8 +2942,9 @@ static HRESULT read_cdata( struct reader *reader ) static HRESULT read_endcdata( struct reader *reader ) { struct node *parent; + HRESULT hr; - if (read_cmp( reader, "]]>", 3 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "]]>", 3 )) != S_OK) return hr; read_skip( reader, 3 ); if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT) parent = reader->current->parent; @@ -2969,16 +2971,19 @@ static HRESULT read_node_text( struct reader *reader ) } if (reader->state == READER_STATE_STARTCDATA) return read_cdata( reader ); else if (reader->state == READER_STATE_CDATA) return read_endcdata( reader ); - else if (!read_cmp( reader, "<?", 2 )) + else if (read_cmp( reader, "<?", 2 ) == S_OK) { hr = read_xmldecl( reader ); if (FAILED( hr )) return hr; } - else if (!read_cmp( reader, "</", 2 )) return read_endelement_text( reader ); - else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); - else if (!read_cmp( reader, "<!--", 4 )) return read_comment_text( reader ); - else if (!read_cmp( reader, "<", 1 )) return read_element_text( reader ); - else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement_text( reader ); + else if (read_cmp( reader, "</", 2 ) == S_OK) return read_endelement_text( reader ); + else if (read_cmp( reader, "<![CDATA[", 9 ) == S_OK) return read_startcdata( reader ); + else if (read_cmp( reader, "<!--", 4 ) == S_OK) return read_comment_text( reader ); + else if (read_cmp( reader, "<", 1 ) == S_OK) return read_element_text( reader ); + else if (read_cmp( reader, "/>", 2 ) == S_OK || read_cmp( reader, ">", 1 ) == S_OK) + { + return read_startelement_text( reader ); + } else return read_text_text( reader ); } } -- 2.11.0

1 0

[PATCH 2/6] webservices: Call WsReadEndElement just once in WsReadEnvelopeEnd.
by Hans Leidekker 27 Nov '18

27 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/msg.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index a53fd92e2e..e28baa2693 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -938,13 +938,6 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W return hr; } -static HRESULT read_envelope_end( WS_XML_READER *reader ) -{ - HRESULT hr; - if ((hr = WsReadEndElement( reader, NULL )) != S_OK) return hr; /* </s:Body> */ - return WsReadEndElement( reader, NULL ); /* </s:Envelope> */ -} - /************************************************************************** * WsReadEnvelopeEnd [webservices.@] */ @@ -967,7 +960,7 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) } if (msg->state != WS_MESSAGE_STATE_READING) hr = WS_E_INVALID_OPERATION; - else if ((hr = read_envelope_end( msg->reader_body )) == S_OK) + else if ((hr = WsReadEndElement( msg->reader_body, NULL )) == S_OK) msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs ); -- 2.11.0

1 0

[PATCH 1/6] webservices: Use set_blocking in more places.
by Hans Leidekker 27 Nov '18

27 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b945c7f55a..5394aa6c28 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2245,7 +2245,6 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr = S_OK; if (WSAEventSelect( socket, handles[0], FD_ACCEPT )) return HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2256,7 +2255,7 @@ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *r if ((*ret = accept( socket, NULL, NULL )) != -1) { WSAEventSelect( *ret, NULL, 0 ); - ioctlsocket( *ret, FIONBIO, &nonblocking ); + set_blocking( *ret, TRUE ); break; } hr = HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2296,7 +2295,6 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr; if (WSAEventSelect( socket, handles[0], FD_READ )) return HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2317,7 +2315,7 @@ static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) } WSAEventSelect( socket, NULL, 0 ); - ioctlsocket( socket, FIONBIO, &nonblocking ); + set_blocking( socket, TRUE ); return hr; } -- 2.11.0

1 0

[PATCH 3/3] user32: Add support for navigating a group of radio buttons using a keyboard.
by Dmitry Timoshkov 27 Nov '18

27 Nov '18

The patch approximates the behaviour observed in the message tests but still doesn't make the message tests pass without failures. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/dialog.c | 12 ++++++++++-- dlls/user32/tests/msg.c | 7 ------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c5c646e0b1..c47bd571ae 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1237,8 +1237,16 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) if (!(dlgCode & DLGC_WANTARROWS)) { BOOL fPrevious = (msg->wParam == VK_LEFT || msg->wParam == VK_UP); - HWND hwndNext = GetNextDlgGroupItem (hwndDlg, GetFocus(), fPrevious ); - SendMessageW( hwndDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); + HWND hwndNext = GetNextDlgGroupItem( hwndDlg, msg->hwnd, fPrevious ); + if (hwndNext && SendMessageW( hwndNext, WM_GETDLGCODE, msg->wParam, (LPARAM)msg ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + { + SetFocus( hwndNext ); + if ((GetWindowLongW( hwndNext, GWL_STYLE ) & BS_TYPEMASK) == BS_AUTORADIOBUTTON && + SendMessageW( hwndNext, BM_GETCHECK, 0, 0 ) != BST_CHECKED) + SendMessageW( hwndNext, BM_CLICK, 1, 0 ); + } + else + SendMessageW( hwndDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); return TRUE; } break; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6e62873023..f78858f4d4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7057,11 +7057,9 @@ if (0) /* actual message sequence is different on every run in some Windows setu while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_DOWN_dialog, "IsDialogMessage(VK_DOWN)", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); GetWindowRect(radio1, &rc); @@ -7076,11 +7074,9 @@ todo_wine while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_DOWN_radio3, "down to radio3", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); flush_events(); @@ -7097,11 +7093,9 @@ todo_wine while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(auto_radio_button_VK_UP_radio1, "up to radio1", TRUE); -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); hwnd = GetFocus(); -todo_wine ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); flush_events(); @@ -7119,7 +7113,6 @@ todo_wine if (0) /* actual message sequence is different on every run in some Windows setups */ ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #3", FALSE); /* what really matters is that nothing has changed */ -todo_wine test_radio(radio1, 1, radio2, 0, radio3, 0); log_all_parent_messages--; -- 2.17.1

2 1

[PATCH 2/3] user32/tests: Add a test for navigating a group of buttons using keyboard events.
by Dmitry Timoshkov 27 Nov '18

27 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 316 ++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 11 ++ 2 files changed, 327 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index baa8fe5286..6e62873023 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6726,6 +6726,132 @@ static const struct message auto_radio_button_BM_CLICK[] = { 0 } }; +static const struct message auto_radio_button_VK_UP_child[] = +{ + { WM_KEYDOWN, sent|wparam|lparam, VK_UP, 0 }, + { WM_KEYUP, sent|wparam|lparam, VK_UP, 0 }, + { 0 } +}; + +static const struct message auto_radio_button_VK_UP_parent[] = +{ + { WM_KEYDOWN, sent|wparam|lparam|parent, VK_UP, 0 }, + { WM_KEYUP, sent|wparam|lparam|parent, VK_UP, 0 }, + { 0 } +}; + +static const struct message auto_radio_button_VK_UP_dialog[] = +{ + { WM_GETDLGCODE, sent|parent, 0, 0 }, + + /* optional trailer seen on some windows setups */ + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_CTLCOLORBTN, sent|parent|optional }, + { WM_CTLCOLORBTN, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { 0 } +}; + +static const struct message auto_radio_button_VK_DOWN_dialog[] = +{ + { WM_GETDLGCODE, sent|parent, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, MAKELPARAM(WM_KEYDOWN, VK_DOWN) }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent, 0, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO3, BN_KILLFOCUS) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent, 0, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_SETFOCUS) }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_CLICKED) }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, 0 }, + { WM_GETDLGCODE, sent|parent, 0, 0 }, + { DM_GETDEFID, sent|parent, 0, 0 }, + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO1 }, + { BM_CLICK, sent|wparam|lparam, 1, 0 }, + { WM_LBUTTONDOWN, sent|wparam|lparam|defwinproc, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO1 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO1 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO1, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO1 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO3, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO3 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_TEXT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO2, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO2 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_CLICKED) }, + { WM_NCHITTEST, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_SETCURSOR, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_MOUSEMOVE, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_PAINT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; + +static const struct message auto_radio_button_VK_DOWN_radio3[] = +{ + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO1 }, + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO2 }, + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO3 }, + { WM_GETDLGCODE, sent|parent, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, MAKELPARAM(WM_KEYDOWN, VK_DOWN) }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|parent, 0, 0 }, + { WM_USER, sent|parent, 0, 0 }, + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO1 }, + { 0 } +}; + +static const struct message auto_radio_button_VK_UP_radio1[] = +{ + { WM_GETDLGCODE, sent|parent, 0, 0 }, + { 0 } +}; + static INT_PTR WINAPI radio_test_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { ParentMsgCheckProcA(hwnd, msg, wp, lp); @@ -6812,6 +6938,195 @@ static void test_autoradio_BM_CLICK(void) DestroyWindow(parent); } +#define test_radio(r1, s1, r2, s2, r3, s3) test_radio_dbg(r1, s1, r2, s2, r3, s3, __LINE__) +static void test_radio_dbg(HWND radio1, int state1, HWND radio2, int state2, HWND radio3, int state3, int line) +{ + DWORD ret; + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok_(__FILE__,line)(ret == state1 ? BST_CHECKED : BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok_(__FILE__,line)(ret == state2 ? BST_CHECKED : BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok_(__FILE__,line)(ret == state3 ? BST_CHECKED : BST_UNCHECKED, "got %08x\n", ret); +} + +static void set_radio(HWND radio1, int state1, HWND radio2, int state2, HWND radio3, int state3) +{ + SendMessageA(radio1, BM_SETCHECK, state1 ? BST_CHECKED : BST_UNCHECKED, 0); + SendMessageA(radio2, BM_SETCHECK, state2 ? BST_CHECKED : BST_UNCHECKED, 0); + SendMessageA(radio3, BM_SETCHECK, state3 ? BST_CHECKED : BST_UNCHECKED, 0); +} + +static void test_autoradio_kbd_move(void) +{ + HWND parent, radio1, radio2, radio3, hwnd; + RECT rc; + MSG msg; + DWORD ret; + + subclass_button(); + + parent = CreateDialogParamA(0, "AUTORADIO_TEST_DIALOG_2", 0, radio_test_dlg_proc, 0); + ok(parent != 0, "failed to create parent window\n"); + + radio1 = GetDlgItem(parent, ID_RADIO1); + radio2 = GetDlgItem(parent, ID_RADIO2); + radio3 = GetDlgItem(parent, ID_RADIO3); + + flush_events(); + flush_sequence(); + + test_radio(radio1, 0, radio2, 0, radio3, 0); + set_radio(radio1, 1, radio2, 1, radio3, 1); + test_radio(radio1, 1, radio2, 1, radio3, 1); + + SetFocus(radio3); + + flush_events(); + flush_sequence(); + + log_all_parent_messages++; + + SendMessageA(radio3, WM_KEYDOWN, VK_UP, 0); + SendMessageA(radio3, WM_KEYUP, VK_UP, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_UP_child, "press/release VK_UP on auto-radio button", FALSE); + + test_radio(radio1, 1, radio2, 1, radio3, 1); + + flush_events(); + flush_sequence(); + + DefDlgProcA(parent, WM_KEYDOWN, VK_UP, 0); + DefDlgProcA(parent, WM_KEYUP, VK_UP, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_UP_parent, "press/release VK_UP on dialog", FALSE); + + test_radio(radio1, 1, radio2, 1, radio3, 1); + + SetFocus(radio3); + GetWindowRect(radio3, &rc); + + flush_events(); + flush_sequence(); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_UP; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); +if (0) /* actual message sequence is different on every run in some Windows setups */ + ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #1", FALSE); + /* what really matters is that nothing has changed */ + test_radio(radio1, 1, radio2, 1, radio3, 1); + + set_radio(radio1, 0, radio2, 1, radio3, 1); + test_radio(radio1, 0, radio2, 1, radio3, 1); + + flush_events(); + flush_sequence(); + + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); +if (0) /* actual message sequence is different on every run in some Windows setups */ + ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #2", FALSE); + /* what really matters is that nothing has changed */ + test_radio(radio1, 0, radio2, 1, radio3, 1); + + /* switch from radio3 ro radio1 */ + SetFocus(radio3); + GetWindowRect(radio3, &rc); + + flush_events(); + flush_sequence(); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_DOWN; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_DOWN_dialog, "IsDialogMessage(VK_DOWN)", TRUE); + +todo_wine + test_radio(radio1, 1, radio2, 0, radio3, 0); + + hwnd = GetFocus(); +todo_wine + ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); + GetWindowRect(radio1, &rc); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_DOWN; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_DOWN_radio3, "down to radio3", TRUE); + +todo_wine + test_radio(radio1, 1, radio2, 0, radio3, 0); + + hwnd = GetFocus(); +todo_wine + ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); + + flush_events(); + flush_sequence(); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_UP; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_UP_radio1, "up to radio1", TRUE); + +todo_wine + test_radio(radio1, 1, radio2, 0, radio3, 0); + + hwnd = GetFocus(); +todo_wine + ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); + + flush_events(); + flush_sequence(); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_UP; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); +if (0) /* actual message sequence is different on every run in some Windows setups */ + ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #3", FALSE); + /* what really matters is that nothing has changed */ +todo_wine + test_radio(radio1, 1, radio2, 0, radio3, 0); + + log_all_parent_messages--; + + DestroyWindow(parent); +} + /****************** static message test *************************/ static const struct message WmSetFontStaticSeq2[] = { @@ -17273,6 +17588,7 @@ START_TEST(msg) test_button_messages(); test_button_bm_get_set_image(); test_autoradio_BM_CLICK(); + test_autoradio_kbd_move(); test_static_messages(); test_listbox_messages(); test_combobox_messages(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 1557291c14..3823ed39e4 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -86,6 +86,17 @@ FONT 8, "MS Shell Dlg" CONTROL "Radio2",502,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,85,70,18 } +AUTORADIO_TEST_DIALOG_2 DIALOGEX 0, 0, 200, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Radio Button Test Dialog" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Radio1",501,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,10,70,18 + CONTROL "Radio3",503,"my_button_class",WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY,10,35,70,18 + CONTROL "Text",504,"my_button_class",WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY,10,60,70,18 + CONTROL "Radio2",502,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY,10,85,70,18 +} + CLASS_TEST_DIALOG DIALOG 0, 0, 91, 28 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CreateDialogParams Test" -- 2.17.1

2 1

[PATCH v3 1/4] dbghelp: Avoid using inline assembly in do_x86cpuid().
by Zebediah Figura 27 Nov '18

27 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: fix stack offsets dlls/dbghelp/minidump.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 975bb45c9a..eedce8138d 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -542,20 +542,27 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +extern void do_x86cpuid(unsigned int ax, unsigned int *p); + +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_x86cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ); +#else +void do_x86cpuid(unsigned int ax, unsigned int *p) { -#if defined(__GNUC__) && defined(__i386__) - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif } +#endif /* From xf86info havecpuid.c 1.11 */ static inline int have_x86cpuid(void) -- 2.14.1

3 10

[PATCH] dbghelp: Fix build failure on macOS.
by Huw Davies 27 Nov '18

27 Nov '18

This was caused by commit 8d096fb5e262e5e87866d1a4a397da144a09b635. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index a3f838f88f..a0623352a7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1096,7 +1096,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt if (ste->is_public && !(dbghelp_options & SYMOPT_NO_PUBLICS)) { - symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->addr, 0); + symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->is_code, ste->addr, 0); } } } -- 2.18.0

1 0

[PATCH 1/5] shcore: Implement SHCreateMemStream().
by Nikolay Sivov 27 Nov '18

27 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 308 ++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 309 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 8f674a2edc..792f7c85b7 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -28,7 +28,9 @@ #include "initguid.h" #include "ocidl.h" #include "shellscalingapi.h" + #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shcore); @@ -492,3 +494,309 @@ WCHAR** WINAPI CommandLineToArgvW(const WCHAR *cmdline, int *numargs) return argv; } + +struct shstream +{ + IStream IStream_iface; + LONG refcount; + + union + { + struct + { + BYTE *buffer; + DWORD length; + DWORD position; + } mem; + } u; +}; + +static inline struct shstream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct shstream, IStream_iface); +} + +static HRESULT WINAPI shstream_QueryInterface(IStream *iface, REFIID riid, void **out) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)->(%s, %p)\n", stream, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + { + *out = iface; + IStream_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI shstream_AddRef(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + ULONG refcount = InterlockedIncrement(&stream->refcount); + + TRACE("(%p)->(%u)\n", stream, refcount); + + return refcount; +} + +static ULONG WINAPI memstream_Release(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + ULONG refcount = InterlockedDecrement(&stream->refcount); + + TRACE("(%p)->(%u)\n", stream, refcount); + + if (!refcount) + { + heap_free(stream->u.mem.buffer); + heap_free(stream); + } + + return refcount; +} + +static HRESULT WINAPI memstream_Read(IStream *iface, void *buff, ULONG buff_size, ULONG *read_len) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length; + + TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, read_len); + + if (stream->u.mem.position >= stream->u.mem.length) + length = 0; + else + length = stream->u.mem.length - stream->u.mem.position; + + length = buff_size > length ? length : buff_size; + if (length != 0) /* not at end of buffer and we want to read something */ + { + memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); + stream->u.mem.position += length; /* adjust pointer */ + } + + if (read_len) + *read_len = length; + + return S_OK; +} + +static HRESULT WINAPI memstream_Write(IStream *iface, const void *buff, ULONG buff_size, ULONG *written) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length = stream->u.mem.position + buff_size; + + TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, written); + + if (length < stream->u.mem.position) /* overflow */ + return STG_E_INSUFFICIENTMEMORY; + + if (length > stream->u.mem.length) + { + BYTE *buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stream->u.mem.buffer, length); + if (!buffer) + return STG_E_INSUFFICIENTMEMORY; + + stream->u.mem.length = length; + stream->u.mem.buffer = buffer; + } + memmove(stream->u.mem.buffer + stream->u.mem.position, buff, buff_size); + stream->u.mem.position += buff_size; /* adjust pointer */ + + if (written) + *written = buff_size; + + return S_OK; +} + +static HRESULT WINAPI memstream_Seek(IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER*new_pos) +{ + struct shstream *stream = impl_from_IStream(iface); + LARGE_INTEGER tmp; + + TRACE("(%p)->(%s, %d, %p)\n", stream, wine_dbgstr_longlong(move.QuadPart), origin, new_pos); + + if (origin == STREAM_SEEK_SET) + tmp = move; + else if (origin == STREAM_SEEK_CUR) + tmp.QuadPart = stream->u.mem.position + move.QuadPart; + else if (origin == STREAM_SEEK_END) + tmp.QuadPart = stream->u.mem.length + move.QuadPart; + else + return STG_E_INVALIDPARAMETER; + + if (tmp.QuadPart < 0) + return STG_E_INVALIDFUNCTION; + + /* we cut off the high part here */ + stream->u.mem.position = tmp.u.LowPart; + + if (new_pos) + new_pos->QuadPart = stream->u.mem.position; + return S_OK; +} + +static HRESULT WINAPI memstream_SetSize(IStream *iface, ULARGE_INTEGER new_size) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length; + BYTE *buffer; + + TRACE("(%p, %s)\n", stream, wine_dbgstr_longlong(new_size.QuadPart)); + + /* we cut off the high part here */ + length = new_size.u.LowPart; + buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stream->u.mem.buffer, length); + if (!buffer) + return STG_E_INSUFFICIENTMEMORY; + + stream->u.mem.buffer = buffer; + stream->u.mem.length = length; + + return S_OK; +} + +static HRESULT WINAPI shstream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER size, ULARGE_INTEGER *read_len, ULARGE_INTEGER *written) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + if (read_len) + read_len->QuadPart = 0; + + if (written) + written->QuadPart = 0; + + /* TODO implement */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_Commit(IStream *iface, DWORD flags) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %#x)\n", stream, flags); + + /* Commit is not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_Revert(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* revert not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_LockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* lock/unlock not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* lock/unlock not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI memstream_Stat(IStream *iface, STATSTG *statstg, DWORD flags) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %p, %#x)\n", stream, statstg, flags); + + memset(statstg, 0, sizeof(*statstg)); + statstg->type = STGTY_STREAM; + statstg->cbSize.QuadPart = stream->u.mem.length; + statstg->grfMode = STGM_READWRITE; + + return S_OK; +} + +static HRESULT WINAPI shstream_Clone(IStream *iface, IStream **dest) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %p)\n", stream, dest); + + *dest = NULL; + + /* clone not supported by this stream */ + return E_NOTIMPL; +} + +static const IStreamVtbl shstreamvtbl = +{ + shstream_QueryInterface, + shstream_AddRef, + memstream_Release, + memstream_Read, + memstream_Write, + memstream_Seek, + memstream_SetSize, + shstream_CopyTo, + shstream_Commit, + shstream_Revert, + shstream_LockRegion, + shstream_UnlockRegion, + memstream_Stat, + shstream_Clone, +}; + +/************************************************************************* + * SHCreateMemStream [SHCORE.@] + * + * Create an IStream object on a block of memory. + * + * PARAMS + * data [I] Memory block to create the IStream object on + * data_len [I] Length of data block + * + * RETURNS + * Success: A pointer to the IStream object. + * Failure: NULL, if any parameters are invalid or an error occurs. + * + * NOTES + * A copy of the memory block is made, it's freed when the stream is released. + */ +IStream * WINAPI SHCreateMemStream(const BYTE *data, UINT data_len) +{ + struct shstream *stream; + + TRACE("(%p, %u)\n", data, data_len); + + if (!data) + data_len = 0; + + stream = heap_alloc(sizeof(*stream)); + stream->IStream_iface.lpVtbl = &shstreamvtbl; + stream->refcount = 1; + stream->u.mem.buffer = heap_alloc(data_len); + if (!stream->u.mem.buffer) + { + heap_free(stream); + return NULL; + } + memcpy(stream->u.mem.buffer, data, data_len); + stream->u.mem.length = data_len; + stream->u.mem.position = 0; + + return &stream->IStream_iface; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 1266a02f69..e8643d8691 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -33,7 +33,7 @@ @ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode @ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA @ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW -@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream +@ stdcall SHCreateMemStream(ptr long) @ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx @ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW -- 2.19.2

1 4

[PATCH 1/3] user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog.
by Dmitry Timoshkov 27 Nov '18

27 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 78 +++++++++++++++++++++-------------- dlls/user32/tests/resource.rc | 11 +++++ 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b39d0b251b..baa8fe5286 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -123,6 +123,8 @@ static DWORD cbt_hook_thread_id; static const WCHAR testWindowClassW[] = { 'T','e','s','t','W','i','n','d','o','w','C','l','a','s','s','W',0 }; +static LRESULT WINAPI ParentMsgCheckProcA(HWND, UINT, WPARAM, LPARAM); + /* FIXME: add tests for these Window Edge Styles (Win31/Win95/98 look), in order of precedence: @@ -6188,7 +6190,24 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, case BM_SETSTATE: if (GetCapture()) ok(GetCapture() == hwnd, "GetCapture() = %p\n", GetCapture()); + + lParam = (ULONG_PTR)GetMenu(hwnd); + goto log_it; + + case WM_GETDLGCODE: + if (lParam) + { + MSG *msg = (MSG *)lParam; + lParam = MAKELPARAM(msg->message, msg->wParam); + } + wParam = (ULONG_PTR)GetMenu(hwnd); + goto log_it; + + case BM_SETCHECK: + case BM_GETCHECK: + lParam = (ULONG_PTR)GetMenu(hwnd); /* fall through */ +log_it: default: msg.hwnd = hwnd; msg.message = message; @@ -6670,32 +6689,34 @@ static void test_button_bm_get_set_image(void) ReleaseDC(0, hdc); } -#define ID_RADIO1 0x00e1 -#define ID_RADIO2 0x00e2 +#define ID_RADIO1 501 +#define ID_RADIO2 502 +#define ID_RADIO3 503 +#define ID_TEXT 504 -static const struct message auto_radio_button_WM_CLICK[] = +static const struct message auto_radio_button_BM_CLICK[] = { { BM_CLICK, sent|wparam|lparam, 0, 0 }, { WM_LBUTTONDOWN, sent|wparam|lparam|defwinproc, 0, 0 }, { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, - { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO2 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO2 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO2, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO2 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO1, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO3, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, ID_RADIO3 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_TEXT, 0 }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO2, BN_CLICKED) }, @@ -6705,30 +6726,27 @@ static const struct message auto_radio_button_WM_CLICK[] = { 0 } }; -static void test_autoradio_messages(void) +static INT_PTR WINAPI radio_test_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - HWND parent, radio1, radio2, radio3, child; + ParentMsgCheckProcA(hwnd, msg, wp, lp); + return 1; +} + +static void test_autoradio_BM_CLICK(void) +{ + HWND parent, radio1, radio2, radio3; RECT rc; MSG msg; DWORD ret; subclass_button(); - parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 100, 100, 200, 200, 0, 0, 0, NULL); + parent = CreateDialogParamA(0, "AUTORADIO_TEST_DIALOG_1", 0, radio_test_dlg_proc, 0); ok(parent != 0, "failed to create parent window\n"); - radio1 = CreateWindowExA(0, "my_button_class", "radio1", WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY, - 0, 0, 70, 18, parent, (HMENU)ID_RADIO1, 0, NULL); - ok(radio1 != 0, "failed to create child window\n"); - radio3 = CreateWindowExA(0, "my_button_class", "radio3", WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY, - 0, 25, 70, 18, parent, (HMENU)-1, 0, NULL); - ok(radio3 != 0, "failed to create child window\n"); - child = CreateWindowExA(0, "my_button_class", "text", WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY, - 0, 50, 70, 18, parent, (HMENU)-1, 0, NULL); - ok(child != 0, "failed to create child window\n"); - radio2 = CreateWindowExA(0, "my_button_class", "radio2", WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY, - 0, 75, 70, 18, parent, (HMENU)ID_RADIO2, 0, NULL); - ok(radio2 != 0, "failed to create child window\n"); + + radio1 = GetDlgItem(parent, ID_RADIO1); + radio2 = GetDlgItem(parent, ID_RADIO2); + radio3 = GetDlgItem(parent, ID_RADIO3); /* this avoids focus messages in the generated sequence */ SetFocus(radio2); @@ -6780,7 +6798,7 @@ static void test_autoradio_messages(void) SendMessageA(radio2, BM_CLICK, 0, 0); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(auto_radio_button_WM_CLICK, "BM_CLICK on auto-radio button", FALSE); + ok_sequence(auto_radio_button_BM_CLICK, "BM_CLICK on auto-radio button", FALSE); log_all_parent_messages--; @@ -17254,7 +17272,7 @@ START_TEST(msg) test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image(); - test_autoradio_messages(); + test_autoradio_BM_CLICK(); test_static_messages(); test_listbox_messages(); test_combobox_messages(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index a9e45e90ce..1557291c14 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -75,6 +75,17 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL,109,20,50,14, WS_TABSTOP | WS_GROUP } +AUTORADIO_TEST_DIALOG_1 DIALOGEX 0, 0, 200, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Radio Button Test Dialog" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Radio1",501,"my_button_class",WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,10,70,18 + CONTROL "Radio3",503,"my_button_class",WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,35,70,18 + CONTROL "Text",504,"my_button_class",WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP,10,60,70,18 + CONTROL "Radio2",502,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,85,70,18 +} + CLASS_TEST_DIALOG DIALOG 0, 0, 91, 28 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CreateDialogParams Test" -- 2.17.1

2 1

[PATCH] wininet: Free security context in failure case.
by Daniel Lehman 27 Nov '18

27 Nov '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/wininet/netconnection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4ad22177ee..e3531da17b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -573,6 +573,8 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf); connection->ssl_buf = NULL; + if(SecIsValidHandle(&connection->ssl_ctx)) + DeleteSecurityContext(&connection->ssl_ctx); return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; } -- 2.17.1

2 1

[v2 PATCH 2/3] comsvcs: Implement IHolder Alloc/Free Resource
by Alistair Leslie-Hughes 27 Nov '18

27 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 21bdd67..d7831cf 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -107,19 +107,29 @@ static ULONG WINAPI holder_Release(IHolder *iface) static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; + TIMEINSECS secs; - FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + TRACE("(%p)->(%08lx, %p) stub\n", This, typeid, resid); - return E_NOTIMPL; + hr = IDispenserDriver_CreateResource(This->driver, typeid, resid, &secs); + + TRACE("<- 0x%08x\n", hr); + return hr; } static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; - FIXME("(%p)->(%08lx) stub\n", This, resid); + TRACE("(%p)->(%08lx) stub\n", This, resid); - return E_NOTIMPL; + hr = IDispenserDriver_DestroyResource(This->driver, resid); + + TRACE("<- 0x%08x\n", hr); + + return hr; } static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) -- 1.9.1

1 0

[v2 PATCH 1/3] comsvcs: Implement IDispenserManager RegisterDispenser
by Alistair Leslie-Hughes 27 Nov '18

27 Nov '18

The Document states the caller of RegisterDispenser is responsible for calling AddRef on the driver to keep it alive and that Release will called on Close of the Holder. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/main.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 6b7ec14..21bdd67 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -43,11 +43,180 @@ typedef struct dispensermanager } dispensermanager; +typedef struct holder +{ + IHolder IHolder_iface; + LONG ref; + + IDispenserDriver *driver; +} holder; + static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) { return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); } +static inline holder *impl_from_IHolder(IHolder *iface) +{ + return CONTAINING_RECORD(iface, holder, IHolder_iface); +} + +static HRESULT WINAPI holder_QueryInterface(IHolder *iface, REFIID riid, void **object) +{ + holder *This = impl_from_IHolder(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IHolder)) + { + *object = &This->IHolder_iface; + IUnknown_AddRef( (IUnknown*)*object); + + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),object); + return E_NOINTERFACE; +} + +static ULONG WINAPI holder_AddRef(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI holder_Release(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResourceS(IHolder *iface, const SRESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(resid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResource(IHolder *iface, const RESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %d) stub\n", This, resid, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResourceS(IHolder *iface, const SRESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(resid), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_Close(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p) stub\n", This); + + IDispenserDriver_Release(This->driver); + + return S_OK; +} + +static HRESULT WINAPI holder_RequestDestroyResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +struct IHolderVtbl holder_vtbl = +{ + holder_QueryInterface, + holder_AddRef, + holder_Release, + holder_AllocResource, + holder_FreeResource, + holder_TrackResource, + holder_TrackResourceS, + holder_UntrackResource, + holder_UntrackResourceS, + holder_Close, + holder_RequestDestroyResource +}; + +static HRESULT create_holder(IDispenserDriver *driver, IHolder **object) +{ + holder *hold; + HRESULT ret; + + TRACE("(%p)\n", object); + + hold = heap_alloc(sizeof(*hold)); + if (!hold) + { + *object = NULL; + return E_OUTOFMEMORY; + } + + hold->IHolder_iface.lpVtbl = &holder_vtbl; + hold->ref = 1; + hold->driver = driver; + + ret = holder_QueryInterface(&hold->IHolder_iface, &IID_IHolder, (void**)object); + holder_Release(&hold->IHolder_iface); + + return ret; +} + static HRESULT WINAPI dismanager_QueryInterface(IDispenserManager *iface, REFIID riid, void **object) { dispensermanager *This = impl_from_IDispenserManager(iface); @@ -95,10 +264,18 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi LPCOLESTR name, IHolder **dispenser) { dispensermanager *This = impl_from_IDispenserManager(iface); + HRESULT hr; - FIXME("(%p)->(%p, %s, %p) stub\n", This, driver, debugstr_w(name), dispenser); + TRACE("(%p)->(%p, %s, %p)\n", This, driver, debugstr_w(name), dispenser); - return E_NOTIMPL; + if(!dispenser) + return E_INVALIDARG; + + hr = create_holder(driver, dispenser); + + TRACE("<-- 0x%08x, %p\n", hr, *dispenser); + + return hr; } static HRESULT WINAPI dismanager_GetContext(IDispenserManager *iface, INSTID *id, TRANSID *transid) -- 1.9.1

1 0

[PATCH] testbot/web: Remove OnPrev() and OnNext() from Submit.
by Francois Gouget 27 Nov '18

27 Nov '18

These one-liners add an unnecessary layer of indirection. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 85a12a0f09..67c1f9b600 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -709,13 +709,6 @@ sub OnPage2Next($) return 1; } -sub OnNext($) -{ - my ($self) = @_; - - return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); -} - sub OnPage2Prev($) { my ($self) = @_; @@ -741,12 +734,6 @@ sub OnPage3Prev($) return 1; } -sub OnPrev($) -{ - my ($self) = @_; - - return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); -} sub SubmitJob($$$) { @@ -1018,11 +1005,11 @@ sub OnAction($$) if ($Action eq "Next >") { - return $self->OnNext(); + return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); } elsif ($Action eq "< Prev") { - return $self->OnPrev(); + return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); } elsif ($Action eq "Submit") { -- 2.19.1

1 0

[PATCH] testbot/web: Fix deleting old files when Submit goes back to page 1.
by Francois Gouget 27 Nov '18

27 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 67c1f9b600..3b7da0636f 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -713,7 +713,7 @@ sub OnPage2Prev($) { my ($self) = @_; - my $FileName = $self->GetParam("File"); + my $FileName = $self->GetParam("FileName"); if ($FileName) { my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); -- 2.19.1

1 0

[PATCH v3] msvcr120: Add nexttoward implementation.
by Zebediah Figura 27 Nov '18

27 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45631 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120/tests/msvcr120.c | 89 +++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 30 +++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- 7 files changed, 133 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 1db7af9177..907fac2f71 100644 --- a/configure.ac +++ b/configure.ac @@ -2746,6 +2746,8 @@ AC_CHECK_FUNCS(\ lroundf \ nearbyint \ nearbyintf \ + nexttoward \ + nexttowardf \ powl \ remainder \ remainderf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 0d645e5587..f5e4fb1f8f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -297,9 +297,9 @@ @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) ucrtbase.nexttoward +@ cdecl nexttowardf(float double) ucrtbase.nexttowardf +@ cdecl nexttowardl(double double) ucrtbase.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c9547bcbdf..e2764dc46e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2302,9 +2302,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 79b667e42b..eee3d5c876 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -127,6 +127,16 @@ static inline float __port_nan(void) } #define NAN __port_nan() +static inline int isnormal(double d) +{ + return _fpclass(d) & (_FPCLASS_PN | _FPCLASS_NN); +} + +static inline int isinf(double d) +{ + return _fpclass(d) & (_FPCLASS_PINF | _FPCLASS_NINF); +} + struct MSVCRT_lconv { char* decimal_point; @@ -192,6 +202,9 @@ static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); static double (__cdecl *p_creal)(_Dcomplex); +static double (__cdecl *p_nexttoward)(double, double); +static float (__cdecl *p_nexttowardf)(float, double); +static double (__cdecl *p_nexttowardl)(double, double); /* make sure we use the correct errno */ #undef errno @@ -252,6 +265,9 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); SET(p_creal, "creal"); + SET(p_nexttoward, "nexttoward"); + SET(p_nexttowardf, "nexttowardf"); + SET(p_nexttowardl, "nexttowardl"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -964,6 +980,78 @@ static void test__Cbuild(void) ok(d == 3.0, "creal returned %lf\n", d); } +static void test_nexttoward(void) +{ + errno_t e; + double d; + float f; + int i; + + struct + { + double source; + double dir; + float f; + double d; + } + tests[] = + { + {0.0, 0.0, 0.0f, 0.0}, + {0.0, 1.0, 1.0e-45f, 5.0e-324}, + {0.0, -1.0, -1.0e-45f, -5.0e-324}, + {1.17549421e-38f, 0.0, 1.17549407e-38f, 1.1754942106924409e-38}, + {1.17549421e-38f, 1.17549421e-38f, 1.17549421e-38f, 1.1754942106924411e-38}, + {1.17549421e-38f, 1.0, 1.17549435e-38f, 1.1754942106924412e-38}, + {1.17549435e-38f, 0.0, 1.17549421e-38f, 1.1754943508222874e-38}, + {1.17549435e-38f, 1.17549435e-38f, 1.17549435e-38f, 1.1754943508222875e-38}, + {1.17549435e-38f, 1.0, 1.17549449e-38f, 1.1754943508222878e-38}, + {1.0, 2.0, 1.00000012f, 1.0000000000000002}, + {1.0, 0.0, 0.99999994f, 0.9999999999999999}, + {1.0, 1.0, 1.0f, 1.0}, + {0.0, INFINITY, 1.0e-45f, 5.0e-324}, + {FLT_MAX, INFINITY, INFINITY, 3.402823466385289e+038}, + {DBL_MAX, INFINITY, INFINITY, INFINITY}, + {INFINITY, INFINITY, INFINITY, INFINITY}, + {INFINITY, 0, FLT_MAX, DBL_MAX}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + f = p_nexttowardf(tests[i].source, tests[i].dir); + ok(f == tests[i].f, "Test %d: expected %0.8ef, got %0.8ef.\n", i, tests[i].f, f); + + errno = -1; + d = p_nexttoward(tests[i].source, tests[i].dir); + e = errno; + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + if (isnormal(d) || isinf(tests[i].source)) + ok(e == -1, "Test %d: expected no error, got %d.\n", i, e); + else + ok(e == ERANGE, "Test %d: expected ERANGE, got %d.\n", i, e); + + d = p_nexttowardl(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + } + + errno = -1; + d = p_nexttoward(NAN, 0); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno -1, got %d.\n", e); + + errno = -1; + d = p_nexttoward(NAN, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); + + errno = -1; + d = p_nexttoward(0, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -983,4 +1071,5 @@ START_TEST(msvcr120) test_wctype(); test_vsscanf(); test__Cbuild(); + test_nexttoward(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0bcf0..706799ce37 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1965,9 +1965,9 @@ @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) msvcr120.nexttoward +@ cdecl nexttowardf(float double) msvcr120.nexttowardf +@ cdecl nexttowardl(double double) msvcr120.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3508..07cf19dfee 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1542,6 +1542,36 @@ double CDECL MSVCRT__nextafter(double num, double next) return retval; } +/********************************************************************* + * nexttoward (MSVCRT.@) + */ +double CDECL MSVCRT_nexttoward(double num, double next) +{ +#if 1 + double ret = nexttoward(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + +/********************************************************************* + * nexttoward (MSVCRT.@) + */ +float CDECL MSVCRT_nexttowardf(float num, double next) +{ +#if 1 + float ret = nexttowardf(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + /********************************************************************* * _ecvt (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6e6cc439d8..3592a569e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2438,9 +2438,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml -- 2.19.1

1 0

[PATCH] setupapi: Store the class and reference string keys in the device_iface structure.
by Zebediah Figura 27 Nov '18

27 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 62 ++++++++++++------------------------------------- 1 file changed, 15 insertions(+), 47 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 1f020b9b8e..64c04131b0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -93,6 +93,7 @@ static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; +static const WCHAR emptyW[] = {0}; /* is used to identify if a DeviceInfoSet pointer is valid or not */ @@ -126,6 +127,8 @@ struct device_iface struct device *device; GUID class; DWORD flags; + HKEY class_key; + HKEY refstr_key; struct list entry; }; @@ -377,7 +380,7 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, { struct device_iface *iface = NULL; WCHAR *refstr2 = NULL, *symlink = NULL, *path = NULL; - HKEY key = NULL; + HKEY key; LONG ret; TRACE("%p %s %s\n", device, debugstr_guid(class), debugstr_w(refstr)); @@ -422,9 +425,10 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, } RegSetValueExW(key, DeviceInstance, 0, REG_SZ, (BYTE *)device->instanceId, lstrlenW(device->instanceId) * sizeof(WCHAR)); - RegCloseKey(key); heap_free(path); + iface->class_key = key; + if (!(path = get_refstr_key_path(iface))) { SetLastError(ERROR_OUTOFMEMORY); @@ -442,9 +446,10 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, if (is_linked(key)) iface->flags |= SPINT_ACTIVE; - RegCloseKey(key); heap_free(path); + iface->refstr_key = key; + list_add_tail(&device->interfaces, &iface->entry); return iface; @@ -554,7 +559,6 @@ static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, static void SETUPDI_RemoveDevice(struct device *device) { struct device_iface *iface, *next; - WCHAR *path; if (device->key != INVALID_HANDLE_VALUE) RegCloseKey(device->key); @@ -576,11 +580,10 @@ static void SETUPDI_RemoveDevice(struct device *device) struct device_iface, entry) { list_remove(&iface->entry); - if (device->phantom && (path = get_refstr_key_path(iface))) - { - RegDeleteKeyW(HKEY_LOCAL_MACHINE, path); - heap_free(path); - } + if (device->phantom) + RegDeleteKeyW(iface->refstr_key, emptyW); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); heap_free(iface->refstr); heap_free(iface->symlink); heap_free(iface); @@ -2486,8 +2489,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, HINF hinf, const WCHAR *section) { struct device_iface *iface; - HKEY refstr_key, params_key; - WCHAR *path; + HKEY params_key; LONG ret; TRACE("devinfo %p, iface_data %p, reserved %d, access %#x, hinf %p, section %s.\n", @@ -2501,24 +2503,8 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, return INVALID_HANDLE_VALUE; } - if (!(path = get_refstr_key_path(iface))) - { - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } - - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, path, 0, NULL, 0, 0, NULL, - &refstr_key, NULL); - heap_free(path); - if (ret) - { - SetLastError(ret); - return INVALID_HANDLE_VALUE; - } - - ret = RegCreateKeyExW(refstr_key, DeviceParameters, 0, NULL, 0, access, + ret = RegCreateKeyExW(iface->refstr_key, DeviceParameters, 0, NULL, 0, access, NULL, &params_key, NULL); - RegCloseKey(refstr_key); if (ret) { SetLastError(ret); @@ -2535,8 +2521,6 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, DWORD reserved) { struct device_iface *iface; - HKEY refstr_key; - WCHAR *path; LONG ret; TRACE("devinfo %p, iface_data %p, reserved %d.\n", devinfo, iface_data, reserved); @@ -2544,23 +2528,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; - if (!(path = get_refstr_key_path(iface))) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, path, 0, NULL, 0, 0, NULL, - &refstr_key, NULL); - heap_free(path); - if (ret) - { - SetLastError(ret); - return FALSE; - } - - ret = RegDeleteKeyW(refstr_key, DeviceParameters); - RegCloseKey(refstr_key); + ret = RegDeleteKeyW(iface->refstr_key, DeviceParameters); if (ret) { SetLastError(ret); -- 2.14.1

1 0

[PATCH v2] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes 27 Nov '18

27 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 142 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 118 insertions(+), 24 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 694a90c..c146122 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -69,6 +69,9 @@ static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i',' static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; +static BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); +static BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) { @@ -102,6 +105,27 @@ static inline WCHAR *heap_strdupAtoW(const char *str) return ret; } +static inline WCHAR *heap_attrdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + + if (str) + { + DWORD size = 0, len; + const char *p; + + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + size += len; + } + + ret = heap_alloc_zero( (size+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, p, size, ret, size); + } + return ret; +} + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { @@ -220,30 +244,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -360,6 +360,100 @@ fail: return FALSE; } +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + mod = load_config_driver(driver); + if (!mod) + return FALSE; + + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if(pConfigDSNW) + ret = pConfigDSNW(hwnd, request, driver, attributes); + else + ERR("Failed to find ConfigDSNW\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(mod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + mod = load_config_driver(driverW); + if (!mod) + { + heap_free(driverW); + return FALSE; + } + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + if (pConfigDSN) + { + TRACE("Calling ConfigDSN\n"); + ret = pConfigDSN(hwnd, request, driver, attributes); + } + else + { + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if (pConfigDSNW) + { + WCHAR *attr = NULL; + TRACE("Calling ConfigDSNW\n"); + + attr = heap_attrdupAtoW(attributes); + if(attr) + ret = pConfigDSNW(hwnd, request, driverW, attr); + heap_free(attr); + } + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(driverW); + FreeLibrary(mod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { -- 1.9.1

1 0

[PATCH] user32: LoadImage should search image in PE directory, not the working directory
by Fabian Maurer 26 Nov '18

26 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46186 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/cursoricon.c | 15 ++++++++- dlls/user32/tests/cursoricon.c | 56 ++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f11f5e45ed..4d803e7818 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3039,11 +3039,24 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags ) { int depth; + WCHAR path[MAX_PATH]; TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); - if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; + if (loadflags & LR_LOADFROMFILE) { + loadflags &= ~LR_SHARED; + + /* Relative paths are relative to the PE directory - not the current working directory */ + if (name != NULL && lstrlenW(name) > 2 && name[0] != '\\' && name[1] != ':') { + WCHAR *part_filename; + GetModuleFileNameW(hinst, path, ARRAY_SIZE(path)); + part_filename = strrchrW(path, '\\') + 1; + *part_filename = '\0'; + strcatW(path, name); + name = path; + } + } switch (type) { case IMAGE_BITMAP: return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8404ee71ab..a4af988720 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,6 +1203,59 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } +static void test_LoadImageWorkingDirectory(void) +{ + char working_dir[MAX_PATH]; + char temp_dir[MAX_PATH]; + DWORD bytes_written; + HANDLE handle; + BOOL ret; + static const test_icon_entries_t icon_desc = {32, 32}; + + GetCurrentDirectoryA(ARRAY_SIZE(working_dir), working_dir); + GetTempPathA(ARRAY_SIZE(temp_dir), temp_dir); + + strcat(temp_dir, "wine-test-dir"); + + CreateDirectoryA(temp_dir, NULL); + + /* Create Files */ + create_ico_file("icon.ico", &icon_desc, 1); + + handle = CreateFileA("test.bmp", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); + ret = WriteFile(handle, bmpimage, sizeof(bmpimage), &bytes_written, NULL); + ok(ret && bytes_written == sizeof(bmpimage), "Test file created improperly.\n"); + CloseHandle(handle); + + SetCurrentDirectoryA(temp_dir); + + /* Test cursor */ + handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "LoadImage() failed.\n"); + + ret = DestroyCursor(handle); + ok(ret, "DestroyCusor failed: %d\n", GetLastError()); + + /* Test image */ + handle = LoadImageA(NULL, "test.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "LoadImageA failed.\n"); + + ret = DeleteObject(handle); + ok(ret, "DeleteObject failed: %d\n", GetLastError()); + + /* Cleanup */ + SetCurrentDirectoryA(working_dir); + + ret = DeleteFileA("test.bmp"); + ok(ret, "DeleteFileA failed: %d\n", GetLastError()); + ret = DeleteFileA("icon.ico"); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); + + ret = RemoveDirectoryA(temp_dir); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_LoadImage(void) { HANDLE handle; @@ -1326,6 +1379,9 @@ static void test_LoadImage(void) bitmap_header->biSize = sizeof(BITMAPINFOHEADER); test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); + + /* Test if images are properly loaded - from executable directory instead of current working directory */ + test_LoadImageWorkingDirectory(); } static void test_CreateIconFromResource(void) -- 2.19.2

5 5

[PATCH 2/2] wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the cursor texture.
by Henri Verbeet 26 Nov '18

26 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 3 +-- dlls/wined3d/texture.c | 6 ------ include/wine/wined3d.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7cb32a6abb3..6d6f53060ee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4563,8 +4563,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.depth = 1; desc.size = 0; - hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, - &data, NULL, &wined3d_null_parent_ops, &texture); + hr = wined3d_texture_create(device, &desc, 1, 1, 0, &data, NULL, &wined3d_null_parent_ops, &texture); wined3d_resource_unmap(&cursor_image->resource, sub_resource_idx); if (FAILED(hr)) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dbc256f1102..5b41d4a9cdc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2906,10 +2906,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } - if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) && !((desc->usage & WINED3DUSAGE_DYNAMIC) - || (desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)))) - WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); - pow2_width = desc->width; pow2_height = desc->height; if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1)) || (desc->depth & (desc->depth - 1))) @@ -3010,8 +3006,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return hr; } wined3d_resource_update_draw_binding(&texture->resource); - if (flags & WINED3D_TEXTURE_CREATE_MAPPABLE) - texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture->texture_ops = texture_ops; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40553f7e514..b0b1abc508e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1562,7 +1562,6 @@ enum wined3d_shader_type #define WINED3D_PALETTE_ALLOW_256 0x00000002 #define WINED3D_PALETTE_ALPHA 0x00000004 -#define WINED3D_TEXTURE_CREATE_MAPPABLE 0x00000001 #define WINED3D_TEXTURE_CREATE_DISCARD 0x00000002 #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 -- 2.11.0

1 0

[PATCH 1/2] wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the logo texture.
by Henri Verbeet 26 Nov '18

26 Nov '18

We never map it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a89a33d676e..7cb32a6abb3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -582,8 +582,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.height = bm.bmHeight; desc.depth = 1; desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, - WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_GET_DC, + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_GET_DC, NULL, NULL, &wined3d_null_parent_ops, &device->logo_texture))) { ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr); -- 2.11.0

1 0

[PATCH vkd3d 5/5] tests: Add test for multisample array textures.
by Józef Kucia 26 Nov '18

26 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c82778594129..aa35315f3e7a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -11739,6 +11739,228 @@ static void test_cube_maps(void) destroy_test_context(&context); } +static void test_multisample_array_texture(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_ROOT_PARAMETER root_parameters[3]; + D3D12_DESCRIPTOR_RANGE descriptor_range; + ID3D12GraphicsCommandList *command_list; + D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12Resource *uav_buffer; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2DMSArray<float4> t; + + RWByteAddressBuffer u; + + uint layer; + uint sample_index; + + uint offset; + + float4 main() : SV_Target + { + uint width, height, elements, samples; + t.GetDimensions(width, height, elements, samples); + u.Store4(offset, uint4(width, height, elements, samples)); + return t.Load(int3(0, 0, layer), sample_index); + } +#endif + 0x43425844, 0xb1457478, 0xd475e3dd, 0xda1eb41d, 0x66075d2b, 0x00000001, 0x0000017c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000104, 0x00000050, 0x00000041, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04004858, 0x00107000, 0x00000000, + 0x00005555, 0x0300009d, 0x0011e000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x8900103d, 0x80000242, 0x00155543, 0x00100072, 0x00000000, 0x00004001, 0x00000000, + 0x00107e46, 0x00000000, 0x0500086f, 0x00100082, 0x00000000, 0x0010700a, 0x00000000, 0x080000a6, + 0x0011e0f2, 0x00000001, 0x0020802a, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x05000036, + 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x06000036, 0x00100042, 0x00000000, 0x0020800a, + 0x00000000, 0x00000000, 0x8c00002e, 0x80000242, 0x00155543, 0x001020f2, 0x00000000, 0x00100206, + 0x00000000, 0x00107e46, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 colors[] = + { + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + + {0.0f, 1.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 1.0f, 0.0f, 1.0f}, + + {0.5f, 0.5f, 0.5f, 1.0f}, + {0.5f, 0.5f, 0.5f, 0.5f}, + }; + static const struct + { + struct + { + unsigned int layer; + unsigned int sample_index; + unsigned int offset; + } constants; + unsigned int expected_color; + } + tests[] = + { + {{0, 0, 0}, 0xff0000ff}, + {{0, 1, 0}, 0xff0000ff}, + {{0, 2, 0}, 0xff0000ff}, + {{0, 3, 0}, 0xff0000ff}, + + {{1, 0, 16}, 0xff00ff00}, + {{2, 1, 32}, 0xffff0000}, + {{3, 2, 32}, 0xffffff00}, + {{4, 3, 32}, 0xffff00ff}, + {{5, 0, 32}, 0xff00ffff}, + {{6, 0, 32}, 0xff7f7f7f}, + {{7, 0, 32}, 0x7f7f7f7f}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_descriptor_count = 2; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_range.NumDescriptors = 1; + descriptor_range.BaseShaderRegister = 0; + descriptor_range.RegisterSpace = 0; + descriptor_range.OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[1].Constants.ShaderRegister = 0; + root_parameters[1].Constants.RegisterSpace = 0; + root_parameters[1].Constants.Num32BitValues = 3; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV; + root_parameters[2].Descriptor.ShaderRegister = 1; + root_parameters[2].Descriptor.RegisterSpace = 0; + root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = ARRAY_SIZE(colors); + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + cpu_handle = get_cpu_rtv_handle(&context, context.rtv_heap, 1); + + for (i = 0; i < ARRAY_SIZE(colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; + rtv_desc.Format = resource_desc.Format; + rtv_desc.Texture2DMSArray.FirstArraySlice = i; + rtv_desc.Texture2DMSArray.ArraySize = 1; + ID3D12Device_CreateRenderTargetView(device, texture, &rtv_desc, cpu_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, cpu_handle, &colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); + gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap); + + ID3D12Device_CreateShaderResourceView(device, texture, NULL, cpu_handle); + + uav_buffer = create_default_buffer(device, 4096, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 3, &tests[i].constants.layer, 0); + ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list, + 2, ID3D12Resource_GetGPUVirtualAddress(uav_buffer)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 1); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + transition_resource_state(command_list, uav_buffer, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(uav_buffer, DXGI_FORMAT_R32G32B32A32_UINT, &rb, queue, command_list); + for (i = 0; i < 2; ++i) + { + const struct uvec4 *v = get_readback_uvec4(&rb, i, 0); + ok(v->x == resource_desc.Width, "Got unexpected width %u.\n", v->x); + ok(v->y == resource_desc.Height, "Got unexpected height %u.\n", v->y); + ok(v->z == resource_desc.DepthOrArraySize, "Got unexpected array size %u.\n", v->z); + ok(v->w == resource_desc.SampleDesc.Count, "Got unexpected sample count %u.\n", v->w); + } + release_resource_readback(&rb); + + ID3D12Resource_Release(texture); + ID3D12Resource_Release(uav_buffer); + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + static void test_descriptor_tables(void) { ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; @@ -21659,6 +21881,7 @@ START_TEST(d3d12) run_test(test_gather); run_test(test_gather_c); run_test(test_cube_maps); + run_test(test_multisample_array_texture); run_test(test_descriptor_tables); run_test(test_descriptor_tables_overlapping_bindings); run_test(test_update_root_descriptors); -- 2.18.1

2 1

[PATCH vkd3d 4/5] vkd3d-shader: Translate sample_info instructions.
by Józef Kucia 26 Nov '18

26 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8c8906439c71..ec7cab693c84 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1418,6 +1418,13 @@ static uint32_t vkd3d_spirv_build_op_image_query_levels(struct vkd3d_spirv_build SpvOpImageQueryLevels, result_type, image_id); } +static uint32_t vkd3d_spirv_build_op_image_query_samples(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t image_id) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, + SpvOpImageQuerySamples, result_type, image_id); +} + static void vkd3d_spirv_build_op_emit_vertex(struct vkd3d_spirv_builder *builder) { return vkd3d_spirv_build_op(&builder->function_stream, SpvOpEmitVertex); @@ -6414,6 +6421,53 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t constituents[VKD3D_VEC4_SIZE]; + struct vkd3d_shader_image image; + uint32_t type_id, val_id; + unsigned int i; + + if (src->reg.type == VKD3DSPR_RASTERIZER) + { + FIXME("Rasterizer not supported.\n"); + return; + } + + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + val_id = vkd3d_spirv_build_op_image_query_samples(builder, type_id, image.image_id); + + constituents[0] = val_id; + for (i = 1; i < VKD3D_VEC4_SIZE; ++i) + constituents[i] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, VKD3D_VEC4_SIZE); + val_id = vkd3d_spirv_build_op_composite_construct(builder, type_id, constituents, VKD3D_VEC4_SIZE); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + if (instruction->flags == VKD3DSI_SAMPLE_INFO_UINT) + { + val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + } + else + { + if (instruction->flags) + FIXME("Unhandled flags %#x.\n", instruction->flags); + val_id = vkd3d_spirv_build_op_convert_utof(builder, type_id, val_id); + } + + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, VKD3D_TYPE_FLOAT, src->swizzle, dst->write_mask); + + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + /* From the Vulkan spec: * * "Scope for execution must be limited to: * Workgroup * Subgroup" @@ -6808,6 +6862,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_RESINFO: vkd3d_dxbc_compiler_emit_resinfo(compiler, instruction); break; + case VKD3DSIH_SAMPLE_INFO: + vkd3d_dxbc_compiler_emit_sample_info(compiler, instruction); + break; case VKD3DSIH_SYNC: vkd3d_dxbc_compiler_emit_sync(compiler, instruction); break; -- 2.18.1

2 1

[PATCH vkd3d 3/5] vkd3d: Add support for multisample texture views.
by Józef Kucia 26 Nov '18

26 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 31883f6e91aa..36c5cb232f67 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1785,6 +1785,14 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_SRV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; @@ -2176,6 +2184,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; @@ -2261,6 +2277,14 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; break; + case D3D12_DSV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_DSV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } -- 2.18.1

2 1

[PATCH vkd3d 2/5] vkd3d-shader: Add support for 2D MS arrays.
by Józef Kucia 26 Nov '18

26 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 12fa300021dc..8c8906439c71 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1643,6 +1643,7 @@ vkd3d_spirv_resource_type_table[] = {VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY, SpvDim1D, 1, 0, 2, 1, SpvCapabilitySampled1D, SpvCapabilityImage1D}, {VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY, SpvDim2D, 1, 0, 3, 2}, + {VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, SpvDim2D, 1, 1, 3, 2}, {VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, SpvDimCube, 1, 0, 3, 0, SpvCapabilitySampledCubeArray, SpvCapabilityImageCubeArray}, }; -- 2.18.1

2 1

[PATCH vkd3d 1/5] vkd3d: Do not set VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT for multisample textures.
by Józef Kucia 26 Nov '18

26 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 56af01002485..31883f6e91aa 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -518,7 +518,8 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && dxgi_format_is_typeless(desc->Format)) image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D - && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) + && desc->Width == desc->Height && desc->DepthOrArraySize >= 6 + && desc->SampleDesc.Count == 1) image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; -- 2.18.1

2 1

[PATCH] testbot: Provide the missions list to the Reconfig scripts.
by Francois Gouget 26 Nov '18

26 Nov '18

The scripts need it to know which builds to update. A Wine VM may only need to update the win32 build for instance, but may have to recreate wineprefixes for multiple locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4d50a3789a..2a8b1d625d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Engine::Notify; @@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " echo git pull &&\n". - " ../bin/build/$Script\n". + " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.19.1

1 0

[PATCH 1/2] testbot: There is no 'build' mission.
by Francois Gouget 26 Nov '18

26 Nov '18

Build tasks need to be told what type of executable to build and thus expect 'exe32' and/or 'exe64' missions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index dcaeb31d1d..9761a5a88f 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -108,7 +108,6 @@ sub GetTaskMissionDescription($) my $Builds = $TaskMission->{Builds}; my $Description = - $Builds->{build} ? "build" : ($Builds->{exe64} and ($Builds->{exe32} or $Builds->{exe32})) ? "32 & 64 bit executable" : $Builds->{exe32} ? "32 bit executable" : $Builds->{exe64} ? "64 bit executable" : -- 2.19.1

1 1

[PATCH v2] dsound: Close sleepev handle after releasing audio client.
by Jacek Caban 26 Nov '18

26 Nov '18

It's used as audio client event handle, so it shouldn't be closed as long as audio client is alive. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fixed a typo in commit message. dlls/dsound/dsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/2] dsound: Wait on thread handle instead of dedicated event in DirectSoundDevice_Release.
by Jacek Caban 26 Nov '18

26 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dsound/dsound.c | 4 +--- dlls/dsound/dsound_private.h | 1 - dlls/dsound/mixer.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)

2 3

[PATCH 1/2] dsound: Close speepev handle after releasing audio client.
by Jacek Caban 26 Nov '18

26 Nov '18

It's used as audio client event handle, so it shouldn't be closed as long as audio client is alive. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dsound/dsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[Patch resend] server: Release of related atoms when destroying a window class
by Ralf Habacker 26 Nov '18

26 Nov '18

2 1

user32: Adds test to check if the corresponding atom is released after calling UnregisterClass().
by Ralf Habacker 26 Nov '18

26 Nov '18

2 1

server: Release of related atoms when destroying a window class
by Ralf Habacker 26 Nov '18

26 Nov '18

1 0

[PATCH v2 1/4] dbghelp: Avoid using inline assembly in do_x86cpuid().
by Zebediah Figura 26 Nov '18

26 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: save/restore the right register (thanks Chip). dlls/dbghelp/minidump.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 975bb45c9a..ee214b274d 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -542,20 +542,27 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +extern void do_x86cpuid(unsigned int ax, unsigned int *p); + +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_x86cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 4(%esp),%eax\n\t" + "movl 8(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ); +#else +void do_x86cpuid(unsigned int ax, unsigned int *p) { -#if defined(__GNUC__) && defined(__i386__) - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif } +#endif /* From xf86info havecpuid.c 1.11 */ static inline int have_x86cpuid(void) -- 2.14.1

3 8

[PATCH v2] odbccp32: Implement SQLConfigDataSource/W (resend)
by Alistair Leslie-Hughes 26 Nov '18

26 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 155 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 131 insertions(+), 24 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 694a90c..4ad64c4 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -102,6 +102,32 @@ static inline WCHAR *heap_strdupAtoW(const char *str) return ret; } +static inline WCHAR *heap_attrdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + + if (str) + { + DWORD size = 0, len; + const char *p; + WCHAR *current; + + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + size += len; + } + + current = ret = heap_alloc_zero( (size+1)*sizeof(WCHAR)); + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, current, size); + current += len; + } + } + return ret; +} + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { @@ -220,30 +246,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -360,6 +362,111 @@ fail: return FALSE; } +static BOOL call_ConfigDSN(HANDLE mod, HWND hwnd, WORD request, const char *driverA, const char *attributesA, const WCHAR *driverW, const WCHAR *attributesW) +{ + BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); + BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + BOOL ret = FALSE; + + TRACE("%p, %p, %d, %p, %p, %p %p\n", mod, hwnd, request, driverA, attributesA, driverW, attributesW); + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + + if (pConfigDSNW) + { + const WCHAR *attr = attributesW; + if(!attr) + attr = heap_attrdupAtoW(attributesA); + + TRACE("Calling ConfigDSNW (%p)\n", pConfigDSNW); + + ret = pConfigDSNW(hwnd, request, driverW, attr); + + if(attr != attributesW) + heap_free((WCHAR *)attr); + } + else if (pConfigDSN) + { + TRACE("Calling pConfigDSN (%p)\n", pConfigDSN); + ret = pConfigDSN(hwnd, request, driverA, attributesA); + } + else + ERR("Neither ConfigDSN or ConfigDSNW found.\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + return ret; +} + +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, + LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE hmod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + hmod = load_config_driver(driver); + if (!hmod) + return FALSE; + + ret = call_ConfigDSN (hmod, hwnd, request, NULL, NULL, driver, attributes); + + FreeLibrary(hmod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, + LPCSTR driver, LPCSTR attributes) +{ + HMODULE hmod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + hmod = load_config_driver(driverW); + if (!hmod) + { + heap_free(driverW); + return FALSE; + } + + ret = call_ConfigDSN (hmod, hwnd, request, driver, attributes, driverW, NULL); + heap_free(driverW); + + FreeLibrary(hmod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { -- 1.9.1

2 1

[PATCH] winevulkan: Update vk.xml to 1.1.94.
by Józef Kucia 26 Nov '18

26 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- VK_KHR_swapchain_mutable_format will be useful for DXGI swapchains. --- dlls/winevulkan/make_vulkan | 3 +- dlls/winevulkan/vulkan_thunks.c | 335 +++++ dlls/winevulkan/vulkan_thunks.h | 148 ++- include/wine/vulkan.h | 2210 ++++++++++++++++++------------- 4 files changed, 1748 insertions(+), 948 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 82b4c8dafe2b..960417d4284d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.1.88" +VK_XML_VERSION = "1.1.94" WINE_VK_VERSION = (1, 0) # Filenames to create. @@ -94,6 +94,7 @@ SUPPORTED_INSTANCE_EXTENSIONS = [ ] BLACKLISTED_EXTENSIONS = [ + "VK_AMD_memory_overallocation_behavior", # Handling of VK_EXT_debug_report requires some consideration. The win32 # loader already provides it for us and it is somewhat usable. If we add # plumbing down to the native layer, we will get each message twice as we diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 04a76955884c..95b8c823f640 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -122,6 +122,35 @@ static inline void free_VkCommandBufferBeginInfo(VkCommandBufferBeginInfo_host * free_VkCommandBufferInheritanceInfo_array((VkCommandBufferInheritanceInfo_host *)in->pInheritanceInfo, 1); } +static inline VkBindAccelerationStructureMemoryInfoNV_host *convert_VkBindAccelerationStructureMemoryInfoNV_array_win_to_host(const VkBindAccelerationStructureMemoryInfoNV *in, uint32_t count) +{ + VkBindAccelerationStructureMemoryInfoNV_host *out; + unsigned int i; + + if (!in) return NULL; + + out = heap_alloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i].sType = in[i].sType; + out[i].pNext = in[i].pNext; + out[i].accelerationStructure = in[i].accelerationStructure; + out[i].memory = in[i].memory; + out[i].memoryOffset = in[i].memoryOffset; + out[i].deviceIndexCount = in[i].deviceIndexCount; + out[i].pDeviceIndices = in[i].pDeviceIndices; + } + + return out; +} + +static inline void free_VkBindAccelerationStructureMemoryInfoNV_array(VkBindAccelerationStructureMemoryInfoNV_host *in, uint32_t count) +{ + if (!in) return; + + heap_free(in); +} + static inline VkBindBufferMemoryInfo_host *convert_VkBindBufferMemoryInfo_array_win_to_host(const VkBindBufferMemoryInfo *in, uint32_t count) { VkBindBufferMemoryInfo_host *out; @@ -200,6 +229,90 @@ static inline void convert_VkRenderPassBeginInfo_win_to_host(const VkRenderPassB out->pClearValues = in->pClearValues; } +static inline void convert_VkGeometryTrianglesNV_win_to_host(const VkGeometryTrianglesNV *in, VkGeometryTrianglesNV_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->vertexData = in->vertexData; + out->vertexOffset = in->vertexOffset; + out->vertexCount = in->vertexCount; + out->vertexStride = in->vertexStride; + out->vertexFormat = in->vertexFormat; + out->indexData = in->indexData; + out->indexOffset = in->indexOffset; + out->indexCount = in->indexCount; + out->indexType = in->indexType; + out->transformData = in->transformData; + out->transformOffset = in->transformOffset; +} + +static inline void convert_VkGeometryAABBNV_win_to_host(const VkGeometryAABBNV *in, VkGeometryAABBNV_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->aabbData = in->aabbData; + out->numAABBs = in->numAABBs; + out->stride = in->stride; + out->offset = in->offset; +} + +static inline void convert_VkGeometryDataNV_win_to_host(const VkGeometryDataNV *in, VkGeometryDataNV_host *out) +{ + if (!in) return; + + convert_VkGeometryTrianglesNV_win_to_host(&in->triangles, &out->triangles); + convert_VkGeometryAABBNV_win_to_host(&in->aabbs, &out->aabbs); +} + +static inline VkGeometryNV_host *convert_VkGeometryNV_array_win_to_host(const VkGeometryNV *in, uint32_t count) +{ + VkGeometryNV_host *out; + unsigned int i; + + if (!in) return NULL; + + out = heap_alloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i].sType = in[i].sType; + out[i].pNext = in[i].pNext; + out[i].geometryType = in[i].geometryType; + convert_VkGeometryDataNV_win_to_host(&in[i].geometry, &out[i].geometry); + out[i].flags = in[i].flags; + } + + return out; +} + +static inline void free_VkGeometryNV_array(VkGeometryNV_host *in, uint32_t count) +{ + if (!in) return; + + heap_free(in); +} + +static inline void convert_VkAccelerationStructureInfoNV_win_to_host(const VkAccelerationStructureInfoNV *in, VkAccelerationStructureInfoNV_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->type = in->type; + out->flags = in->flags; + out->instanceCount = in->instanceCount; + out->geometryCount = in->geometryCount; + out->pGeometries = convert_VkGeometryNV_array_win_to_host(in->pGeometries, in->geometryCount); +} + +static inline void free_VkAccelerationStructureInfoNV(VkAccelerationStructureInfoNV_host *in) +{ + free_VkGeometryNV_array((VkGeometryNV_host *)in->pGeometries, in->geometryCount); +} + static inline VkBufferCopy_host *convert_VkBufferCopy_array_win_to_host(const VkBufferCopy *in, uint32_t count) { VkBufferCopy_host *out; @@ -405,6 +518,16 @@ static inline void free_VkWriteDescriptorSet_array(VkWriteDescriptorSet_host *in heap_free(in); } +static inline void convert_VkAccelerationStructureCreateInfoNV_win_to_host(const VkAccelerationStructureCreateInfoNV *in, VkAccelerationStructureCreateInfoNV_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->compactedSize = in->compactedSize; + convert_VkAccelerationStructureInfoNV_win_to_host(&in->info, &out->info); +} + static inline void convert_VkBufferCreateInfo_win_to_host(const VkBufferCreateInfo *in, VkBufferCreateInfo_host *out) { if (!in) return; @@ -595,6 +718,45 @@ static inline void convert_VkImageViewCreateInfo_win_to_host(const VkImageViewCr out->subresourceRange = in->subresourceRange; } +static inline VkRayTracingPipelineCreateInfoNV_host *convert_VkRayTracingPipelineCreateInfoNV_array_win_to_host(const VkRayTracingPipelineCreateInfoNV *in, uint32_t count) +{ + VkRayTracingPipelineCreateInfoNV_host *out; + unsigned int i; + + if (!in) return NULL; + + out = heap_alloc(count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i].sType = in[i].sType; + out[i].pNext = in[i].pNext; + out[i].flags = in[i].flags; + out[i].stageCount = in[i].stageCount; + out[i].pStages = convert_VkPipelineShaderStageCreateInfo_array_win_to_host(in[i].pStages, in[i].stageCount); + out[i].groupCount = in[i].groupCount; + out[i].pGroups = in[i].pGroups; + out[i].maxRecursionDepth = in[i].maxRecursionDepth; + out[i].layout = in[i].layout; + out[i].basePipelineHandle = in[i].basePipelineHandle; + out[i].basePipelineIndex = in[i].basePipelineIndex; + } + + return out; +} + +static inline void free_VkRayTracingPipelineCreateInfoNV_array(VkRayTracingPipelineCreateInfoNV_host *in, uint32_t count) +{ + unsigned int i; + + if (!in) return; + + for (i = 0; i < count; i++) + { + free_VkPipelineShaderStageCreateInfo_array((VkPipelineShaderStageCreateInfo_host *)in[i].pStages, in[i].stageCount); + } + heap_free(in); +} + static inline void convert_VkSwapchainCreateInfoKHR_win_to_host(const VkSwapchainCreateInfoKHR *in, VkSwapchainCreateInfoKHR_host *out) { if (!in) return; @@ -646,6 +808,16 @@ static inline void free_VkMappedMemoryRange_array(VkMappedMemoryRange_host *in, heap_free(in); } +static inline void convert_VkAccelerationStructureMemoryRequirementsInfoNV_win_to_host(const VkAccelerationStructureMemoryRequirementsInfoNV *in, VkAccelerationStructureMemoryRequirementsInfoNV_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->type = in->type; + out->accelerationStructure = in->accelerationStructure; +} + static inline void convert_VkMemoryRequirements_host_to_win(const VkMemoryRequirements_host *in, VkMemoryRequirements *out) { if (!in) return; @@ -655,6 +827,23 @@ static inline void convert_VkMemoryRequirements_host_to_win(const VkMemoryRequir out->memoryTypeBits = in->memoryTypeBits; } +static inline void convert_VkMemoryRequirements2KHR_win_to_host(const VkMemoryRequirements2KHR *in, VkMemoryRequirements2KHR_host *out) +{ + if (!in) return; + + out->pNext = in->pNext; + out->sType = in->sType; +} + +static inline void convert_VkMemoryRequirements2KHR_host_to_win(const VkMemoryRequirements2KHR_host *in, VkMemoryRequirements2KHR *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + convert_VkMemoryRequirements_host_to_win(&in->memoryRequirements, &out->memoryRequirements); +} + static inline void convert_VkBufferMemoryRequirementsInfo2_win_to_host(const VkBufferMemoryRequirementsInfo2 *in, VkBufferMemoryRequirementsInfo2_host *out) { if (!in) return; @@ -1220,6 +1409,24 @@ VkResult WINAPI wine_vkBeginCommandBuffer(VkCommandBuffer commandBuffer, const V #endif } +static VkResult WINAPI wine_vkBindAccelerationStructureMemoryNV(VkDevice device, uint32_t bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV *pBindInfos) +{ +#if defined(USE_STRUCT_CONVERSION) + VkResult result; + VkBindAccelerationStructureMemoryInfoNV_host *pBindInfos_host; + TRACE("%p, %u, %p\n", device, bindInfoCount, pBindInfos); + + pBindInfos_host = convert_VkBindAccelerationStructureMemoryInfoNV_array_win_to_host(pBindInfos, bindInfoCount); + result = device->funcs.p_vkBindAccelerationStructureMemoryNV(device->device, bindInfoCount, pBindInfos_host); + + free_VkBindAccelerationStructureMemoryInfoNV_array(pBindInfos_host, bindInfoCount); + return result; +#else + TRACE("%p, %u, %p\n", device, bindInfoCount, pBindInfos); + return device->funcs.p_vkBindAccelerationStructureMemoryNV(device->device, bindInfoCount, pBindInfos); +#endif +} + VkResult WINAPI wine_vkBindBufferMemory(VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset) { TRACE("%p, 0x%s, 0x%s, 0x%s\n", device, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(memory), wine_dbgstr_longlong(memoryOffset)); @@ -1409,6 +1616,22 @@ void WINAPI wine_vkCmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, commandBuffer->device->funcs.p_vkCmdBlitImage(commandBuffer->command_buffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter); } +static void WINAPI wine_vkCmdBuildAccelerationStructureNV(VkCommandBuffer commandBuffer, const VkAccelerationStructureInfoNV *pInfo, VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkBuffer scratch, VkDeviceSize scratchOffset) +{ +#if defined(USE_STRUCT_CONVERSION) + VkAccelerationStructureInfoNV_host pInfo_host; + TRACE("%p, %p, 0x%s, 0x%s, %u, 0x%s, 0x%s, 0x%s, 0x%s\n", commandBuffer, pInfo, wine_dbgstr_longlong(instanceData), wine_dbgstr_longlong(instanceOffset), update, wine_dbgstr_longlong(dst), wine_dbgstr_longlong(src), wine_dbgstr_longlong(scratch), wine_dbgstr_longlong(scratchOffset)); + + convert_VkAccelerationStructureInfoNV_win_to_host(pInfo, &pInfo_host); + commandBuffer->device->funcs.p_vkCmdBuildAccelerationStructureNV(commandBuffer->command_buffer, &pInfo_host, instanceData, instanceOffset, update, dst, src, scratch, scratchOffset); + + free_VkAccelerationStructureInfoNV(&pInfo_host); +#else + TRACE("%p, %p, 0x%s, 0x%s, %u, 0x%s, 0x%s, 0x%s, 0x%s\n", commandBuffer, pInfo, wine_dbgstr_longlong(instanceData), wine_dbgstr_longlong(instanceOffset), update, wine_dbgstr_longlong(dst), wine_dbgstr_longlong(src), wine_dbgstr_longlong(scratch), wine_dbgstr_longlong(scratchOffset)); + commandBuffer->device->funcs.p_vkCmdBuildAccelerationStructureNV(commandBuffer->command_buffer, pInfo, instanceData, instanceOffset, update, dst, src, scratch, scratchOffset); +#endif +} + void WINAPI wine_vkCmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment *pAttachments, uint32_t rectCount, const VkClearRect *pRects) { TRACE("%p, %u, %p, %u, %p\n", commandBuffer, attachmentCount, pAttachments, rectCount, pRects); @@ -1427,6 +1650,12 @@ void WINAPI wine_vkCmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkIm commandBuffer->device->funcs.p_vkCmdClearDepthStencilImage(commandBuffer->command_buffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); } +static void WINAPI wine_vkCmdCopyAccelerationStructureNV(VkCommandBuffer commandBuffer, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkCopyAccelerationStructureModeNV mode) +{ + TRACE("%p, 0x%s, 0x%s, %#x\n", commandBuffer, wine_dbgstr_longlong(dst), wine_dbgstr_longlong(src), mode); + commandBuffer->device->funcs.p_vkCmdCopyAccelerationStructureNV(commandBuffer->command_buffer, dst, src, mode); +} + void WINAPI wine_vkCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy *pRegions) { #if defined(USE_STRUCT_CONVERSION) @@ -1816,6 +2045,12 @@ static void WINAPI wine_vkCmdSetViewportWScalingNV(VkCommandBuffer commandBuffer commandBuffer->device->funcs.p_vkCmdSetViewportWScalingNV(commandBuffer->command_buffer, firstViewport, viewportCount, pViewportWScalings); } +static void WINAPI wine_vkCmdTraceRaysNV(VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, uint32_t width, uint32_t height, uint32_t depth) +{ + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u, %u\n", commandBuffer, wine_dbgstr_longlong(raygenShaderBindingTableBuffer), wine_dbgstr_longlong(raygenShaderBindingOffset), wine_dbgstr_longlong(missShaderBindingTableBuffer), wine_dbgstr_longlong(missShaderBindingOffset), wine_dbgstr_longlong(missShaderBindingStride), wine_dbgstr_longlong(hitShaderBindingTableBuffer), wine_dbgstr_longlong(hitShaderBindingOffset), wine_dbgstr_longlong(hitShaderBindingStride), wine_dbgstr_longlong(callableShaderBindingTableBuffer), wine_dbgstr_longlong(callableShaderBindingOffset), wine_dbgstr_longlong(callableShaderBindingStride), width, height, depth); + commandBuffer->device->funcs.p_vkCmdTraceRaysNV(commandBuffer->command_buffer, raygenShaderBindingTableBuffer, raygenShaderBindingOffset, missShaderBindingTableBuffer, missShaderBindingOffset, missShaderBindingStride, hitShaderBindingTableBuffer, hitShaderBindingOffset, hitShaderBindingStride, callableShaderBindingTableBuffer, callableShaderBindingOffset, callableShaderBindingStride, width, height, depth); +} + void WINAPI wine_vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData) { TRACE("%p, 0x%s, 0x%s, 0x%s, %p\n", commandBuffer, wine_dbgstr_longlong(dstBuffer), wine_dbgstr_longlong(dstOffset), wine_dbgstr_longlong(dataSize), pData); @@ -1841,6 +2076,12 @@ void WINAPI wine_vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCo #endif } +static void WINAPI wine_vkCmdWriteAccelerationStructuresPropertiesNV(VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureNV *pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) +{ + TRACE("%p, %u, %p, %#x, 0x%s, %u\n", commandBuffer, accelerationStructureCount, pAccelerationStructures, queryType, wine_dbgstr_longlong(queryPool), firstQuery); + commandBuffer->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesNV(commandBuffer->command_buffer, accelerationStructureCount, pAccelerationStructures, queryType, queryPool, firstQuery); +} + static void WINAPI wine_vkCmdWriteBufferMarkerAMD(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) { TRACE("%p, %#x, 0x%s, 0x%s, %u\n", commandBuffer, pipelineStage, wine_dbgstr_longlong(dstBuffer), wine_dbgstr_longlong(dstOffset), marker); @@ -1853,6 +2094,29 @@ void WINAPI wine_vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineSt commandBuffer->device->funcs.p_vkCmdWriteTimestamp(commandBuffer->command_buffer, pipelineStage, queryPool, query); } +static VkResult WINAPI wine_vkCompileDeferredNV(VkDevice device, VkPipeline pipeline, uint32_t shader) +{ + TRACE("%p, 0x%s, %u\n", device, wine_dbgstr_longlong(pipeline), shader); + return device->funcs.p_vkCompileDeferredNV(device->device, pipeline, shader); +} + +static VkResult WINAPI wine_vkCreateAccelerationStructureNV(VkDevice device, const VkAccelerationStructureCreateInfoNV *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkAccelerationStructureNV *pAccelerationStructure) +{ +#if defined(USE_STRUCT_CONVERSION) + VkResult result; + VkAccelerationStructureCreateInfoNV_host pCreateInfo_host; + TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pAccelerationStructure); + + convert_VkAccelerationStructureCreateInfoNV_win_to_host(pCreateInfo, &pCreateInfo_host); + result = device->funcs.p_vkCreateAccelerationStructureNV(device->device, &pCreateInfo_host, NULL, pAccelerationStructure); + + return result; +#else + TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pAccelerationStructure); + return device->funcs.p_vkCreateAccelerationStructureNV(device->device, pCreateInfo, NULL, pAccelerationStructure); +#endif +} + VkResult WINAPI wine_vkCreateBuffer(VkDevice device, const VkBufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBuffer *pBuffer) { #if defined(USE_STRUCT_CONVERSION) @@ -2039,6 +2303,24 @@ VkResult WINAPI wine_vkCreateQueryPool(VkDevice device, const VkQueryPoolCreateI return device->funcs.p_vkCreateQueryPool(device->device, pCreateInfo, NULL, pQueryPool); } +static VkResult WINAPI wine_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) +{ +#if defined(USE_STRUCT_CONVERSION) + VkResult result; + VkRayTracingPipelineCreateInfoNV_host *pCreateInfos_host; + TRACE("%p, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(pipelineCache), createInfoCount, pCreateInfos, pAllocator, pPipelines); + + pCreateInfos_host = convert_VkRayTracingPipelineCreateInfoNV_array_win_to_host(pCreateInfos, createInfoCount); + result = device->funcs.p_vkCreateRayTracingPipelinesNV(device->device, pipelineCache, createInfoCount, pCreateInfos_host, NULL, pPipelines); + + free_VkRayTracingPipelineCreateInfoNV_array(pCreateInfos_host, createInfoCount); + return result; +#else + TRACE("%p, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(pipelineCache), createInfoCount, pCreateInfos, pAllocator, pPipelines); + return device->funcs.p_vkCreateRayTracingPipelinesNV(device->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); +#endif +} + VkResult WINAPI wine_vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass) { TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pRenderPass); @@ -2110,6 +2392,12 @@ VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32S return instance->funcs.p_vkCreateWin32SurfaceKHR(instance->instance, pCreateInfo, NULL, pSurface); } +static void WINAPI wine_vkDestroyAccelerationStructureNV(VkDevice device, VkAccelerationStructureNV accelerationStructure, const VkAllocationCallbacks *pAllocator) +{ + TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(accelerationStructure), pAllocator); + device->funcs.p_vkDestroyAccelerationStructureNV(device->device, accelerationStructure, NULL); +} + void WINAPI wine_vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks *pAllocator) { TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(buffer), pAllocator); @@ -2302,6 +2590,30 @@ void WINAPI wine_vkFreeMemory(VkDevice device, VkDeviceMemory memory, const VkAl device->funcs.p_vkFreeMemory(device->device, memory, NULL); } +static VkResult WINAPI wine_vkGetAccelerationStructureHandleNV(VkDevice device, VkAccelerationStructureNV accelerationStructure, size_t dataSize, void *pData) +{ + TRACE("%p, 0x%s, 0x%s, %p\n", device, wine_dbgstr_longlong(accelerationStructure), wine_dbgstr_longlong(dataSize), pData); + return device->funcs.p_vkGetAccelerationStructureHandleNV(device->device, accelerationStructure, dataSize, pData); +} + +static void WINAPI wine_vkGetAccelerationStructureMemoryRequirementsNV(VkDevice device, const VkAccelerationStructureMemoryRequirementsInfoNV *pInfo, VkMemoryRequirements2KHR *pMemoryRequirements) +{ +#if defined(USE_STRUCT_CONVERSION) + VkAccelerationStructureMemoryRequirementsInfoNV_host pInfo_host; + VkMemoryRequirements2KHR_host pMemoryRequirements_host; + TRACE("%p, %p, %p\n", device, pInfo, pMemoryRequirements); + + convert_VkAccelerationStructureMemoryRequirementsInfoNV_win_to_host(pInfo, &pInfo_host); + convert_VkMemoryRequirements2KHR_win_to_host(pMemoryRequirements, &pMemoryRequirements_host); + device->funcs.p_vkGetAccelerationStructureMemoryRequirementsNV(device->device, &pInfo_host, &pMemoryRequirements_host); + + convert_VkMemoryRequirements2KHR_host_to_win(&pMemoryRequirements_host, pMemoryRequirements); +#else + TRACE("%p, %p, %p\n", device, pInfo, pMemoryRequirements); + device->funcs.p_vkGetAccelerationStructureMemoryRequirementsNV(device->device, pInfo, pMemoryRequirements); +#endif +} + void WINAPI wine_vkGetBufferMemoryRequirements(VkDevice device, VkBuffer buffer, VkMemoryRequirements *pMemoryRequirements) { #if defined(USE_STRUCT_CONVERSION) @@ -2788,6 +3100,12 @@ static void WINAPI wine_vkGetQueueCheckpointDataNV(VkQueue queue, uint32_t *pChe queue->device->funcs.p_vkGetQueueCheckpointDataNV(queue->queue, pCheckpointDataCount, pCheckpointData); } +static VkResult WINAPI wine_vkGetRayTracingShaderGroupHandlesNV(VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void *pData) +{ + TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", device, wine_dbgstr_longlong(pipeline), firstGroup, groupCount, wine_dbgstr_longlong(dataSize), pData); + return device->funcs.p_vkGetRayTracingShaderGroupHandlesNV(device->device, pipeline, firstGroup, groupCount, dataSize, pData); +} + void WINAPI wine_vkGetRenderAreaGranularity(VkDevice device, VkRenderPass renderPass, VkExtent2D *pGranularity) { TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(renderPass), pGranularity); @@ -2977,6 +3295,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkAllocateDescriptorSets", &wine_vkAllocateDescriptorSets}, {"vkAllocateMemory", &wine_vkAllocateMemory}, {"vkBeginCommandBuffer", &wine_vkBeginCommandBuffer}, + {"vkBindAccelerationStructureMemoryNV", &wine_vkBindAccelerationStructureMemoryNV}, {"vkBindBufferMemory", &wine_vkBindBufferMemory}, {"vkBindBufferMemory2", &wine_vkBindBufferMemory2}, {"vkBindBufferMemory2KHR", &wine_vkBindBufferMemory2KHR}, @@ -2996,9 +3315,11 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCmdBindTransformFeedbackBuffersEXT", &wine_vkCmdBindTransformFeedbackBuffersEXT}, {"vkCmdBindVertexBuffers", &wine_vkCmdBindVertexBuffers}, {"vkCmdBlitImage", &wine_vkCmdBlitImage}, + {"vkCmdBuildAccelerationStructureNV", &wine_vkCmdBuildAccelerationStructureNV}, {"vkCmdClearAttachments", &wine_vkCmdClearAttachments}, {"vkCmdClearColorImage", &wine_vkCmdClearColorImage}, {"vkCmdClearDepthStencilImage", &wine_vkCmdClearDepthStencilImage}, + {"vkCmdCopyAccelerationStructureNV", &wine_vkCmdCopyAccelerationStructureNV}, {"vkCmdCopyBuffer", &wine_vkCmdCopyBuffer}, {"vkCmdCopyBufferToImage", &wine_vkCmdCopyBufferToImage}, {"vkCmdCopyImage", &wine_vkCmdCopyImage}, @@ -3056,10 +3377,14 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCmdSetViewport", &wine_vkCmdSetViewport}, {"vkCmdSetViewportShadingRatePaletteNV", &wine_vkCmdSetViewportShadingRatePaletteNV}, {"vkCmdSetViewportWScalingNV", &wine_vkCmdSetViewportWScalingNV}, + {"vkCmdTraceRaysNV", &wine_vkCmdTraceRaysNV}, {"vkCmdUpdateBuffer", &wine_vkCmdUpdateBuffer}, {"vkCmdWaitEvents", &wine_vkCmdWaitEvents}, + {"vkCmdWriteAccelerationStructuresPropertiesNV", &wine_vkCmdWriteAccelerationStructuresPropertiesNV}, {"vkCmdWriteBufferMarkerAMD", &wine_vkCmdWriteBufferMarkerAMD}, {"vkCmdWriteTimestamp", &wine_vkCmdWriteTimestamp}, + {"vkCompileDeferredNV", &wine_vkCompileDeferredNV}, + {"vkCreateAccelerationStructureNV", &wine_vkCreateAccelerationStructureNV}, {"vkCreateBuffer", &wine_vkCreateBuffer}, {"vkCreateBufferView", &wine_vkCreateBufferView}, {"vkCreateCommandPool", &wine_vkCreateCommandPool}, @@ -3077,6 +3402,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCreatePipelineCache", &wine_vkCreatePipelineCache}, {"vkCreatePipelineLayout", &wine_vkCreatePipelineLayout}, {"vkCreateQueryPool", &wine_vkCreateQueryPool}, + {"vkCreateRayTracingPipelinesNV", &wine_vkCreateRayTracingPipelinesNV}, {"vkCreateRenderPass", &wine_vkCreateRenderPass}, {"vkCreateRenderPass2KHR", &wine_vkCreateRenderPass2KHR}, {"vkCreateSampler", &wine_vkCreateSampler}, @@ -3086,6 +3412,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCreateShaderModule", &wine_vkCreateShaderModule}, {"vkCreateSwapchainKHR", &wine_vkCreateSwapchainKHR}, {"vkCreateValidationCacheEXT", &wine_vkCreateValidationCacheEXT}, + {"vkDestroyAccelerationStructureNV", &wine_vkDestroyAccelerationStructureNV}, {"vkDestroyBuffer", &wine_vkDestroyBuffer}, {"vkDestroyBufferView", &wine_vkDestroyBufferView}, {"vkDestroyCommandPool", &wine_vkDestroyCommandPool}, @@ -3117,6 +3444,8 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkFreeCommandBuffers", &wine_vkFreeCommandBuffers}, {"vkFreeDescriptorSets", &wine_vkFreeDescriptorSets}, {"vkFreeMemory", &wine_vkFreeMemory}, + {"vkGetAccelerationStructureHandleNV", &wine_vkGetAccelerationStructureHandleNV}, + {"vkGetAccelerationStructureMemoryRequirementsNV", &wine_vkGetAccelerationStructureMemoryRequirementsNV}, {"vkGetBufferMemoryRequirements", &wine_vkGetBufferMemoryRequirements}, {"vkGetBufferMemoryRequirements2", &wine_vkGetBufferMemoryRequirements2}, {"vkGetBufferMemoryRequirements2KHR", &wine_vkGetBufferMemoryRequirements2KHR}, @@ -3142,6 +3471,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkGetPipelineCacheData", &wine_vkGetPipelineCacheData}, {"vkGetQueryPoolResults", &wine_vkGetQueryPoolResults}, {"vkGetQueueCheckpointDataNV", &wine_vkGetQueueCheckpointDataNV}, + {"vkGetRayTracingShaderGroupHandlesNV", &wine_vkGetRayTracingShaderGroupHandlesNV}, {"vkGetRenderAreaGranularity", &wine_vkGetRenderAreaGranularity}, {"vkGetShaderInfoAMD", &wine_vkGetShaderInfoAMD}, {"vkGetSwapchainImagesKHR", &wine_vkGetSwapchainImagesKHR}, @@ -3263,12 +3593,15 @@ static const char * const vk_device_extensions[] = "VK_EXT_depth_range_unrestricted", "VK_EXT_descriptor_indexing", "VK_EXT_discard_rectangles", + "VK_EXT_fragment_density_map", "VK_EXT_global_priority", "VK_EXT_inline_uniform_block", "VK_EXT_pci_bus_info", "VK_EXT_post_depth_coverage", "VK_EXT_sample_locations", "VK_EXT_sampler_filter_minmax", + "VK_EXT_scalar_block_layout", + "VK_EXT_separate_stencil_usage", "VK_EXT_shader_stencil_export", "VK_EXT_shader_subgroup_ballot", "VK_EXT_shader_subgroup_vote", @@ -3304,6 +3637,7 @@ static const char * const vk_device_extensions[] = "VK_KHR_shader_draw_parameters", "VK_KHR_storage_buffer_storage_class", "VK_KHR_swapchain", + "VK_KHR_swapchain_mutable_format", "VK_KHR_variable_pointers", "VK_KHR_vulkan_memory_model", "VK_NV_clip_space_w_scaling", @@ -3319,6 +3653,7 @@ static const char * const vk_device_extensions[] = "VK_NV_geometry_shader_passthrough", "VK_NV_glsl_shader", "VK_NV_mesh_shader", + "VK_NV_ray_tracing", "VK_NV_representative_fragment_test", "VK_NV_sample_mask_override_coverage", "VK_NV_scissor_exclusive", diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 32d429033ea9..c714664de0eb 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -115,6 +115,17 @@ typedef struct VkCommandBufferBeginInfo_host const VkCommandBufferInheritanceInfo_host *pInheritanceInfo; } VkCommandBufferBeginInfo_host; +typedef struct VkBindAccelerationStructureMemoryInfoNV_host +{ + VkStructureType sType; + const void *pNext; + VkAccelerationStructureNV accelerationStructure; + VkDeviceMemory memory; + VkDeviceSize memoryOffset; + uint32_t deviceIndexCount; + const uint32_t *pDeviceIndices; +} VkBindAccelerationStructureMemoryInfoNV_host; + typedef struct VkBindBufferMemoryInfo_host { VkStructureType sType; @@ -153,6 +164,59 @@ typedef struct VkRenderPassBeginInfo_host const VkClearValue *pClearValues; } VkRenderPassBeginInfo_host; +typedef struct VkGeometryTrianglesNV_host +{ + VkStructureType sType; + const void *pNext; + VkBuffer vertexData; + VkDeviceSize vertexOffset; + uint32_t vertexCount; + VkDeviceSize vertexStride; + VkFormat vertexFormat; + VkBuffer indexData; + VkDeviceSize indexOffset; + uint32_t indexCount; + VkIndexType indexType; + VkBuffer transformData; + VkDeviceSize transformOffset; +} VkGeometryTrianglesNV_host; + +typedef struct VkGeometryAABBNV_host +{ + VkStructureType sType; + const void *pNext; + VkBuffer aabbData; + uint32_t numAABBs; + uint32_t stride; + VkDeviceSize offset; +} VkGeometryAABBNV_host; + +typedef struct VkGeometryDataNV_host +{ + VkGeometryTrianglesNV_host triangles; + VkGeometryAABBNV_host aabbs; +} VkGeometryDataNV_host; + +typedef struct VkGeometryNV_host +{ + VkStructureType sType; + const void *pNext; + VkGeometryTypeNV geometryType; + VkGeometryDataNV_host geometry; + VkGeometryFlagsNV flags; +} VkGeometryNV_host; + +typedef struct VkAccelerationStructureInfoNV_host +{ + VkStructureType sType; + const void *pNext; + VkAccelerationStructureTypeNV type; + VkBuildAccelerationStructureFlagsNV flags; + uint32_t instanceCount; + uint32_t geometryCount; + const VkGeometryNV_host *pGeometries; +} VkAccelerationStructureInfoNV_host; + typedef struct VkBufferCopy_host { VkDeviceSize srcOffset; @@ -225,6 +289,14 @@ typedef struct VkWriteDescriptorSet_host const VkBufferView *pTexelBufferView; } VkWriteDescriptorSet_host; +typedef struct VkAccelerationStructureCreateInfoNV_host +{ + VkStructureType sType; + const void *pNext; + VkDeviceSize compactedSize; + VkAccelerationStructureInfoNV_host info; +} VkAccelerationStructureCreateInfoNV_host; + typedef struct VkBufferCreateInfo_host { VkStructureType sType; @@ -273,7 +345,7 @@ typedef struct VkComputePipelineCreateInfo_host typedef struct VkDescriptorUpdateTemplateCreateInfo_host { VkStructureType sType; - void *pNext; + const void *pNext; VkDescriptorUpdateTemplateCreateFlags flags; uint32_t descriptorUpdateEntryCount; const VkDescriptorUpdateTemplateEntry *pDescriptorUpdateEntries; @@ -332,6 +404,21 @@ typedef struct VkImageViewCreateInfo_host VkImageSubresourceRange subresourceRange; } VkImageViewCreateInfo_host; +typedef struct VkRayTracingPipelineCreateInfoNV_host +{ + VkStructureType sType; + const void *pNext; + VkPipelineCreateFlags flags; + uint32_t stageCount; + const VkPipelineShaderStageCreateInfo_host *pStages; + uint32_t groupCount; + const VkRayTracingShaderGroupCreateInfoNV *pGroups; + uint32_t maxRecursionDepth; + VkPipelineLayout layout; + VkPipeline basePipelineHandle; + int32_t basePipelineIndex; +} VkRayTracingPipelineCreateInfoNV_host; + typedef struct VkSwapchainCreateInfoKHR_host { VkStructureType sType; @@ -363,6 +450,14 @@ typedef struct VkMappedMemoryRange_host VkDeviceSize size; } VkMappedMemoryRange_host; +typedef struct VkAccelerationStructureMemoryRequirementsInfoNV_host +{ + VkStructureType sType; + const void *pNext; + VkAccelerationStructureMemoryRequirementsTypeNV type; + VkAccelerationStructureNV accelerationStructure; +} VkAccelerationStructureMemoryRequirementsInfoNV_host; + typedef struct VkMemoryRequirements_host { VkDeviceSize size; @@ -370,6 +465,13 @@ typedef struct VkMemoryRequirements_host uint32_t memoryTypeBits; } VkMemoryRequirements_host; +typedef struct VkMemoryRequirements2KHR_host +{ + VkStructureType sType; + void *pNext; + VkMemoryRequirements_host memoryRequirements; +} VkMemoryRequirements2KHR_host; + typedef struct VkBufferMemoryRequirementsInfo2_host { VkStructureType sType; @@ -672,6 +774,11 @@ struct vulkan_device_funcs VkResult (*p_vkBeginCommandBuffer)(VkCommandBuffer, const VkCommandBufferBeginInfo_host *); #else VkResult (*p_vkBeginCommandBuffer)(VkCommandBuffer, const VkCommandBufferBeginInfo *); +#endif +#if defined(USE_STRUCT_CONVERSION) + VkResult (*p_vkBindAccelerationStructureMemoryNV)(VkDevice, uint32_t, const VkBindAccelerationStructureMemoryInfoNV_host *); +#else + VkResult (*p_vkBindAccelerationStructureMemoryNV)(VkDevice, uint32_t, const VkBindAccelerationStructureMemoryInfoNV *); #endif VkResult (*p_vkBindBufferMemory)(VkDevice, VkBuffer, VkDeviceMemory, VkDeviceSize); #if defined(USE_STRUCT_CONVERSION) @@ -720,9 +827,15 @@ struct vulkan_device_funcs void (*p_vkCmdBindTransformFeedbackBuffersEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *, const VkDeviceSize *); void (*p_vkCmdBindVertexBuffers)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *); void (*p_vkCmdBlitImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageBlit *, VkFilter); +#if defined(USE_STRUCT_CONVERSION) + void (*p_vkCmdBuildAccelerationStructureNV)(VkCommandBuffer, const VkAccelerationStructureInfoNV_host *, VkBuffer, VkDeviceSize, VkBool32, VkAccelerationStructureNV, VkAccelerationStructureNV, VkBuffer, VkDeviceSize); +#else + void (*p_vkCmdBuildAccelerationStructureNV)(VkCommandBuffer, const VkAccelerationStructureInfoNV *, VkBuffer, VkDeviceSize, VkBool32, VkAccelerationStructureNV, VkAccelerationStructureNV, VkBuffer, VkDeviceSize); +#endif void (*p_vkCmdClearAttachments)(VkCommandBuffer, uint32_t, const VkClearAttachment *, uint32_t, const VkClearRect *); void (*p_vkCmdClearColorImage)(VkCommandBuffer, VkImage, VkImageLayout, const VkClearColorValue *, uint32_t, const VkImageSubresourceRange *); void (*p_vkCmdClearDepthStencilImage)(VkCommandBuffer, VkImage, VkImageLayout, const VkClearDepthStencilValue *, uint32_t, const VkImageSubresourceRange *); + void (*p_vkCmdCopyAccelerationStructureNV)(VkCommandBuffer, VkAccelerationStructureNV, VkAccelerationStructureNV, VkCopyAccelerationStructureModeNV); #if defined(USE_STRUCT_CONVERSION) void (*p_vkCmdCopyBuffer)(VkCommandBuffer, VkBuffer, VkBuffer, uint32_t, const VkBufferCopy_host *); #else @@ -800,14 +913,22 @@ struct vulkan_device_funcs void (*p_vkCmdSetViewport)(VkCommandBuffer, uint32_t, uint32_t, const VkViewport *); void (*p_vkCmdSetViewportShadingRatePaletteNV)(VkCommandBuffer, uint32_t, uint32_t, const VkShadingRatePaletteNV *); void (*p_vkCmdSetViewportWScalingNV)(VkCommandBuffer, uint32_t, uint32_t, const VkViewportWScalingNV *); + void (*p_vkCmdTraceRaysNV)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, uint32_t, uint32_t, uint32_t); void (*p_vkCmdUpdateBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize, const void *); #if defined(USE_STRUCT_CONVERSION) void (*p_vkCmdWaitEvents)(VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags, VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier_host *, uint32_t, const VkImageMemoryBarrier_host *); #else void (*p_vkCmdWaitEvents)(VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags, VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier *, uint32_t, const VkImageMemoryBarrier *); #endif + void (*p_vkCmdWriteAccelerationStructuresPropertiesNV)(VkCommandBuffer, uint32_t, const VkAccelerationStructureNV *, VkQueryType, VkQueryPool, uint32_t); void (*p_vkCmdWriteBufferMarkerAMD)(VkCommandBuffer, VkPipelineStageFlagBits, VkBuffer, VkDeviceSize, uint32_t); void (*p_vkCmdWriteTimestamp)(VkCommandBuffer, VkPipelineStageFlagBits, VkQueryPool, uint32_t); + VkResult (*p_vkCompileDeferredNV)(VkDevice, VkPipeline, uint32_t); +#if defined(USE_STRUCT_CONVERSION) + VkResult (*p_vkCreateAccelerationStructureNV)(VkDevice, const VkAccelerationStructureCreateInfoNV_host *, const VkAllocationCallbacks *, VkAccelerationStructureNV *); +#else + VkResult (*p_vkCreateAccelerationStructureNV)(VkDevice, const VkAccelerationStructureCreateInfoNV *, const VkAllocationCallbacks *, VkAccelerationStructureNV *); +#endif #if defined(USE_STRUCT_CONVERSION) VkResult (*p_vkCreateBuffer)(VkDevice, const VkBufferCreateInfo_host *, const VkAllocationCallbacks *, VkBuffer *); #else @@ -857,6 +978,11 @@ struct vulkan_device_funcs VkResult (*p_vkCreatePipelineCache)(VkDevice, const VkPipelineCacheCreateInfo *, const VkAllocationCallbacks *, VkPipelineCache *); VkResult (*p_vkCreatePipelineLayout)(VkDevice, const VkPipelineLayoutCreateInfo *, const VkAllocationCallbacks *, VkPipelineLayout *); VkResult (*p_vkCreateQueryPool)(VkDevice, const VkQueryPoolCreateInfo *, const VkAllocationCallbacks *, VkQueryPool *); +#if defined(USE_STRUCT_CONVERSION) + VkResult (*p_vkCreateRayTracingPipelinesNV)(VkDevice, VkPipelineCache, uint32_t, const VkRayTracingPipelineCreateInfoNV_host *, const VkAllocationCallbacks *, VkPipeline *); +#else + VkResult (*p_vkCreateRayTracingPipelinesNV)(VkDevice, VkPipelineCache, uint32_t, const VkRayTracingPipelineCreateInfoNV *, const VkAllocationCallbacks *, VkPipeline *); +#endif VkResult (*p_vkCreateRenderPass)(VkDevice, const VkRenderPassCreateInfo *, const VkAllocationCallbacks *, VkRenderPass *); VkResult (*p_vkCreateRenderPass2KHR)(VkDevice, const VkRenderPassCreateInfo2KHR *, const VkAllocationCallbacks *, VkRenderPass *); VkResult (*p_vkCreateSampler)(VkDevice, const VkSamplerCreateInfo *, const VkAllocationCallbacks *, VkSampler *); @@ -870,6 +996,7 @@ struct vulkan_device_funcs VkResult (*p_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); #endif VkResult (*p_vkCreateValidationCacheEXT)(VkDevice, const VkValidationCacheCreateInfoEXT *, const VkAllocationCallbacks *, VkValidationCacheEXT *); + void (*p_vkDestroyAccelerationStructureNV)(VkDevice, VkAccelerationStructureNV, const VkAllocationCallbacks *); void (*p_vkDestroyBuffer)(VkDevice, VkBuffer, const VkAllocationCallbacks *); void (*p_vkDestroyBufferView)(VkDevice, VkBufferView, const VkAllocationCallbacks *); void (*p_vkDestroyCommandPool)(VkDevice, VkCommandPool, const VkAllocationCallbacks *); @@ -905,6 +1032,12 @@ struct vulkan_device_funcs void (*p_vkFreeCommandBuffers)(VkDevice, VkCommandPool, uint32_t, const VkCommandBuffer *); VkResult (*p_vkFreeDescriptorSets)(VkDevice, VkDescriptorPool, uint32_t, const VkDescriptorSet *); void (*p_vkFreeMemory)(VkDevice, VkDeviceMemory, const VkAllocationCallbacks *); + VkResult (*p_vkGetAccelerationStructureHandleNV)(VkDevice, VkAccelerationStructureNV, size_t, void *); +#if defined(USE_STRUCT_CONVERSION) + void (*p_vkGetAccelerationStructureMemoryRequirementsNV)(VkDevice, const VkAccelerationStructureMemoryRequirementsInfoNV_host *, VkMemoryRequirements2KHR_host *); +#else + void (*p_vkGetAccelerationStructureMemoryRequirementsNV)(VkDevice, const VkAccelerationStructureMemoryRequirementsInfoNV *, VkMemoryRequirements2KHR *); +#endif #if defined(USE_STRUCT_CONVERSION) void (*p_vkGetBufferMemoryRequirements)(VkDevice, VkBuffer, VkMemoryRequirements_host *); #else @@ -965,6 +1098,7 @@ struct vulkan_device_funcs VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *); VkResult (*p_vkGetQueryPoolResults)(VkDevice, VkQueryPool, uint32_t, uint32_t, size_t, void *, VkDeviceSize, VkQueryResultFlags); void (*p_vkGetQueueCheckpointDataNV)(VkQueue, uint32_t *, VkCheckpointDataNV *); + VkResult (*p_vkGetRayTracingShaderGroupHandlesNV)(VkDevice, VkPipeline, uint32_t, uint32_t, size_t, void *); void (*p_vkGetRenderAreaGranularity)(VkDevice, VkRenderPass, VkExtent2D *); VkResult (*p_vkGetShaderInfoAMD)(VkDevice, VkPipeline, VkShaderStageFlagBits, VkShaderInfoTypeAMD, size_t *, void *); VkResult (*p_vkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); @@ -1088,6 +1222,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkAllocateDescriptorSets) \ USE_VK_FUNC(vkAllocateMemory) \ USE_VK_FUNC(vkBeginCommandBuffer) \ + USE_VK_FUNC(vkBindAccelerationStructureMemoryNV) \ USE_VK_FUNC(vkBindBufferMemory) \ USE_VK_FUNC(vkBindBufferMemory2) \ USE_VK_FUNC(vkBindBufferMemory2KHR) \ @@ -1107,9 +1242,11 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCmdBindTransformFeedbackBuffersEXT) \ USE_VK_FUNC(vkCmdBindVertexBuffers) \ USE_VK_FUNC(vkCmdBlitImage) \ + USE_VK_FUNC(vkCmdBuildAccelerationStructureNV) \ USE_VK_FUNC(vkCmdClearAttachments) \ USE_VK_FUNC(vkCmdClearColorImage) \ USE_VK_FUNC(vkCmdClearDepthStencilImage) \ + USE_VK_FUNC(vkCmdCopyAccelerationStructureNV) \ USE_VK_FUNC(vkCmdCopyBuffer) \ USE_VK_FUNC(vkCmdCopyBufferToImage) \ USE_VK_FUNC(vkCmdCopyImage) \ @@ -1167,10 +1304,14 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCmdSetViewport) \ USE_VK_FUNC(vkCmdSetViewportShadingRatePaletteNV) \ USE_VK_FUNC(vkCmdSetViewportWScalingNV) \ + USE_VK_FUNC(vkCmdTraceRaysNV) \ USE_VK_FUNC(vkCmdUpdateBuffer) \ USE_VK_FUNC(vkCmdWaitEvents) \ + USE_VK_FUNC(vkCmdWriteAccelerationStructuresPropertiesNV) \ USE_VK_FUNC(vkCmdWriteBufferMarkerAMD) \ USE_VK_FUNC(vkCmdWriteTimestamp) \ + USE_VK_FUNC(vkCompileDeferredNV) \ + USE_VK_FUNC(vkCreateAccelerationStructureNV) \ USE_VK_FUNC(vkCreateBuffer) \ USE_VK_FUNC(vkCreateBufferView) \ USE_VK_FUNC(vkCreateCommandPool) \ @@ -1188,6 +1329,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCreatePipelineCache) \ USE_VK_FUNC(vkCreatePipelineLayout) \ USE_VK_FUNC(vkCreateQueryPool) \ + USE_VK_FUNC(vkCreateRayTracingPipelinesNV) \ USE_VK_FUNC(vkCreateRenderPass) \ USE_VK_FUNC(vkCreateRenderPass2KHR) \ USE_VK_FUNC(vkCreateSampler) \ @@ -1197,6 +1339,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCreateShaderModule) \ USE_VK_FUNC(vkCreateSwapchainKHR) \ USE_VK_FUNC(vkCreateValidationCacheEXT) \ + USE_VK_FUNC(vkDestroyAccelerationStructureNV) \ USE_VK_FUNC(vkDestroyBuffer) \ USE_VK_FUNC(vkDestroyBufferView) \ USE_VK_FUNC(vkDestroyCommandPool) \ @@ -1228,6 +1371,8 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkFreeCommandBuffers) \ USE_VK_FUNC(vkFreeDescriptorSets) \ USE_VK_FUNC(vkFreeMemory) \ + USE_VK_FUNC(vkGetAccelerationStructureHandleNV) \ + USE_VK_FUNC(vkGetAccelerationStructureMemoryRequirementsNV) \ USE_VK_FUNC(vkGetBufferMemoryRequirements) \ USE_VK_FUNC(vkGetBufferMemoryRequirements2) \ USE_VK_FUNC(vkGetBufferMemoryRequirements2KHR) \ @@ -1252,6 +1397,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkGetPipelineCacheData) \ USE_VK_FUNC(vkGetQueryPoolResults) \ USE_VK_FUNC(vkGetQueueCheckpointDataNV) \ + USE_VK_FUNC(vkGetRayTracingShaderGroupHandlesNV) \ USE_VK_FUNC(vkGetRenderAreaGranularity) \ USE_VK_FUNC(vkGetShaderInfoAMD) \ USE_VK_FUNC(vkGetSwapchainImagesKHR) \ diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index d483249f54aa..195b93e6da86 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -83,6 +83,7 @@ #define VK_MAX_DEVICE_GROUP_SIZE_KHR VK_MAX_DEVICE_GROUP_SIZE #define VK_MAX_DRIVER_NAME_SIZE_KHR 256 #define VK_MAX_DRIVER_INFO_SIZE_KHR 256 +#define VK_SHADER_UNUSED_NV (~0U) #define VK_KHR_SURFACE_SPEC_VERSION 25 #define VK_KHR_SURFACE_EXTENSION_NAME "VK_KHR_surface" #define VK_KHR_SWAPCHAIN_SPEC_VERSION 70 @@ -223,6 +224,8 @@ #define VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME "VK_EXT_shader_viewport_index_layer" #define VK_NV_SHADING_RATE_IMAGE_SPEC_VERSION 3 #define VK_NV_SHADING_RATE_IMAGE_EXTENSION_NAME "VK_NV_shading_rate_image" +#define VK_NV_RAY_TRACING_SPEC_VERSION 3 +#define VK_NV_RAY_TRACING_EXTENSION_NAME "VK_NV_ray_tracing" #define VK_NV_REPRESENTATIVE_FRAGMENT_TEST_SPEC_VERSION 1 #define VK_NV_REPRESENTATIVE_FRAGMENT_TEST_EXTENSION_NAME "VK_NV_representative_fragment_test" #define VK_KHR_MAINTENANCE3_SPEC_VERSION 1 @@ -245,6 +248,8 @@ #define VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME "VK_KHR_driver_properties" #define VK_NV_SHADER_SUBGROUP_PARTITIONED_SPEC_VERSION 1 #define VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME "VK_NV_shader_subgroup_partitioned" +#define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION 1 +#define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME "VK_KHR_swapchain_mutable_format" #define VK_NV_COMPUTE_SHADER_DERIVATIVES_SPEC_VERSION 1 #define VK_NV_COMPUTE_SHADER_DERIVATIVES_EXTENSION_NAME "VK_NV_compute_shader_derivatives" #define VK_NV_MESH_SHADER_SPEC_VERSION 1 @@ -261,10 +266,16 @@ #define VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME "VK_KHR_vulkan_memory_model" #define VK_EXT_PCI_BUS_INFO_SPEC_VERSION 1 #define VK_EXT_PCI_BUS_INFO_EXTENSION_NAME "VK_EXT_pci_bus_info" +#define VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION 1 +#define VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME "VK_EXT_fragment_density_map" +#define VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION 1 +#define VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME "VK_EXT_scalar_block_layout" #define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 0 #define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1" #define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 0 #define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string" +#define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1 +#define VK_EXT_SEPARATE_STENCIL_USAGE_EXTENSION_NAME "VK_EXT_separate_stencil_usage" #define VK_MAKE_VERSION(major, minor, patch) \ (((major) << 22) | ((minor) << 12) | (patch)) @@ -273,11 +284,11 @@ #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) -#define VK_HEADER_VERSION 88 +#define VK_HEADER_VERSION 94 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; #define VK_NULL_HANDLE 0 - +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkAccelerationStructureNV) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkBuffer) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkBufferView) VK_DEFINE_HANDLE(VkCommandBuffer) @@ -322,7 +333,7 @@ typedef VkFlags VkAttachmentDescriptionFlags; typedef VkFlags VkBufferCreateFlags; typedef VkFlags VkBufferUsageFlags; typedef VkFlags VkBufferViewCreateFlags; -typedef VkFlags VkBuildAccelerationStructureFlagsNVX; +typedef VkFlags VkBuildAccelerationStructureFlagsNV; typedef VkFlags VkColorComponentFlags; typedef VkFlags VkCommandBufferResetFlags; typedef VkFlags VkCommandBufferUsageFlags; @@ -371,8 +382,8 @@ typedef VkFlags VkFenceImportFlags; typedef VkFenceImportFlags VkFenceImportFlagsKHR; typedef VkFlags VkFormatFeatureFlags; typedef VkFlags VkFramebufferCreateFlags; -typedef VkFlags VkGeometryFlagsNVX; -typedef VkFlags VkGeometryInstanceFlagsNVX; +typedef VkFlags VkGeometryFlagsNV; +typedef VkFlags VkGeometryInstanceFlagsNV; typedef VkFlags VkIOSSurfaceCreateFlagsMVK; typedef VkFlags VkImageAspectFlags; typedef VkFlags VkImageCreateFlags; @@ -387,7 +398,6 @@ typedef VkMemoryAllocateFlags VkMemoryAllocateFlagsKHR; typedef VkFlags VkMemoryHeapFlags; typedef VkFlags VkMemoryMapFlags; typedef VkFlags VkMemoryPropertyFlags; -typedef VkFlags VkMirSurfaceCreateFlagsKHR; typedef VkFlags VkObjectEntryUsageFlagsNVX; typedef VkFlags VkPeerMemoryFeatureFlags; typedef VkPeerMemoryFeatureFlags VkPeerMemoryFeatureFlagsKHR; @@ -439,6 +449,21 @@ typedef VkFlags VkWin32SurfaceCreateFlagsKHR; typedef VkFlags VkXcbSurfaceCreateFlagsKHR; typedef VkFlags VkXlibSurfaceCreateFlagsKHR; +typedef enum VkAccelerationStructureMemoryRequirementsTypeNV +{ + VK_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_TYPE_OBJECT_NV = 0, + VK_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_TYPE_BUILD_SCRATCH_NV = 1, + VK_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_TYPE_UPDATE_SCRATCH_NV = 2, + VK_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_TYPE_NV_MAX_ENUM = 0x7fffffff, +} VkAccelerationStructureMemoryRequirementsTypeNV; + +typedef enum VkAccelerationStructureTypeNV +{ + VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_NV = 0, + VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_NV = 1, + VK_ACCELERATION_STRUCTURE_TYPE_NV_MAX_ENUM = 0x7fffffff, +} VkAccelerationStructureTypeNV; + typedef enum VkAccessFlagBits { VK_ACCESS_INDIRECT_COMMAND_READ_BIT = 0x00000001, @@ -460,7 +485,10 @@ typedef enum VkAccessFlagBits VK_ACCESS_MEMORY_WRITE_BIT = 0x00010000, VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT = 0x00080000, VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT = 0x00100000, + VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV = 0x00200000, + VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV = 0x00400000, VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV = 0x00800000, + VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT = 0x01000000, VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000, VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000, VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000, @@ -608,11 +636,22 @@ typedef enum VkBufferUsageFlagBits VK_BUFFER_USAGE_VERTEX_BUFFER_BIT = 0x00000080, VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT = 0x00000100, VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT = 0x00000200, + VK_BUFFER_USAGE_RAY_TRACING_BIT_NV = 0x00000400, VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT = 0x00000800, VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT = 0x00001000, VK_BUFFER_USAGE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkBufferUsageFlagBits; +typedef enum VkBuildAccelerationStructureFlagBitsNV +{ + VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_UPDATE_BIT_NV = 0x00000001, + VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_COMPACTION_BIT_NV = 0x00000002, + VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_TRACE_BIT_NV = 0x00000004, + VK_BUILD_ACCELERATION_STRUCTURE_PREFER_FAST_BUILD_BIT_NV = 0x00000008, + VK_BUILD_ACCELERATION_STRUCTURE_LOW_MEMORY_BIT_NV = 0x00000010, + VK_BUILD_ACCELERATION_STRUCTURE_FLAG_BITS_NV_MAX_ENUM = 0x7fffffff, +} VkBuildAccelerationStructureFlagBitsNV; + typedef enum VkChromaLocation { VK_CHROMA_LOCATION_COSITED_EVEN = 0, @@ -716,6 +755,13 @@ typedef enum VkConservativeRasterizationModeEXT VK_CONSERVATIVE_RASTERIZATION_MODE_EXT_MAX_ENUM = 0x7fffffff, } VkConservativeRasterizationModeEXT; +typedef enum VkCopyAccelerationStructureModeNV +{ + VK_COPY_ACCELERATION_STRUCTURE_MODE_CLONE_NV = 0, + VK_COPY_ACCELERATION_STRUCTURE_MODE_COMPACT_NV = 1, + VK_COPY_ACCELERATION_STRUCTURE_MODE_NV_MAX_ENUM = 0x7fffffff, +} VkCopyAccelerationStructureModeNV; + typedef enum VkCoverageModulationModeNV { VK_COVERAGE_MODULATION_MODE_NONE_NV = 0, @@ -770,6 +816,7 @@ typedef enum VkDescriptorType VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC = 9, VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT = 10, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT = 1000138000, + VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV = 1000165000, VK_DESCRIPTOR_TYPE_MAX_ENUM = 0x7fffffff, } VkDescriptorType; @@ -813,6 +860,7 @@ typedef enum VkDriverIdKHR VK_DRIVER_ID_IMAGINATION_PROPRIETARY_KHR = 7, VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR = 8, VK_DRIVER_ID_ARM_PROPRIETARY_KHR = 9, + VK_DRIVER_ID_GOOGLE_PASTEL_KHR = 10, VK_DRIVER_ID_KHR_MAX_ENUM = 0x7fffffff, } VkDriverIdKHR; @@ -1167,6 +1215,7 @@ typedef enum VkFormatFeatureFlagBits VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT = 0x00200000, VK_FORMAT_FEATURE_DISJOINT_BIT = 0x00400000, VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT = 0x00800000, + VK_FORMAT_FEATURE_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x01000000, VK_FORMAT_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkFormatFeatureFlagBits; @@ -1177,6 +1226,29 @@ typedef enum VkFrontFace VK_FRONT_FACE_MAX_ENUM = 0x7fffffff, } VkFrontFace; +typedef enum VkGeometryFlagBitsNV +{ + VK_GEOMETRY_OPAQUE_BIT_NV = 0x00000001, + VK_GEOMETRY_NO_DUPLICATE_ANY_HIT_INVOCATION_BIT_NV = 0x00000002, + VK_GEOMETRY_FLAG_BITS_NV_MAX_ENUM = 0x7fffffff, +} VkGeometryFlagBitsNV; + +typedef enum VkGeometryInstanceFlagBitsNV +{ + VK_GEOMETRY_INSTANCE_TRIANGLE_CULL_DISABLE_BIT_NV = 0x00000001, + VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_NV = 0x00000002, + VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_NV = 0x00000004, + VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_NV = 0x00000008, + VK_GEOMETRY_INSTANCE_FLAG_BITS_NV_MAX_ENUM = 0x7fffffff, +} VkGeometryInstanceFlagBitsNV; + +typedef enum VkGeometryTypeNV +{ + VK_GEOMETRY_TYPE_TRIANGLES_NV = 0, + VK_GEOMETRY_TYPE_AABBS_NV = 1, + VK_GEOMETRY_TYPE_NV_MAX_ENUM = 0x7fffffff, +} VkGeometryTypeNV; + typedef enum VkImageAspectFlagBits { VK_IMAGE_ASPECT_COLOR_BIT = 0x00000001, @@ -1205,6 +1277,7 @@ typedef enum VkImageCreateFlagBits VK_IMAGE_CREATE_PROTECTED_BIT = 0x00000800, VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT = 0x00001000, VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV = 0x00002000, + VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT = 0x00004000, VK_IMAGE_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkImageCreateFlagBits; @@ -1223,6 +1296,7 @@ typedef enum VkImageLayout VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL = 1000117000, VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL = 1000117001, VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV = 1000164003, + VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT = 1000218000, VK_IMAGE_LAYOUT_MAX_ENUM = 0x7fffffff, } VkImageLayout; @@ -1252,9 +1326,16 @@ typedef enum VkImageUsageFlagBits VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT = 0x00000040, VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT = 0x00000080, VK_IMAGE_USAGE_SHADING_RATE_IMAGE_BIT_NV = 0x00000100, + VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x00000200, VK_IMAGE_USAGE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkImageUsageFlagBits; +typedef enum VkImageViewCreateFlagBits +{ + VK_IMAGE_VIEW_CREATE_FRAGMENT_DENSITY_MAP_DYNAMIC_BIT_EXT = 0x00000001, + VK_IMAGE_VIEW_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkImageViewCreateFlagBits; + typedef enum VkImageViewType { VK_IMAGE_VIEW_TYPE_1D = 0, @@ -1271,6 +1352,7 @@ typedef enum VkIndexType { VK_INDEX_TYPE_UINT16 = 0, VK_INDEX_TYPE_UINT32 = 1, + VK_INDEX_TYPE_NONE_NV = 1000165000, VK_INDEX_TYPE_MAX_ENUM = 0x7fffffff, } VkIndexType; @@ -1358,6 +1440,7 @@ typedef enum VkObjectType VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE = 1000085000, VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION = 1000156000, VK_OBJECT_TYPE_VALIDATION_CACHE_EXT = 1000160000, + VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV = 1000165000, VK_OBJECT_TYPE_MAX_ENUM = 0x7fffffff, } VkObjectType; @@ -1384,6 +1467,7 @@ typedef enum VkPipelineBindPoint { VK_PIPELINE_BIND_POINT_GRAPHICS = 0, VK_PIPELINE_BIND_POINT_COMPUTE = 1, + VK_PIPELINE_BIND_POINT_RAY_TRACING_NV = 1000165000, VK_PIPELINE_BIND_POINT_MAX_ENUM = 0x7fffffff, } VkPipelineBindPoint; @@ -1400,6 +1484,7 @@ typedef enum VkPipelineCreateFlagBits VK_PIPELINE_CREATE_DERIVATIVE_BIT = 0x00000004, VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT = 0x00000008, VK_PIPELINE_CREATE_DISPATCH_BASE = 0x00000010, + VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV = 0x00000020, VK_PIPELINE_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkPipelineCreateFlagBits; @@ -1425,8 +1510,11 @@ typedef enum VkPipelineStageFlagBits VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000, VK_PIPELINE_STAGE_TASK_SHADER_BIT_NV = 0x00080000, VK_PIPELINE_STAGE_MESH_SHADER_BIT_NV = 0x00100000, + VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_NV = 0x00200000, VK_PIPELINE_STAGE_SHADING_RATE_IMAGE_BIT_NV = 0x00400000, + VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000, VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000, + VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_NV = 0x02000000, VK_PIPELINE_STAGE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkPipelineStageFlagBits; @@ -1499,6 +1587,7 @@ typedef enum VkQueryType VK_QUERY_TYPE_PIPELINE_STATISTICS = 1, VK_QUERY_TYPE_TIMESTAMP = 2, VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT = 1000028004, + VK_QUERY_TYPE_ACCELERATION_STRUCTURE_COMPACTED_SIZE_NV = 1000165000, VK_QUERY_TYPE_MAX_ENUM = 0x7fffffff, } VkQueryType; @@ -1528,6 +1617,14 @@ typedef enum VkRasterizationOrderAMD VK_RASTERIZATION_ORDER_AMD_MAX_ENUM = 0x7fffffff, } VkRasterizationOrderAMD; +typedef enum VkRayTracingShaderGroupTypeNV +{ + VK_RAY_TRACING_SHADER_GROUP_TYPE_GENERAL_NV = 0, + VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_NV = 1, + VK_RAY_TRACING_SHADER_GROUP_TYPE_PROCEDURAL_HIT_GROUP_NV = 2, + VK_RAY_TRACING_SHADER_GROUP_TYPE_NV_MAX_ENUM = 0x7fffffff, +} VkRayTracingShaderGroupTypeNV; + typedef enum VkResult { VK_ERROR_NOT_PERMITTED_EXT = -1000174001, @@ -1582,6 +1679,13 @@ typedef enum VkSamplerAddressMode VK_SAMPLER_ADDRESS_MODE_MAX_ENUM = 0x7fffffff, } VkSamplerAddressMode; +typedef enum VkSamplerCreateFlagBits +{ + VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT = 0x00000001, + VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT = 0x00000002, + VK_SAMPLER_CREATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, +} VkSamplerCreateFlagBits; + typedef enum VkSamplerMipmapMode { VK_SAMPLER_MIPMAP_MODE_NEAREST = 0, @@ -1639,6 +1743,12 @@ typedef enum VkShaderStageFlagBits VK_SHADER_STAGE_COMPUTE_BIT = 0x00000020, VK_SHADER_STAGE_TASK_BIT_NV = 0x00000040, VK_SHADER_STAGE_MESH_BIT_NV = 0x00000080, + VK_SHADER_STAGE_RAYGEN_BIT_NV = 0x00000100, + VK_SHADER_STAGE_ANY_HIT_BIT_NV = 0x00000200, + VK_SHADER_STAGE_CLOSEST_HIT_BIT_NV = 0x00000400, + VK_SHADER_STAGE_MISS_BIT_NV = 0x00000800, + VK_SHADER_STAGE_INTERSECTION_BIT_NV = 0x00001000, + VK_SHADER_STAGE_CALLABLE_BIT_NV = 0x00002000, VK_SHADER_STAGE_ALL = 0x7fffffff, VK_SHADER_STAGE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkShaderStageFlagBits; @@ -1876,6 +1986,17 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV = 1000164001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_PROPERTIES_NV = 1000164002, VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_COARSE_SAMPLE_ORDER_STATE_CREATE_INFO_NV = 1000164005, + VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_NV = 1000165000, + VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_NV = 1000165001, + VK_STRUCTURE_TYPE_GEOMETRY_NV = 1000165003, + VK_STRUCTURE_TYPE_GEOMETRY_TRIANGLES_NV = 1000165004, + VK_STRUCTURE_TYPE_GEOMETRY_AABB_NV = 1000165005, + VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NV = 1000165006, + VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_NV = 1000165007, + VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NV = 1000165008, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV = 1000165009, + VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_NV = 1000165011, + VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_INFO_NV = 1000165012, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_REPRESENTATIVE_FRAGMENT_TEST_FEATURES_NV = 1000166000, VK_STRUCTURE_TYPE_PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV = 1000166001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES = 1000168000, @@ -1899,6 +2020,11 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV = 1000206001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR = 1000211000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT = 1000212000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT = 1000218000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT = 1000218001, + VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = 1000221000, + VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = 1000246000, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7fffffff, } VkStructureType; @@ -1946,6 +2072,7 @@ typedef enum VkSwapchainCreateFlagBitsKHR { VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = 0x00000001, VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR = 0x00000002, + VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR = 0x00000004, VK_SWAPCHAIN_CREATE_FLAG_BITS_KHR_MAX_ENUM = 0x7fffffff, } VkSwapchainCreateFlagBitsKHR; @@ -2027,32 +2154,26 @@ typedef void* (VKAPI_PTR * PFN_vkReallocationFunction)( typedef void (VKAPI_PTR * PFN_vkVoidFunction)( void); -typedef struct VkAcquireNextImageInfoKHR +typedef struct VkAccelerationStructureMemoryRequirementsInfoNV { VkStructureType sType; const void *pNext; - VkSwapchainKHR WINE_VK_ALIGN(8) swapchain; - uint64_t WINE_VK_ALIGN(8) timeout; - VkSemaphore WINE_VK_ALIGN(8) semaphore; - VkFence WINE_VK_ALIGN(8) fence; - uint32_t deviceMask; -} VkAcquireNextImageInfoKHR; + VkAccelerationStructureMemoryRequirementsTypeNV type; + VkAccelerationStructureNV WINE_VK_ALIGN(8) accelerationStructure; +} VkAccelerationStructureMemoryRequirementsInfoNV; -typedef struct VkApplicationInfo +typedef struct VkAllocationCallbacks { - VkStructureType sType; - const void *pNext; - const char *pApplicationName; - uint32_t applicationVersion; - const char *pEngineName; - uint32_t engineVersion; - uint32_t apiVersion; -} VkApplicationInfo; + void *pUserData; + PFN_vkAllocationFunction pfnAllocation; + PFN_vkReallocationFunction pfnReallocation; + PFN_vkFreeFunction pfnFree; + PFN_vkInternalAllocationNotification pfnInternalAllocation; + PFN_vkInternalFreeNotification pfnInternalFree; +} VkAllocationCallbacks; -typedef struct VkAttachmentDescription2KHR +typedef struct VkAttachmentDescription { - VkStructureType sType; - const void *pNext; VkAttachmentDescriptionFlags flags; VkFormat format; VkSampleCountFlagBits samples; @@ -2062,16 +2183,13 @@ typedef struct VkAttachmentDescription2KHR VkAttachmentStoreOp stencilStoreOp; VkImageLayout initialLayout; VkImageLayout finalLayout; -} VkAttachmentDescription2KHR; +} VkAttachmentDescription; -typedef struct VkAttachmentReference2KHR +typedef struct VkAttachmentReference { - VkStructureType sType; - const void *pNext; uint32_t attachment; VkImageLayout layout; - VkImageAspectFlags aspectMask; -} VkAttachmentReference2KHR; +} VkAttachmentReference; typedef struct VkBaseInStructure { @@ -2079,6 +2197,17 @@ typedef struct VkBaseInStructure const struct VkBaseInStructure *pNext; } VkBaseInStructure; +typedef struct VkBindAccelerationStructureMemoryInfoNV +{ + VkStructureType sType; + const void *pNext; + VkAccelerationStructureNV WINE_VK_ALIGN(8) accelerationStructure; + VkDeviceMemory WINE_VK_ALIGN(8) memory; + VkDeviceSize WINE_VK_ALIGN(8) memoryOffset; + uint32_t deviceIndexCount; + const uint32_t *pDeviceIndices; +} VkBindAccelerationStructureMemoryInfoNV; + typedef struct VkBindImagePlaneMemoryInfo { VkStructureType sType; @@ -2173,12 +2302,12 @@ typedef struct VkDedicatedAllocationImageCreateInfoNV VkBool32 dedicatedAllocation; } VkDedicatedAllocationImageCreateInfoNV; -typedef struct VkDescriptorImageInfo +typedef struct VkDescriptorBufferInfo { - VkSampler WINE_VK_ALIGN(8) sampler; - VkImageView WINE_VK_ALIGN(8) imageView; - VkImageLayout imageLayout; -} VkDescriptorImageInfo; + VkBuffer WINE_VK_ALIGN(8) buffer; + VkDeviceSize WINE_VK_ALIGN(8) offset; + VkDeviceSize WINE_VK_ALIGN(8) range; +} VkDescriptorBufferInfo; typedef struct VkDescriptorPoolInlineUniformBlockCreateInfoEXT { @@ -2228,66 +2357,54 @@ typedef struct VkDeviceGroupPresentInfoKHR VkDeviceGroupPresentModeFlagBitsKHR mode; } VkDeviceGroupPresentInfoKHR; -typedef struct VkDeviceQueueCreateInfo +typedef struct VkDeviceQueueGlobalPriorityCreateInfoEXT { VkStructureType sType; const void *pNext; - VkDeviceQueueCreateFlags flags; - uint32_t queueFamilyIndex; - uint32_t queueCount; - const float *pQueuePriorities; -} VkDeviceQueueCreateInfo; + VkQueueGlobalPriorityEXT globalPriority; +} VkDeviceQueueGlobalPriorityCreateInfoEXT; -typedef struct VkDeviceQueueInfo2 +typedef struct VkDispatchIndirectCommand { - VkStructureType sType; - const void *pNext; - VkDeviceQueueCreateFlags flags; - uint32_t queueFamilyIndex; - uint32_t queueIndex; -} VkDeviceQueueInfo2; + uint32_t x; + uint32_t y; + uint32_t z; +} VkDispatchIndirectCommand; -typedef struct VkDrawIndirectCommand +typedef struct VkDrawIndexedIndirectCommand { - uint32_t vertexCount; + uint32_t indexCount; uint32_t instanceCount; - uint32_t firstVertex; + uint32_t firstIndex; + int32_t vertexOffset; uint32_t firstInstance; -} VkDrawIndirectCommand; +} VkDrawIndexedIndirectCommand; -typedef struct VkEventCreateInfo +typedef struct VkDrawMeshTasksIndirectCommandNV { - VkStructureType sType; - const void *pNext; - VkEventCreateFlags flags; -} VkEventCreateInfo; + uint32_t taskCount; + uint32_t firstTask; +} VkDrawMeshTasksIndirectCommandNV; -typedef struct VkExportMemoryAllocateInfo +typedef struct VkExportFenceCreateInfo { VkStructureType sType; const void *pNext; - VkExternalMemoryHandleTypeFlags handleTypes; -} VkExportMemoryAllocateInfo; + VkExternalFenceHandleTypeFlags handleTypes; +} VkExportFenceCreateInfo; -typedef struct VkExportMemoryAllocateInfoNV +typedef struct VkExportSemaphoreCreateInfo { VkStructureType sType; const void *pNext; - VkExternalMemoryHandleTypeFlagsNV handleTypes; -} VkExportMemoryAllocateInfoNV; - -typedef struct VkExtensionProperties -{ - char extensionName[VK_MAX_EXTENSION_NAME_SIZE]; - uint32_t specVersion; -} VkExtensionProperties; + VkExternalSemaphoreHandleTypeFlags handleTypes; +} VkExportSemaphoreCreateInfo; -typedef struct VkExtent3D +typedef struct VkExtent2D { uint32_t width; uint32_t height; - uint32_t depth; -} VkExtent3D; +} VkExtent2D; typedef struct VkExternalMemoryBufferCreateInfo { @@ -2317,32 +2434,32 @@ typedef struct VkFormatProperties VkFormatFeatureFlags bufferFeatures; } VkFormatProperties; -typedef struct VkImageCreateInfo +typedef struct VkGeometryAABBNV { VkStructureType sType; const void *pNext; - VkImageCreateFlags flags; - VkImageType imageType; - VkFormat format; - VkExtent3D extent; - uint32_t mipLevels; - uint32_t arrayLayers; - VkSampleCountFlagBits samples; - VkImageTiling tiling; - VkImageUsageFlags usage; - VkSharingMode sharingMode; - uint32_t queueFamilyIndexCount; - const uint32_t *pQueueFamilyIndices; - VkImageLayout initialLayout; -} VkImageCreateInfo; + VkBuffer WINE_VK_ALIGN(8) aabbData; + uint32_t numAABBs; + uint32_t stride; + VkDeviceSize WINE_VK_ALIGN(8) offset; +} VkGeometryAABBNV; -typedef struct VkImageFormatListCreateInfoKHR +typedef struct VkGeometryTrianglesNV { VkStructureType sType; const void *pNext; - uint32_t viewFormatCount; - const VkFormat *pViewFormats; -} VkImageFormatListCreateInfoKHR; + VkBuffer WINE_VK_ALIGN(8) vertexData; + VkDeviceSize WINE_VK_ALIGN(8) vertexOffset; + uint32_t vertexCount; + VkDeviceSize WINE_VK_ALIGN(8) vertexStride; + VkFormat vertexFormat; + VkBuffer WINE_VK_ALIGN(8) indexData; + VkDeviceSize WINE_VK_ALIGN(8) indexOffset; + uint32_t indexCount; + VkIndexType indexType; + VkBuffer WINE_VK_ALIGN(8) transformData; + VkDeviceSize WINE_VK_ALIGN(8) transformOffset; +} VkGeometryTrianglesNV; typedef struct VkImageMemoryRequirementsInfo2 { @@ -2358,28 +2475,27 @@ typedef struct VkImageSparseMemoryRequirementsInfo2 VkImage WINE_VK_ALIGN(8) image; } VkImageSparseMemoryRequirementsInfo2; -typedef struct VkImageSubresource +typedef struct VkImageStencilUsageCreateInfoEXT { - VkImageAspectFlags aspectMask; - uint32_t mipLevel; - uint32_t arrayLayer; -} VkImageSubresource; + VkStructureType sType; + const void *pNext; + VkImageUsageFlags stencilUsage; +} VkImageStencilUsageCreateInfoEXT; -typedef struct VkImageSubresourceRange +typedef struct VkImageSubresourceLayers { VkImageAspectFlags aspectMask; - uint32_t baseMipLevel; - uint32_t levelCount; + uint32_t mipLevel; uint32_t baseArrayLayer; uint32_t layerCount; -} VkImageSubresourceRange; +} VkImageSubresourceLayers; -typedef struct VkImageViewASTCDecodeModeEXT +typedef struct VkImageSwapchainCreateInfoKHR { VkStructureType sType; const void *pNext; - VkFormat decodeMode; -} VkImageViewASTCDecodeModeEXT; + VkSwapchainKHR WINE_VK_ALIGN(8) swapchain; +} VkImageSwapchainCreateInfoKHR; typedef struct VkImageViewUsageCreateInfo { @@ -2395,138 +2511,132 @@ typedef struct VkInputAttachmentAspectReference VkImageAspectFlags aspectMask; } VkInputAttachmentAspectReference; -typedef struct VkInstanceCreateInfo +typedef struct VkLayerProperties { - VkStructureType sType; - const void *pNext; - VkInstanceCreateFlags flags; - const VkApplicationInfo *pApplicationInfo; - uint32_t enabledLayerCount; - const char * const*ppEnabledLayerNames; - uint32_t enabledExtensionCount; - const char * const*ppEnabledExtensionNames; -} VkInstanceCreateInfo; + char layerName[VK_MAX_EXTENSION_NAME_SIZE]; + uint32_t specVersion; + uint32_t implementationVersion; + char description[VK_MAX_DESCRIPTION_SIZE]; +} VkLayerProperties; -typedef struct VkMemoryAllocateFlagsInfo +typedef struct VkMappedMemoryRange { VkStructureType sType; const void *pNext; - VkMemoryAllocateFlags flags; - uint32_t deviceMask; -} VkMemoryAllocateFlagsInfo; + VkDeviceMemory WINE_VK_ALIGN(8) memory; + VkDeviceSize WINE_VK_ALIGN(8) offset; + VkDeviceSize WINE_VK_ALIGN(8) size; +} VkMappedMemoryRange; -typedef struct VkMemoryAllocateInfo +typedef struct VkMemoryBarrier { VkStructureType sType; const void *pNext; - VkDeviceSize WINE_VK_ALIGN(8) allocationSize; - uint32_t memoryTypeIndex; -} VkMemoryAllocateInfo; + VkAccessFlags srcAccessMask; + VkAccessFlags dstAccessMask; +} VkMemoryBarrier; -typedef struct VkMemoryDedicatedAllocateInfo +typedef struct VkMemoryType { - VkStructureType sType; - const void *pNext; - VkImage WINE_VK_ALIGN(8) image; - VkBuffer WINE_VK_ALIGN(8) buffer; -} VkMemoryDedicatedAllocateInfo; + VkMemoryPropertyFlags propertyFlags; + uint32_t heapIndex; +} VkMemoryType; -typedef struct VkMemoryDedicatedRequirements +typedef struct VkMultisamplePropertiesEXT { VkStructureType sType; void *pNext; - VkBool32 prefersDedicatedAllocation; - VkBool32 requiresDedicatedAllocation; -} VkMemoryDedicatedRequirements; + VkExtent2D maxSampleLocationGridSize; +} VkMultisamplePropertiesEXT; -typedef struct VkMemoryHeap +typedef struct VkOffset3D { - VkDeviceSize WINE_VK_ALIGN(8) size; - VkMemoryHeapFlags flags; -} VkMemoryHeap; + int32_t x; + int32_t y; + int32_t z; +} VkOffset3D; -typedef struct VkMemoryRequirements +typedef struct VkPhysicalDevice16BitStorageFeatures { - VkDeviceSize WINE_VK_ALIGN(8) size; - VkDeviceSize WINE_VK_ALIGN(8) alignment; - uint32_t memoryTypeBits; -} VkMemoryRequirements; + VkStructureType sType; + void *pNext; + VkBool32 storageBuffer16BitAccess; + VkBool32 uniformAndStorageBuffer16BitAccess; + VkBool32 storagePushConstant16; + VkBool32 storageInputOutput16; +} VkPhysicalDevice16BitStorageFeatures; -typedef struct VkMemoryRequirements2KHR +typedef struct VkPhysicalDevice8BitStorageFeaturesKHR { VkStructureType sType; void *pNext; - VkMemoryRequirements WINE_VK_ALIGN(8) memoryRequirements; -} VkMemoryRequirements2KHR; - -typedef struct VkOffset2D -{ - int32_t x; - int32_t y; -} VkOffset2D; + VkBool32 storageBuffer8BitAccess; + VkBool32 uniformAndStorageBuffer8BitAccess; + VkBool32 storagePushConstant8; +} VkPhysicalDevice8BitStorageFeaturesKHR; -typedef struct VkPhysicalDeviceASTCDecodeFeaturesEXT +typedef struct VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT { VkStructureType sType; void *pNext; - VkBool32 decodeModeSharedExponent; -} VkPhysicalDeviceASTCDecodeFeaturesEXT; + VkBool32 advancedBlendCoherentOperations; +} VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT; -typedef struct VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT +typedef struct VkPhysicalDeviceComputeShaderDerivativesFeaturesNV { VkStructureType sType; void *pNext; - uint32_t advancedBlendMaxColorAttachments; - VkBool32 advancedBlendIndependentBlend; - VkBool32 advancedBlendNonPremultipliedSrcColor; - VkBool32 advancedBlendNonPremultipliedDstColor; - VkBool32 advancedBlendCorrelatedOverlap; - VkBool32 advancedBlendAllOperations; -} VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT; + VkBool32 computeDerivativeGroupQuads; + VkBool32 computeDerivativeGroupLinear; +} VkPhysicalDeviceComputeShaderDerivativesFeaturesNV; -typedef struct VkPhysicalDeviceConditionalRenderingFeaturesEXT +typedef struct VkPhysicalDeviceConservativeRasterizationPropertiesEXT { VkStructureType sType; void *pNext; - VkBool32 conditionalRendering; - VkBool32 inheritedConditionalRendering; -} VkPhysicalDeviceConditionalRenderingFeaturesEXT; + float primitiveOverestimationSize; + float maxExtraPrimitiveOverestimationSize; + float extraPrimitiveOverestimationSizeGranularity; + VkBool32 primitiveUnderestimation; + VkBool32 conservativePointAndLineRasterization; + VkBool32 degenerateTrianglesRasterized; + VkBool32 degenerateLinesRasterized; + VkBool32 fullyCoveredFragmentShaderInputVariable; + VkBool32 conservativeRasterizationPostDepthCoverage; +} VkPhysicalDeviceConservativeRasterizationPropertiesEXT; -typedef struct VkPhysicalDeviceCornerSampledImageFeaturesNV +typedef struct VkPhysicalDeviceDescriptorIndexingFeaturesEXT { VkStructureType sType; void *pNext; - VkBool32 cornerSampledImage; -} VkPhysicalDeviceCornerSampledImageFeaturesNV; + VkBool32 shaderInputAttachmentArrayDynamicIndexing; + VkBool32 shaderUniformTexelBufferArrayDynamicIndexing; + VkBool32 shaderStorageTexelBufferArrayDynamicIndexing; + VkBool32 shaderUniformBufferArrayNonUniformIndexing; + VkBool32 shaderSampledImageArrayNonUniformIndexing; + VkBool32 shaderStorageBufferArrayNonUniformIndexing; + VkBool32 shaderStorageImageArrayNonUniformIndexing; + VkBool32 shaderInputAttachmentArrayNonUniformIndexing; + VkBool32 shaderUniformTexelBufferArrayNonUniformIndexing; + VkBool32 shaderStorageTexelBufferArrayNonUniformIndexing; + VkBool32 descriptorBindingUniformBufferUpdateAfterBind; + VkBool32 descriptorBindingSampledImageUpdateAfterBind; + VkBool32 descriptorBindingStorageImageUpdateAfterBind; + VkBool32 descriptorBindingStorageBufferUpdateAfterBind; + VkBool32 descriptorBindingUniformTexelBufferUpdateAfterBind; + VkBool32 descriptorBindingStorageTexelBufferUpdateAfterBind; + VkBool32 descriptorBindingUpdateUnusedWhilePending; + VkBool32 descriptorBindingPartiallyBound; + VkBool32 descriptorBindingVariableDescriptorCount; + VkBool32 runtimeDescriptorArray; +} VkPhysicalDeviceDescriptorIndexingFeaturesEXT; -typedef struct VkPhysicalDeviceDescriptorIndexingPropertiesEXT +typedef struct VkPhysicalDeviceDiscardRectanglePropertiesEXT { VkStructureType sType; void *pNext; - uint32_t maxUpdateAfterBindDescriptorsInAllPools; - VkBool32 shaderUniformBufferArrayNonUniformIndexingNative; - VkBool32 shaderSampledImageArrayNonUniformIndexingNative; - VkBool32 shaderStorageBufferArrayNonUniformIndexingNative; - VkBool32 shaderStorageImageArrayNonUniformIndexingNative; - VkBool32 shaderInputAttachmentArrayNonUniformIndexingNative; - VkBool32 robustBufferAccessUpdateAfterBind; - VkBool32 quadDivergentImplicitLod; - uint32_t maxPerStageDescriptorUpdateAfterBindSamplers; - uint32_t maxPerStageDescriptorUpdateAfterBindUniformBuffers; - uint32_t maxPerStageDescriptorUpdateAfterBindStorageBuffers; - uint32_t maxPerStageDescriptorUpdateAfterBindSampledImages; - uint32_t maxPerStageDescriptorUpdateAfterBindStorageImages; - uint32_t maxPerStageDescriptorUpdateAfterBindInputAttachments; - uint32_t maxPerStageUpdateAfterBindResources; - uint32_t maxDescriptorSetUpdateAfterBindSamplers; - uint32_t maxDescriptorSetUpdateAfterBindUniformBuffers; - uint32_t maxDescriptorSetUpdateAfterBindUniformBuffersDynamic; - uint32_t maxDescriptorSetUpdateAfterBindStorageBuffers; - uint32_t maxDescriptorSetUpdateAfterBindStorageBuffersDynamic; - uint32_t maxDescriptorSetUpdateAfterBindSampledImages; - uint32_t maxDescriptorSetUpdateAfterBindStorageImages; - uint32_t maxDescriptorSetUpdateAfterBindInputAttachments; -} VkPhysicalDeviceDescriptorIndexingPropertiesEXT; + uint32_t maxDiscardRectangles; +} VkPhysicalDeviceDiscardRectanglePropertiesEXT; typedef struct VkPhysicalDeviceExclusiveScissorFeaturesNV { @@ -2601,6 +2711,15 @@ typedef struct VkPhysicalDeviceFeatures VkBool32 inheritedQueries; } VkPhysicalDeviceFeatures; +typedef struct VkPhysicalDeviceFragmentDensityMapPropertiesEXT +{ + VkStructureType sType; + void *pNext; + VkExtent2D minFragmentDensityTexelSize; + VkExtent2D maxFragmentDensityTexelSize; + VkBool32 fragmentDensityInvocations; +} VkPhysicalDeviceFragmentDensityMapPropertiesEXT; + typedef struct VkPhysicalDeviceGroupProperties { VkStructureType sType; @@ -2684,13 +2803,44 @@ typedef struct VkPhysicalDeviceProtectedMemoryProperties VkBool32 protectedNoFault; } VkPhysicalDeviceProtectedMemoryProperties; -typedef struct VkPhysicalDeviceSamplerFilterMinmaxPropertiesEXT +typedef struct VkPhysicalDeviceRayTracingPropertiesNV { VkStructureType sType; void *pNext; - VkBool32 filterMinmaxSingleComponentFormats; - VkBool32 filterMinmaxImageComponentMapping; -} VkPhysicalDeviceSamplerFilterMinmaxPropertiesEXT; + uint32_t shaderGroupHandleSize; + uint32_t maxRecursionDepth; + uint32_t maxShaderGroupStride; + uint32_t shaderGroupBaseAlignment; + uint64_t WINE_VK_ALIGN(8) maxGeometryCount; + uint64_t WINE_VK_ALIGN(8) maxInstanceCount; + uint64_t WINE_VK_ALIGN(8) maxTriangleCount; + uint32_t maxDescriptorSetAccelerationStructures; +} VkPhysicalDeviceRayTracingPropertiesNV; + +typedef struct VkPhysicalDeviceSampleLocationsPropertiesEXT +{ + VkStructureType sType; + void *pNext; + VkSampleCountFlags sampleLocationSampleCounts; + VkExtent2D maxSampleLocationGridSize; + float sampleLocationCoordinateRange[2]; + uint32_t sampleLocationSubPixelBits; + VkBool32 variableSampleLocations; +} VkPhysicalDeviceSampleLocationsPropertiesEXT; + +typedef struct VkPhysicalDeviceSamplerYcbcrConversionFeatures +{ + VkStructureType sType; + void *pNext; + VkBool32 samplerYcbcrConversion; +} VkPhysicalDeviceSamplerYcbcrConversionFeatures; + +typedef struct VkPhysicalDeviceScalarBlockLayoutFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 scalarBlockLayout; +} VkPhysicalDeviceScalarBlockLayoutFeaturesEXT; typedef struct VkPhysicalDeviceShaderCorePropertiesAMD { @@ -2719,69 +2869,65 @@ typedef struct VkPhysicalDeviceShaderImageFootprintFeaturesNV VkBool32 imageFootprint; } VkPhysicalDeviceShaderImageFootprintFeaturesNV; -typedef struct VkPhysicalDeviceSparseImageFormatInfo2 +typedef struct VkPhysicalDeviceShadingRateImagePropertiesNV { VkStructureType sType; - const void *pNext; - VkFormat format; - VkImageType type; - VkSampleCountFlagBits samples; - VkImageUsageFlags usage; - VkImageTiling tiling; -} VkPhysicalDeviceSparseImageFormatInfo2; + void *pNext; + VkExtent2D shadingRateTexelSize; + uint32_t shadingRatePaletteSize; + uint32_t shadingRateMaxCoarseSamples; +} VkPhysicalDeviceShadingRateImagePropertiesNV; -typedef struct VkPhysicalDeviceSparseProperties +typedef struct VkPhysicalDeviceSubgroupProperties { - VkBool32 residencyStandard2DBlockShape; - VkBool32 residencyStandard2DMultisampleBlockShape; - VkBool32 residencyStandard3DBlockShape; - VkBool32 residencyAlignedMipSize; - VkBool32 residencyNonResidentStrict; -} VkPhysicalDeviceSparseProperties; + VkStructureType sType; + void *pNext; + uint32_t subgroupSize; + VkShaderStageFlags supportedStages; + VkSubgroupFeatureFlags supportedOperations; + VkBool32 quadOperationsInAllStages; +} VkPhysicalDeviceSubgroupProperties; -typedef struct VkPhysicalDeviceTransformFeedbackPropertiesEXT +typedef struct VkPhysicalDeviceTransformFeedbackFeaturesEXT { VkStructureType sType; void *pNext; - uint32_t maxTransformFeedbackStreams; - uint32_t maxTransformFeedbackBuffers; - VkDeviceSize WINE_VK_ALIGN(8) maxTransformFeedbackBufferSize; - uint32_t maxTransformFeedbackStreamDataSize; - uint32_t maxTransformFeedbackBufferDataSize; - uint32_t maxTransformFeedbackBufferDataStride; - VkBool32 transformFeedbackQueries; - VkBool32 transformFeedbackStreamsLinesTriangles; - VkBool32 transformFeedbackRasterizationStreamSelect; - VkBool32 transformFeedbackDraw; -} VkPhysicalDeviceTransformFeedbackPropertiesEXT; + VkBool32 transformFeedback; + VkBool32 geometryStreams; +} VkPhysicalDeviceTransformFeedbackFeaturesEXT; -typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT +typedef struct VkPhysicalDeviceVariablePointerFeatures { VkStructureType sType; void *pNext; - uint32_t maxVertexAttribDivisor; -} VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT; + VkBool32 variablePointersStorageBuffer; + VkBool32 variablePointers; +} VkPhysicalDeviceVariablePointerFeatures; -typedef struct VkPipelineCacheCreateInfo +typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT { VkStructureType sType; - const void *pNext; - VkPipelineCacheCreateFlags flags; - size_t initialDataSize; - const void *pInitialData; -} VkPipelineCacheCreateInfo; + void *pNext; + VkBool32 vertexAttributeInstanceRateDivisor; + VkBool32 vertexAttributeInstanceRateZeroDivisor; +} VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT; -typedef struct VkPipelineColorBlendAttachmentState +typedef struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR { - VkBool32 blendEnable; - VkBlendFactor srcColorBlendFactor; - VkBlendFactor dstColorBlendFactor; - VkBlendOp colorBlendOp; - VkBlendFactor srcAlphaBlendFactor; - VkBlendFactor dstAlphaBlendFactor; - VkBlendOp alphaBlendOp; - VkColorComponentFlags colorWriteMask; -} VkPipelineColorBlendAttachmentState; + VkStructureType sType; + void *pNext; + VkBool32 vulkanMemoryModel; + VkBool32 vulkanMemoryModelDeviceScope; +} VkPhysicalDeviceVulkanMemoryModelFeaturesKHR; + +typedef struct VkPipelineColorBlendAdvancedStateCreateInfoEXT +{ + VkStructureType sType; + const void *pNext; + VkBool32 srcPremultiplied; + VkBool32 dstPremultiplied; + VkBlendOverlapEXT blendOverlap; +} VkPipelineColorBlendAdvancedStateCreateInfoEXT; typedef struct VkPipelineCoverageModulationStateCreateInfoNV { @@ -2885,33 +3031,23 @@ typedef struct VkQueryPoolCreateInfo VkQueryPipelineStatisticFlags pipelineStatistics; } VkQueryPoolCreateInfo; -typedef struct VkQueueFamilyProperties -{ - VkQueueFlags queueFlags; - uint32_t queueCount; - uint32_t timestampValidBits; - VkExtent3D minImageTransferGranularity; -} VkQueueFamilyProperties; - -typedef struct VkRenderPassInputAttachmentAspectCreateInfo +typedef struct VkRayTracingShaderGroupCreateInfoNV { VkStructureType sType; const void *pNext; - uint32_t aspectReferenceCount; - const VkInputAttachmentAspectReference *pAspectReferences; -} VkRenderPassInputAttachmentAspectCreateInfo; + VkRayTracingShaderGroupTypeNV type; + uint32_t generalShader; + uint32_t closestHitShader; + uint32_t anyHitShader; + uint32_t intersectionShader; +} VkRayTracingShaderGroupCreateInfoNV; -typedef struct VkRenderPassMultiviewCreateInfo +typedef struct VkRenderPassFragmentDensityMapCreateInfoEXT { VkStructureType sType; const void *pNext; - uint32_t subpassCount; - const uint32_t *pViewMasks; - uint32_t dependencyCount; - const int32_t *pViewOffsets; - uint32_t correlationMaskCount; - const uint32_t *pCorrelationMasks; -} VkRenderPassMultiviewCreateInfo; + VkAttachmentReference fragmentDensityMapAttachment; +} VkRenderPassFragmentDensityMapCreateInfoEXT; typedef struct VkSampleLocationEXT { @@ -2965,22 +3101,6 @@ typedef struct VkShadingRatePaletteNV const VkShadingRatePaletteEntryNV *pShadingRatePaletteEntries; } VkShadingRatePaletteNV; -typedef struct VkSparseImageFormatProperties -{ - VkImageAspectFlags aspectMask; - VkExtent3D imageGranularity; - VkSparseImageFormatFlags flags; -} VkSparseImageFormatProperties; - -typedef struct VkSparseImageMemoryRequirements -{ - VkSparseImageFormatProperties formatProperties; - uint32_t imageMipTailFirstLod; - VkDeviceSize WINE_VK_ALIGN(8) imageMipTailSize; - VkDeviceSize WINE_VK_ALIGN(8) imageMipTailOffset; - VkDeviceSize WINE_VK_ALIGN(8) imageMipTailStride; -} VkSparseImageMemoryRequirements; - typedef struct VkSparseMemoryBind { VkDeviceSize WINE_VK_ALIGN(8) resourceOffset; @@ -3021,22 +3141,25 @@ typedef struct VkSubpassDependency VkDependencyFlags dependencyFlags; } VkSubpassDependency; -typedef struct VkSubpassDescription2KHR +typedef struct VkSubpassDescription { - VkStructureType sType; - const void *pNext; VkSubpassDescriptionFlags flags; VkPipelineBindPoint pipelineBindPoint; - uint32_t viewMask; uint32_t inputAttachmentCount; - const VkAttachmentReference2KHR *pInputAttachments; + const VkAttachmentReference *pInputAttachments; uint32_t colorAttachmentCount; - const VkAttachmentReference2KHR *pColorAttachments; - const VkAttachmentReference2KHR *pResolveAttachments; - const VkAttachmentReference2KHR *pDepthStencilAttachment; + const VkAttachmentReference *pColorAttachments; + const VkAttachmentReference *pResolveAttachments; + const VkAttachmentReference *pDepthStencilAttachment; uint32_t preserveAttachmentCount; const uint32_t *pPreserveAttachments; -} VkSubpassDescription2KHR; +} VkSubpassDescription; + +typedef struct VkSubpassEndInfoKHR +{ + VkStructureType sType; + const void *pNext; +} VkSubpassEndInfoKHR; typedef struct VkSubresourceLayout { @@ -3069,16 +3192,29 @@ typedef struct VkViewportSwizzleNV VkViewportCoordinateSwizzleNV w; } VkViewportSwizzleNV; -typedef struct VkWriteDescriptorSetInlineUniformBlockEXT +typedef struct VkWriteDescriptorSetAccelerationStructureNV { VkStructureType sType; const void *pNext; - uint32_t dataSize; - const void *pData; -} VkWriteDescriptorSetInlineUniformBlockEXT; + uint32_t accelerationStructureCount; + const VkAccelerationStructureNV *pAccelerationStructures; +} VkWriteDescriptorSetAccelerationStructureNV; -typedef struct VkAttachmentDescription +typedef struct VkAcquireNextImageInfoKHR +{ + VkStructureType sType; + const void *pNext; + VkSwapchainKHR WINE_VK_ALIGN(8) swapchain; + uint64_t WINE_VK_ALIGN(8) timeout; + VkSemaphore WINE_VK_ALIGN(8) semaphore; + VkFence WINE_VK_ALIGN(8) fence; + uint32_t deviceMask; +} VkAcquireNextImageInfoKHR; + +typedef struct VkAttachmentDescription2KHR { + VkStructureType sType; + const void *pNext; VkAttachmentDescriptionFlags flags; VkFormat format; VkSampleCountFlagBits samples; @@ -3088,7 +3224,7 @@ typedef struct VkAttachmentDescription VkAttachmentStoreOp stencilStoreOp; VkImageLayout initialLayout; VkImageLayout finalLayout; -} VkAttachmentDescription; +} VkAttachmentDescription2KHR; typedef struct VkBaseOutStructure { @@ -3188,12 +3324,12 @@ typedef struct VkDedicatedAllocationBufferCreateInfoNV VkBool32 dedicatedAllocation; } VkDedicatedAllocationBufferCreateInfoNV; -typedef struct VkDescriptorBufferInfo +typedef struct VkDescriptorImageInfo { - VkBuffer WINE_VK_ALIGN(8) buffer; - VkDeviceSize WINE_VK_ALIGN(8) offset; - VkDeviceSize WINE_VK_ALIGN(8) range; -} VkDescriptorBufferInfo; + VkSampler WINE_VK_ALIGN(8) sampler; + VkImageView WINE_VK_ALIGN(8) imageView; + VkImageLayout imageLayout; +} VkDescriptorImageInfo; typedef struct VkDescriptorPoolSize { @@ -3238,38 +3374,43 @@ typedef struct VkDeviceGroupSubmitInfo const uint32_t *pSignalSemaphoreDeviceIndices; } VkDeviceGroupSubmitInfo; -typedef struct VkDeviceQueueGlobalPriorityCreateInfoEXT +typedef struct VkDeviceQueueCreateInfo { VkStructureType sType; const void *pNext; - VkQueueGlobalPriorityEXT globalPriority; -} VkDeviceQueueGlobalPriorityCreateInfoEXT; + VkDeviceQueueCreateFlags flags; + uint32_t queueFamilyIndex; + uint32_t queueCount; + const float *pQueuePriorities; +} VkDeviceQueueCreateInfo; -typedef struct VkDrawMeshTasksIndirectCommandNV +typedef struct VkDrawIndirectCommand { - uint32_t taskCount; - uint32_t firstTask; -} VkDrawMeshTasksIndirectCommandNV; + uint32_t vertexCount; + uint32_t instanceCount; + uint32_t firstVertex; + uint32_t firstInstance; +} VkDrawIndirectCommand; -typedef struct VkExportFenceCreateInfo +typedef struct VkEventCreateInfo { VkStructureType sType; const void *pNext; - VkExternalFenceHandleTypeFlags handleTypes; -} VkExportFenceCreateInfo; + VkEventCreateFlags flags; +} VkEventCreateInfo; -typedef struct VkExportSemaphoreCreateInfo +typedef struct VkExportMemoryAllocateInfo { VkStructureType sType; const void *pNext; - VkExternalSemaphoreHandleTypeFlags handleTypes; -} VkExportSemaphoreCreateInfo; + VkExternalMemoryHandleTypeFlags handleTypes; +} VkExportMemoryAllocateInfo; -typedef struct VkExtent2D +typedef struct VkExtensionProperties { - uint32_t width; - uint32_t height; -} VkExtent2D; + char extensionName[VK_MAX_EXTENSION_NAME_SIZE]; + uint32_t specVersion; +} VkExtensionProperties; typedef struct VkExternalFenceProperties { @@ -3302,118 +3443,93 @@ typedef struct VkFramebufferCreateInfo uint32_t layers; } VkFramebufferCreateInfo; -typedef struct VkImageFormatProperties -{ - VkExtent3D maxExtent; - uint32_t maxMipLevels; - uint32_t maxArrayLayers; - VkSampleCountFlags sampleCounts; - VkDeviceSize WINE_VK_ALIGN(8) maxResourceSize; -} VkImageFormatProperties; - -typedef struct VkImageMemoryBarrier +typedef struct VkImageSubresourceRange { - VkStructureType sType; - const void *pNext; - VkAccessFlags srcAccessMask; - VkAccessFlags dstAccessMask; - VkImageLayout oldLayout; - VkImageLayout newLayout; - uint32_t srcQueueFamilyIndex; - uint32_t dstQueueFamilyIndex; - VkImage WINE_VK_ALIGN(8) image; - VkImageSubresourceRange subresourceRange; -} VkImageMemoryBarrier; + VkImageAspectFlags aspectMask; + uint32_t baseMipLevel; + uint32_t levelCount; + uint32_t baseArrayLayer; + uint32_t layerCount; +} VkImageSubresourceRange; -typedef struct VkImagePlaneMemoryRequirementsInfo +typedef struct VkMemoryAllocateInfo { VkStructureType sType; const void *pNext; - VkImageAspectFlagBits planeAspect; -} VkImagePlaneMemoryRequirementsInfo; + VkDeviceSize WINE_VK_ALIGN(8) allocationSize; + uint32_t memoryTypeIndex; +} VkMemoryAllocateInfo; -typedef struct VkImageSwapchainCreateInfoKHR +typedef struct VkMemoryDedicatedRequirements { VkStructureType sType; - const void *pNext; - VkSwapchainKHR WINE_VK_ALIGN(8) swapchain; -} VkImageSwapchainCreateInfoKHR; - -typedef struct VkLayerProperties -{ - char layerName[VK_MAX_EXTENSION_NAME_SIZE]; - uint32_t specVersion; - uint32_t implementationVersion; - char description[VK_MAX_DESCRIPTION_SIZE]; -} VkLayerProperties; + void *pNext; + VkBool32 prefersDedicatedAllocation; + VkBool32 requiresDedicatedAllocation; +} VkMemoryDedicatedRequirements; -typedef struct VkMemoryType +typedef struct VkMemoryRequirements { - VkMemoryPropertyFlags propertyFlags; - uint32_t heapIndex; -} VkMemoryType; + VkDeviceSize WINE_VK_ALIGN(8) size; + VkDeviceSize WINE_VK_ALIGN(8) alignment; + uint32_t memoryTypeBits; +} VkMemoryRequirements; -typedef struct VkMultisamplePropertiesEXT +typedef struct VkMemoryRequirements2KHR { VkStructureType sType; void *pNext; - VkExtent2D maxSampleLocationGridSize; -} VkMultisamplePropertiesEXT; + VkMemoryRequirements WINE_VK_ALIGN(8) memoryRequirements; +} VkMemoryRequirements2KHR; -typedef struct VkPhysicalDevice16BitStorageFeatures +typedef struct VkOffset2D { - VkStructureType sType; - void *pNext; - VkBool32 storageBuffer16BitAccess; - VkBool32 uniformAndStorageBuffer16BitAccess; - VkBool32 storagePushConstant16; - VkBool32 storageInputOutput16; -} VkPhysicalDevice16BitStorageFeatures; + int32_t x; + int32_t y; +} VkOffset2D; -typedef struct VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT +typedef struct VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT { VkStructureType sType; void *pNext; - VkBool32 advancedBlendCoherentOperations; -} VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT; + uint32_t advancedBlendMaxColorAttachments; + VkBool32 advancedBlendIndependentBlend; + VkBool32 advancedBlendNonPremultipliedSrcColor; + VkBool32 advancedBlendNonPremultipliedDstColor; + VkBool32 advancedBlendCorrelatedOverlap; + VkBool32 advancedBlendAllOperations; +} VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT; -typedef struct VkPhysicalDeviceConservativeRasterizationPropertiesEXT +typedef struct VkPhysicalDeviceCornerSampledImageFeaturesNV { VkStructureType sType; void *pNext; - float primitiveOverestimationSize; - float maxExtraPrimitiveOverestimationSize; - float extraPrimitiveOverestimationSizeGranularity; - VkBool32 primitiveUnderestimation; - VkBool32 conservativePointAndLineRasterization; - VkBool32 degenerateTrianglesRasterized; - VkBool32 degenerateLinesRasterized; - VkBool32 fullyCoveredFragmentShaderInputVariable; - VkBool32 conservativeRasterizationPostDepthCoverage; -} VkPhysicalDeviceConservativeRasterizationPropertiesEXT; + VkBool32 cornerSampledImage; +} VkPhysicalDeviceCornerSampledImageFeaturesNV; -typedef struct VkPhysicalDeviceDiscardRectanglePropertiesEXT +typedef struct VkPhysicalDeviceDriverPropertiesKHR { VkStructureType sType; void *pNext; - uint32_t maxDiscardRectangles; -} VkPhysicalDeviceDiscardRectanglePropertiesEXT; + VkDriverIdKHR driverID; + char driverName[VK_MAX_DRIVER_NAME_SIZE_KHR]; + char driverInfo[VK_MAX_DRIVER_INFO_SIZE_KHR]; + VkConformanceVersionKHR conformanceVersion; +} VkPhysicalDeviceDriverPropertiesKHR; -typedef struct VkPhysicalDeviceExternalBufferInfo +typedef struct VkPhysicalDeviceExternalFenceInfo { VkStructureType sType; const void *pNext; - VkBufferCreateFlags flags; - VkBufferUsageFlags usage; - VkExternalMemoryHandleTypeFlagBits handleType; -} VkPhysicalDeviceExternalBufferInfo; + VkExternalFenceHandleTypeFlagBits handleType; +} VkPhysicalDeviceExternalFenceInfo; -typedef struct VkPhysicalDeviceExternalImageFormatInfo +typedef struct VkPhysicalDeviceFeatures2 { VkStructureType sType; - const void *pNext; - VkExternalMemoryHandleTypeFlagBits handleType; -} VkPhysicalDeviceExternalImageFormatInfo; + void *pNext; + VkPhysicalDeviceFeatures features; +} VkPhysicalDeviceFeatures2; typedef struct VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV { @@ -3459,13 +3575,6 @@ typedef struct VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV VkBool32 representativeFragmentTest; } VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV; -typedef struct VkPhysicalDeviceSamplerYcbcrConversionFeatures -{ - VkStructureType sType; - void *pNext; - VkBool32 samplerYcbcrConversion; -} VkPhysicalDeviceSamplerYcbcrConversionFeatures; - typedef struct VkPhysicalDeviceShaderDrawParameterFeatures { VkStructureType sType; @@ -3473,52 +3582,34 @@ typedef struct VkPhysicalDeviceShaderDrawParameterFeatures VkBool32 shaderDrawParameters; } VkPhysicalDeviceShaderDrawParameterFeatures; -typedef struct VkPhysicalDeviceShadingRateImagePropertiesNV +typedef struct VkPhysicalDeviceSparseImageFormatInfo2 { VkStructureType sType; - void *pNext; - VkExtent2D shadingRateTexelSize; - uint32_t shadingRatePaletteSize; - uint32_t shadingRateMaxCoarseSamples; -} VkPhysicalDeviceShadingRateImagePropertiesNV; + const void *pNext; + VkFormat format; + VkImageType type; + VkSampleCountFlagBits samples; + VkImageUsageFlags usage; + VkImageTiling tiling; +} VkPhysicalDeviceSparseImageFormatInfo2; -typedef struct VkPhysicalDeviceSubgroupProperties +typedef struct VkPipelineCacheCreateInfo { VkStructureType sType; - void *pNext; - uint32_t subgroupSize; - VkShaderStageFlags supportedStages; - VkSubgroupFeatureFlags supportedOperations; - VkBool32 quadOperationsInAllStages; -} VkPhysicalDeviceSubgroupProperties; + const void *pNext; + VkPipelineCacheCreateFlags flags; + size_t initialDataSize; + const void *pInitialData; +} VkPipelineCacheCreateInfo; -typedef struct VkPhysicalDeviceVariablePointerFeatures -{ - VkStructureType sType; - void *pNext; - VkBool32 variablePointersStorageBuffer; - VkBool32 variablePointers; -} VkPhysicalDeviceVariablePointerFeatures; - -typedef struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR -{ - VkStructureType sType; - void *pNext; - VkBool32 vulkanMemoryModel; - VkBool32 vulkanMemoryModelDeviceScope; -} VkPhysicalDeviceVulkanMemoryModelFeaturesKHR; - -typedef struct VkPipelineColorBlendStateCreateInfo +typedef struct VkPipelineCoverageToColorStateCreateInfoNV { VkStructureType sType; const void *pNext; - VkPipelineColorBlendStateCreateFlags flags; - VkBool32 logicOpEnable; - VkLogicOp logicOp; - uint32_t attachmentCount; - const VkPipelineColorBlendAttachmentState *pAttachments; - float blendConstants[4]; -} VkPipelineColorBlendStateCreateInfo; + VkPipelineCoverageToColorStateCreateFlagsNV flags; + VkBool32 coverageToColorEnable; + uint32_t coverageToColorLocation; +} VkPipelineCoverageToColorStateCreateInfoNV; typedef struct VkPipelineInputAssemblyStateCreateInfo { @@ -3579,12 +3670,30 @@ typedef struct VkQueueFamilyCheckpointPropertiesNV VkPipelineStageFlags checkpointExecutionStageMask; } VkQueueFamilyCheckpointPropertiesNV; -typedef struct VkRectLayerKHR +typedef struct VkRect2D { VkOffset2D offset; VkExtent2D extent; - uint32_t layer; -} VkRectLayerKHR; +} VkRect2D; + +typedef struct VkRenderPassBeginInfo +{ + VkStructureType sType; + const void *pNext; + VkRenderPass WINE_VK_ALIGN(8) renderPass; + VkFramebuffer WINE_VK_ALIGN(8) framebuffer; + VkRect2D renderArea; + uint32_t clearValueCount; + const VkClearValue *pClearValues; +} VkRenderPassBeginInfo; + +typedef struct VkRenderPassInputAttachmentAspectCreateInfo +{ + VkStructureType sType; + const void *pNext; + uint32_t aspectReferenceCount; + const VkInputAttachmentAspectReference *pAspectReferences; +} VkRenderPassInputAttachmentAspectCreateInfo; typedef struct VkSampleLocationsInfoEXT { @@ -3617,92 +3726,120 @@ typedef struct VkShaderModuleValidationCacheCreateInfoEXT VkValidationCacheEXT WINE_VK_ALIGN(8) validationCache; } VkShaderModuleValidationCacheCreateInfoEXT; -typedef struct VkSparseImageFormatProperties2 -{ - VkStructureType sType; - void *pNext; - VkSparseImageFormatProperties properties; -} VkSparseImageFormatProperties2; - -typedef struct VkSparseImageMemoryRequirements2 +typedef struct VkSparseImageOpaqueMemoryBindInfo { - VkStructureType sType; - void *pNext; - VkSparseImageMemoryRequirements WINE_VK_ALIGN(8) memoryRequirements; -} VkSparseImageMemoryRequirements2; + VkImage WINE_VK_ALIGN(8) image; + uint32_t bindCount; + const VkSparseMemoryBind *pBinds; +} VkSparseImageOpaqueMemoryBindInfo; -typedef struct VkSpecializationInfo +typedef struct VkStencilOpState { - uint32_t mapEntryCount; - const VkSpecializationMapEntry *pMapEntries; - size_t dataSize; - const void *pData; -} VkSpecializationInfo; + VkStencilOp failOp; + VkStencilOp passOp; + VkStencilOp depthFailOp; + VkCompareOp compareOp; + uint32_t compareMask; + uint32_t writeMask; + uint32_t reference; +} VkStencilOpState; -typedef struct VkSubpassBeginInfoKHR +typedef struct VkSubpassDependency2KHR { VkStructureType sType; const void *pNext; - VkSubpassContents contents; -} VkSubpassBeginInfoKHR; + uint32_t srcSubpass; + uint32_t dstSubpass; + VkPipelineStageFlags srcStageMask; + VkPipelineStageFlags dstStageMask; + VkAccessFlags srcAccessMask; + VkAccessFlags dstAccessMask; + VkDependencyFlags dependencyFlags; + int32_t viewOffset; +} VkSubpassDependency2KHR; -typedef struct VkSubpassEndInfoKHR +typedef struct VkSubpassSampleLocationsEXT { - VkStructureType sType; - const void *pNext; -} VkSubpassEndInfoKHR; + uint32_t subpassIndex; + VkSampleLocationsInfoEXT sampleLocationsInfo; +} VkSubpassSampleLocationsEXT; -typedef struct VkSurfaceFormatKHR +typedef struct VkSurfaceCapabilitiesKHR { - VkFormat format; - VkColorSpaceKHR colorSpace; -} VkSurfaceFormatKHR; + uint32_t minImageCount; + uint32_t maxImageCount; + VkExtent2D currentExtent; + VkExtent2D minImageExtent; + VkExtent2D maxImageExtent; + uint32_t maxImageArrayLayers; + VkSurfaceTransformFlagsKHR supportedTransforms; + VkSurfaceTransformFlagBitsKHR currentTransform; + VkCompositeAlphaFlagsKHR supportedCompositeAlpha; + VkImageUsageFlags supportedUsageFlags; +} VkSurfaceCapabilitiesKHR; -typedef struct VkValidationCacheCreateInfoEXT +typedef struct VkSwapchainCreateInfoKHR { VkStructureType sType; const void *pNext; - VkValidationCacheCreateFlagsEXT flags; - size_t initialDataSize; - const void *pInitialData; -} VkValidationCacheCreateInfoEXT; + VkSwapchainCreateFlagsKHR flags; + VkSurfaceKHR WINE_VK_ALIGN(8) surface; + uint32_t minImageCount; + VkFormat imageFormat; + VkColorSpaceKHR imageColorSpace; + VkExtent2D imageExtent; + uint32_t imageArrayLayers; + VkImageUsageFlags imageUsage; + VkSharingMode imageSharingMode; + uint32_t queueFamilyIndexCount; + const uint32_t *pQueueFamilyIndices; + VkSurfaceTransformFlagBitsKHR preTransform; + VkCompositeAlphaFlagBitsKHR compositeAlpha; + VkPresentModeKHR presentMode; + VkBool32 clipped; + VkSwapchainKHR WINE_VK_ALIGN(8) oldSwapchain; +} VkSwapchainCreateInfoKHR; -typedef struct VkVertexInputBindingDivisorDescriptionEXT +typedef struct VkVertexInputAttributeDescription { + uint32_t location; uint32_t binding; - uint32_t divisor; -} VkVertexInputBindingDivisorDescriptionEXT; + VkFormat format; + uint32_t offset; +} VkVertexInputAttributeDescription; -typedef struct VkViewportWScalingNV +typedef struct VkViewport { - float xcoeff; - float ycoeff; -} VkViewportWScalingNV; + float x; + float y; + float width; + float height; + float minDepth; + float maxDepth; +} VkViewport; -typedef struct VkWin32SurfaceCreateInfoKHR +typedef struct VkWriteDescriptorSet { VkStructureType sType; const void *pNext; - VkWin32SurfaceCreateFlagsKHR flags; - HINSTANCE hinstance; - HWND hwnd; -} VkWin32SurfaceCreateInfoKHR; - -typedef struct VkAllocationCallbacks -{ - void *pUserData; - PFN_vkAllocationFunction pfnAllocation; - PFN_vkReallocationFunction pfnReallocation; - PFN_vkFreeFunction pfnFree; - PFN_vkInternalAllocationNotification pfnInternalAllocation; - PFN_vkInternalFreeNotification pfnInternalFree; -} VkAllocationCallbacks; + VkDescriptorSet WINE_VK_ALIGN(8) dstSet; + uint32_t dstBinding; + uint32_t dstArrayElement; + uint32_t descriptorCount; + VkDescriptorType descriptorType; + const VkDescriptorImageInfo *pImageInfo; + const VkDescriptorBufferInfo *pBufferInfo; + const VkBufferView *pTexelBufferView; +} VkWriteDescriptorSet; -typedef struct VkAttachmentReference +typedef struct VkAttachmentReference2KHR { + VkStructureType sType; + const void *pNext; uint32_t attachment; VkImageLayout layout; -} VkAttachmentReference; + VkImageAspectFlags aspectMask; +} VkAttachmentReference2KHR; typedef struct VkBindBufferMemoryDeviceGroupInfo { @@ -3731,13 +3868,20 @@ typedef struct VkBufferViewCreateInfo VkDeviceSize WINE_VK_ALIGN(8) range; } VkBufferViewCreateInfo; -typedef struct VkComponentMapping +typedef struct VkClearRect { - VkComponentSwizzle r; - VkComponentSwizzle g; - VkComponentSwizzle b; - VkComponentSwizzle a; -} VkComponentMapping; + VkRect2D rect; + uint32_t baseArrayLayer; + uint32_t layerCount; +} VkClearRect; + +typedef struct VkCommandBufferBeginInfo +{ + VkStructureType sType; + const void *pNext; + VkCommandBufferUsageFlags flags; + const VkCommandBufferInheritanceInfo *pInheritanceInfo; +} VkCommandBufferBeginInfo; typedef struct VkDescriptorPoolCreateInfo { @@ -3785,61 +3929,130 @@ typedef struct VkDeviceGroupSwapchainCreateInfoKHR VkDeviceGroupPresentModeFlagsKHR modes; } VkDeviceGroupSwapchainCreateInfoKHR; -typedef struct VkFenceCreateInfo +typedef struct VkExportMemoryAllocateInfoNV { VkStructureType sType; const void *pNext; - VkFenceCreateFlags flags; -} VkFenceCreateInfo; + VkExternalMemoryHandleTypeFlagsNV handleTypes; +} VkExportMemoryAllocateInfoNV; -typedef struct VkImageSubresourceLayers +typedef struct VkExtent3D { - VkImageAspectFlags aspectMask; - uint32_t mipLevel; - uint32_t baseArrayLayer; - uint32_t layerCount; -} VkImageSubresourceLayers; + uint32_t width; + uint32_t height; + uint32_t depth; +} VkExtent3D; -typedef struct VkMappedMemoryRange +typedef struct VkFenceCreateInfo { VkStructureType sType; const void *pNext; - VkDeviceMemory WINE_VK_ALIGN(8) memory; - VkDeviceSize WINE_VK_ALIGN(8) offset; - VkDeviceSize WINE_VK_ALIGN(8) size; -} VkMappedMemoryRange; + VkFenceCreateFlags flags; +} VkFenceCreateInfo; -typedef struct VkMemoryRequirements2 +typedef struct VkGeometryDataNV { - VkStructureType sType; - void *pNext; - VkMemoryRequirements WINE_VK_ALIGN(8) memoryRequirements; -} VkMemoryRequirements2; + VkGeometryTrianglesNV WINE_VK_ALIGN(8) triangles; + VkGeometryAABBNV WINE_VK_ALIGN(8) aabbs; +} VkGeometryDataNV; -typedef struct VkOffset3D +typedef struct VkImageBlit { - int32_t x; - int32_t y; - int32_t z; -} VkOffset3D; + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffsets[2]; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffsets[2]; +} VkImageBlit; -typedef struct VkPhysicalDeviceComputeShaderDerivativesFeaturesNV +typedef struct VkImageCreateInfo { VkStructureType sType; - void *pNext; - VkBool32 computeDerivativeGroupQuads; - VkBool32 computeDerivativeGroupLinear; -} VkPhysicalDeviceComputeShaderDerivativesFeaturesNV; + const void *pNext; + VkImageCreateFlags flags; + VkImageType imageType; + VkFormat format; + VkExtent3D extent; + uint32_t mipLevels; + uint32_t arrayLayers; + VkSampleCountFlagBits samples; + VkImageTiling tiling; + VkImageUsageFlags usage; + VkSharingMode sharingMode; + uint32_t queueFamilyIndexCount; + const uint32_t *pQueueFamilyIndices; + VkImageLayout initialLayout; +} VkImageCreateInfo; -typedef struct VkPhysicalDeviceDriverPropertiesKHR +typedef struct VkImageFormatProperties +{ + VkExtent3D maxExtent; + uint32_t maxMipLevels; + uint32_t maxArrayLayers; + VkSampleCountFlags sampleCounts; + VkDeviceSize WINE_VK_ALIGN(8) maxResourceSize; +} VkImageFormatProperties; + +typedef struct VkImageMemoryBarrier +{ + VkStructureType sType; + const void *pNext; + VkAccessFlags srcAccessMask; + VkAccessFlags dstAccessMask; + VkImageLayout oldLayout; + VkImageLayout newLayout; + uint32_t srcQueueFamilyIndex; + uint32_t dstQueueFamilyIndex; + VkImage WINE_VK_ALIGN(8) image; + VkImageSubresourceRange subresourceRange; +} VkImageMemoryBarrier; + +typedef struct VkImageResolve +{ + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffset; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffset; + VkExtent3D extent; +} VkImageResolve; + +typedef struct VkImageViewASTCDecodeModeEXT +{ + VkStructureType sType; + const void *pNext; + VkFormat decodeMode; +} VkImageViewASTCDecodeModeEXT; + +typedef struct VkMemoryAllocateFlagsInfo +{ + VkStructureType sType; + const void *pNext; + VkMemoryAllocateFlags flags; + uint32_t deviceMask; +} VkMemoryAllocateFlagsInfo; + +typedef struct VkMemoryRequirements2 { VkStructureType sType; void *pNext; - VkDriverIdKHR driverID; - char driverName[VK_MAX_DRIVER_NAME_SIZE_KHR]; - char driverInfo[VK_MAX_DRIVER_INFO_SIZE_KHR]; - VkConformanceVersionKHR conformanceVersion; -} VkPhysicalDeviceDriverPropertiesKHR; + VkMemoryRequirements WINE_VK_ALIGN(8) memoryRequirements; +} VkMemoryRequirements2; + +typedef struct VkPhysicalDeviceConditionalRenderingFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 conditionalRendering; + VkBool32 inheritedConditionalRendering; +} VkPhysicalDeviceConditionalRenderingFeaturesEXT; + +typedef struct VkPhysicalDeviceExternalBufferInfo +{ + VkStructureType sType; + const void *pNext; + VkBufferCreateFlags flags; + VkBufferUsageFlags usage; + VkExternalMemoryHandleTypeFlagBits handleType; +} VkPhysicalDeviceExternalBufferInfo; typedef struct VkPhysicalDeviceLimits { @@ -3960,19 +4173,6 @@ typedef struct VkPhysicalDeviceMultiviewFeatures VkBool32 multiviewTessellationShader; } VkPhysicalDeviceMultiviewFeatures; -typedef struct VkPhysicalDeviceProperties -{ - uint32_t apiVersion; - uint32_t driverVersion; - uint32_t vendorID; - uint32_t deviceID; - VkPhysicalDeviceType deviceType; - char deviceName[VK_MAX_PHYSICAL_DEVICE_NAME_SIZE]; - uint8_t pipelineCacheUUID[VK_UUID_SIZE]; - VkPhysicalDeviceLimits WINE_VK_ALIGN(8) limits; - VkPhysicalDeviceSparseProperties sparseProperties; -} VkPhysicalDeviceProperties; - typedef struct VkPhysicalDevicePushDescriptorPropertiesKHR { VkStructureType sType; @@ -3988,22 +4188,37 @@ typedef struct VkPhysicalDeviceShaderAtomicInt64FeaturesKHR VkBool32 shaderSharedInt64Atomics; } VkPhysicalDeviceShaderAtomicInt64FeaturesKHR; -typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT +typedef struct VkPhysicalDeviceSparseProperties +{ + VkBool32 residencyStandard2DBlockShape; + VkBool32 residencyStandard2DMultisampleBlockShape; + VkBool32 residencyStandard3DBlockShape; + VkBool32 residencyAlignedMipSize; + VkBool32 residencyNonResidentStrict; +} VkPhysicalDeviceSparseProperties; + +typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT { VkStructureType sType; void *pNext; - VkBool32 vertexAttributeInstanceRateDivisor; - VkBool32 vertexAttributeInstanceRateZeroDivisor; -} VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT; + uint32_t maxVertexAttribDivisor; +} VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT; -typedef struct VkPipelineCoverageToColorStateCreateInfoNV +typedef struct VkPipelineDepthStencilStateCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineCoverageToColorStateCreateFlagsNV flags; - VkBool32 coverageToColorEnable; - uint32_t coverageToColorLocation; -} VkPipelineCoverageToColorStateCreateInfoNV; + VkPipelineDepthStencilStateCreateFlags flags; + VkBool32 depthTestEnable; + VkBool32 depthWriteEnable; + VkCompareOp depthCompareOp; + VkBool32 depthBoundsTestEnable; + VkBool32 stencilTestEnable; + VkStencilOpState front; + VkStencilOpState back; + float minDepthBounds; + float maxDepthBounds; +} VkPipelineDepthStencilStateCreateInfo; typedef struct VkPipelineRasterizationStateRasterizationOrderAMD { @@ -4012,25 +4227,27 @@ typedef struct VkPipelineRasterizationStateRasterizationOrderAMD VkRasterizationOrderAMD rasterizationOrder; } VkPipelineRasterizationStateRasterizationOrderAMD; -typedef struct VkPipelineShaderStageCreateInfo +typedef struct VkPipelineVertexInputStateCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineShaderStageCreateFlags flags; - VkShaderStageFlagBits stage; - VkShaderModule WINE_VK_ALIGN(8) module; - const char *pName; - const VkSpecializationInfo *pSpecializationInfo; -} VkPipelineShaderStageCreateInfo; + VkPipelineVertexInputStateCreateFlags flags; + uint32_t vertexBindingDescriptionCount; + const VkVertexInputBindingDescription *pVertexBindingDescriptions; + uint32_t vertexAttributeDescriptionCount; + const VkVertexInputAttributeDescription *pVertexAttributeDescriptions; +} VkPipelineVertexInputStateCreateInfo; -typedef struct VkPipelineViewportWScalingStateCreateInfoNV +typedef struct VkPipelineViewportStateCreateInfo { VkStructureType sType; const void *pNext; - VkBool32 viewportWScalingEnable; + VkPipelineViewportStateCreateFlags flags; uint32_t viewportCount; - const VkViewportWScalingNV *pViewportWScalings; -} VkPipelineViewportWScalingStateCreateInfoNV; + const VkViewport *pViewports; + uint32_t scissorCount; + const VkRect2D *pScissors; +} VkPipelineViewportStateCreateInfo; typedef struct VkPushConstantRange { @@ -4039,11 +4256,24 @@ typedef struct VkPushConstantRange uint32_t size; } VkPushConstantRange; -typedef struct VkRect2D +typedef struct VkRectLayerKHR { VkOffset2D offset; VkExtent2D extent; -} VkRect2D; + uint32_t layer; +} VkRectLayerKHR; + +typedef struct VkRenderPassMultiviewCreateInfo +{ + VkStructureType sType; + const void *pNext; + uint32_t subpassCount; + const uint32_t *pViewMasks; + uint32_t dependencyCount; + const int32_t *pViewOffsets; + uint32_t correlationMaskCount; + const uint32_t *pCorrelationMasks; +} VkRenderPassMultiviewCreateInfo; typedef struct VkSamplerReductionModeCreateInfoEXT { @@ -4070,88 +4300,78 @@ typedef struct VkShaderStatisticsInfoAMD uint32_t computeWorkGroupSize[3]; } VkShaderStatisticsInfoAMD; -typedef struct VkSparseImageMemoryBind +typedef struct VkSparseImageFormatProperties { - VkImageSubresource subresource; - VkOffset3D offset; - VkExtent3D extent; - VkDeviceMemory WINE_VK_ALIGN(8) memory; - VkDeviceSize WINE_VK_ALIGN(8) memoryOffset; - VkSparseMemoryBindFlags flags; -} VkSparseImageMemoryBind; + VkImageAspectFlags aspectMask; + VkExtent3D imageGranularity; + VkSparseImageFormatFlags flags; +} VkSparseImageFormatProperties; -typedef struct VkSparseImageOpaqueMemoryBindInfo +typedef struct VkSparseImageMemoryRequirements { - VkImage WINE_VK_ALIGN(8) image; - uint32_t bindCount; - const VkSparseMemoryBind *pBinds; -} VkSparseImageOpaqueMemoryBindInfo; + VkSparseImageFormatProperties formatProperties; + uint32_t imageMipTailFirstLod; + VkDeviceSize WINE_VK_ALIGN(8) imageMipTailSize; + VkDeviceSize WINE_VK_ALIGN(8) imageMipTailOffset; + VkDeviceSize WINE_VK_ALIGN(8) imageMipTailStride; +} VkSparseImageMemoryRequirements; -typedef struct VkSubpassDependency2KHR +typedef struct VkSpecializationInfo +{ + uint32_t mapEntryCount; + const VkSpecializationMapEntry *pMapEntries; + size_t dataSize; + const void *pData; +} VkSpecializationInfo; + +typedef struct VkSubpassDescription2KHR { VkStructureType sType; const void *pNext; - uint32_t srcSubpass; - uint32_t dstSubpass; - VkPipelineStageFlags srcStageMask; - VkPipelineStageFlags dstStageMask; - VkAccessFlags srcAccessMask; - VkAccessFlags dstAccessMask; - VkDependencyFlags dependencyFlags; - int32_t viewOffset; -} VkSubpassDependency2KHR; + VkSubpassDescriptionFlags flags; + VkPipelineBindPoint pipelineBindPoint; + uint32_t viewMask; + uint32_t inputAttachmentCount; + const VkAttachmentReference2KHR *pInputAttachments; + uint32_t colorAttachmentCount; + const VkAttachmentReference2KHR *pColorAttachments; + const VkAttachmentReference2KHR *pResolveAttachments; + const VkAttachmentReference2KHR *pDepthStencilAttachment; + uint32_t preserveAttachmentCount; + const uint32_t *pPreserveAttachments; +} VkSubpassDescription2KHR; -typedef struct VkSubpassSampleLocationsEXT +typedef struct VkSurfaceFormatKHR { - uint32_t subpassIndex; - VkSampleLocationsInfoEXT sampleLocationsInfo; -} VkSubpassSampleLocationsEXT; + VkFormat format; + VkColorSpaceKHR colorSpace; +} VkSurfaceFormatKHR; -typedef struct VkSwapchainCreateInfoKHR +typedef struct VkVertexInputBindingDivisorDescriptionEXT +{ + uint32_t binding; + uint32_t divisor; +} VkVertexInputBindingDivisorDescriptionEXT; + +typedef struct VkWin32SurfaceCreateInfoKHR { VkStructureType sType; const void *pNext; - VkSwapchainCreateFlagsKHR flags; - VkSurfaceKHR WINE_VK_ALIGN(8) surface; - uint32_t minImageCount; - VkFormat imageFormat; - VkColorSpaceKHR imageColorSpace; - VkExtent2D imageExtent; - uint32_t imageArrayLayers; - VkImageUsageFlags imageUsage; - VkSharingMode imageSharingMode; - uint32_t queueFamilyIndexCount; - const uint32_t *pQueueFamilyIndices; - VkSurfaceTransformFlagBitsKHR preTransform; - VkCompositeAlphaFlagBitsKHR compositeAlpha; - VkPresentModeKHR presentMode; - VkBool32 clipped; - VkSwapchainKHR WINE_VK_ALIGN(8) oldSwapchain; -} VkSwapchainCreateInfoKHR; - -typedef struct VkViewport -{ - float x; - float y; - float width; - float height; - float minDepth; - float maxDepth; -} VkViewport; + VkWin32SurfaceCreateFlagsKHR flags; + HINSTANCE hinstance; + HWND hwnd; +} VkWin32SurfaceCreateInfoKHR; -typedef struct VkWriteDescriptorSet +typedef struct VkApplicationInfo { VkStructureType sType; const void *pNext; - VkDescriptorSet WINE_VK_ALIGN(8) dstSet; - uint32_t dstBinding; - uint32_t dstArrayElement; - uint32_t descriptorCount; - VkDescriptorType descriptorType; - const VkDescriptorImageInfo *pImageInfo; - const VkDescriptorBufferInfo *pBufferInfo; - const VkBufferView *pTexelBufferView; -} VkWriteDescriptorSet; + const char *pApplicationName; + uint32_t applicationVersion; + const char *pEngineName; + uint32_t engineVersion; + uint32_t apiVersion; +} VkApplicationInfo; typedef struct VkBindImageMemoryDeviceGroupInfo { @@ -4173,36 +4393,19 @@ typedef struct VkBufferImageCopy VkExtent3D imageExtent; } VkBufferImageCopy; -typedef struct VkClearRect -{ - VkRect2D rect; - uint32_t baseArrayLayer; - uint32_t layerCount; -} VkClearRect; - -typedef struct VkComputePipelineCreateInfo -{ - VkStructureType sType; - const void *pNext; - VkPipelineCreateFlags flags; - VkPipelineShaderStageCreateInfo WINE_VK_ALIGN(8) stage; - VkPipelineLayout WINE_VK_ALIGN(8) layout; - VkPipeline WINE_VK_ALIGN(8) basePipelineHandle; - int32_t basePipelineIndex; -} VkComputePipelineCreateInfo; - -typedef struct VkDedicatedAllocationMemoryAllocateInfoNV +typedef struct VkDescriptorSetLayoutBinding { - VkStructureType sType; - const void *pNext; - VkImage WINE_VK_ALIGN(8) image; - VkBuffer WINE_VK_ALIGN(8) buffer; -} VkDedicatedAllocationMemoryAllocateInfoNV; + uint32_t binding; + VkDescriptorType descriptorType; + uint32_t descriptorCount; + VkShaderStageFlags stageFlags; + const VkSampler *pImmutableSamplers; +} VkDescriptorSetLayoutBinding; typedef struct VkDescriptorUpdateTemplateCreateInfo { VkStructureType sType; - void *pNext; + const void *pNext; VkDescriptorUpdateTemplateCreateFlags flags; uint32_t descriptorUpdateEntryCount; const VkDescriptorUpdateTemplateEntry *pDescriptorUpdateEntries; @@ -4229,13 +4432,23 @@ typedef struct VkExternalMemoryProperties VkExternalMemoryHandleTypeFlags compatibleHandleTypes; } VkExternalMemoryProperties; -typedef struct VkImageBlit +typedef struct VkGeometryNV +{ + VkStructureType sType; + const void *pNext; + VkGeometryTypeNV geometryType; + VkGeometryDataNV WINE_VK_ALIGN(8) geometry; + VkGeometryFlagsNV flags; +} VkGeometryNV; + +typedef struct VkImageCopy { VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffsets[2]; + VkOffset3D srcOffset; VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffsets[2]; -} VkImageBlit; + VkOffset3D dstOffset; + VkExtent3D extent; +} VkImageCopy; typedef struct VkImageFormatProperties2 { @@ -4244,50 +4457,68 @@ typedef struct VkImageFormatProperties2 VkImageFormatProperties WINE_VK_ALIGN(8) imageFormatProperties; } VkImageFormatProperties2; -typedef struct VkImageViewCreateInfo +typedef struct VkImageSubresource +{ + VkImageAspectFlags aspectMask; + uint32_t mipLevel; + uint32_t arrayLayer; +} VkImageSubresource; + +typedef struct VkInstanceCreateInfo { VkStructureType sType; const void *pNext; - VkImageViewCreateFlags flags; - VkImage WINE_VK_ALIGN(8) image; - VkImageViewType viewType; - VkFormat format; - VkComponentMapping components; - VkImageSubresourceRange subresourceRange; -} VkImageViewCreateInfo; + VkInstanceCreateFlags flags; + const VkApplicationInfo *pApplicationInfo; + uint32_t enabledLayerCount; + const char * const*ppEnabledLayerNames; + uint32_t enabledExtensionCount; + const char * const*ppEnabledExtensionNames; +} VkInstanceCreateInfo; -typedef struct VkPhysicalDeviceDescriptorIndexingFeaturesEXT +typedef struct VkMemoryHeap +{ + VkDeviceSize WINE_VK_ALIGN(8) size; + VkMemoryHeapFlags flags; +} VkMemoryHeap; + +typedef struct VkPhysicalDeviceDescriptorIndexingPropertiesEXT { VkStructureType sType; void *pNext; - VkBool32 shaderInputAttachmentArrayDynamicIndexing; - VkBool32 shaderUniformTexelBufferArrayDynamicIndexing; - VkBool32 shaderStorageTexelBufferArrayDynamicIndexing; - VkBool32 shaderUniformBufferArrayNonUniformIndexing; - VkBool32 shaderSampledImageArrayNonUniformIndexing; - VkBool32 shaderStorageBufferArrayNonUniformIndexing; - VkBool32 shaderStorageImageArrayNonUniformIndexing; - VkBool32 shaderInputAttachmentArrayNonUniformIndexing; - VkBool32 shaderUniformTexelBufferArrayNonUniformIndexing; - VkBool32 shaderStorageTexelBufferArrayNonUniformIndexing; - VkBool32 descriptorBindingUniformBufferUpdateAfterBind; - VkBool32 descriptorBindingSampledImageUpdateAfterBind; - VkBool32 descriptorBindingStorageImageUpdateAfterBind; - VkBool32 descriptorBindingStorageBufferUpdateAfterBind; - VkBool32 descriptorBindingUniformTexelBufferUpdateAfterBind; - VkBool32 descriptorBindingStorageTexelBufferUpdateAfterBind; - VkBool32 descriptorBindingUpdateUnusedWhilePending; - VkBool32 descriptorBindingPartiallyBound; - VkBool32 descriptorBindingVariableDescriptorCount; - VkBool32 runtimeDescriptorArray; -} VkPhysicalDeviceDescriptorIndexingFeaturesEXT; + uint32_t maxUpdateAfterBindDescriptorsInAllPools; + VkBool32 shaderUniformBufferArrayNonUniformIndexingNative; + VkBool32 shaderSampledImageArrayNonUniformIndexingNative; + VkBool32 shaderStorageBufferArrayNonUniformIndexingNative; + VkBool32 shaderStorageImageArrayNonUniformIndexingNative; + VkBool32 shaderInputAttachmentArrayNonUniformIndexingNative; + VkBool32 robustBufferAccessUpdateAfterBind; + VkBool32 quadDivergentImplicitLod; + uint32_t maxPerStageDescriptorUpdateAfterBindSamplers; + uint32_t maxPerStageDescriptorUpdateAfterBindUniformBuffers; + uint32_t maxPerStageDescriptorUpdateAfterBindStorageBuffers; + uint32_t maxPerStageDescriptorUpdateAfterBindSampledImages; + uint32_t maxPerStageDescriptorUpdateAfterBindStorageImages; + uint32_t maxPerStageDescriptorUpdateAfterBindInputAttachments; + uint32_t maxPerStageUpdateAfterBindResources; + uint32_t maxDescriptorSetUpdateAfterBindSamplers; + uint32_t maxDescriptorSetUpdateAfterBindUniformBuffers; + uint32_t maxDescriptorSetUpdateAfterBindUniformBuffersDynamic; + uint32_t maxDescriptorSetUpdateAfterBindStorageBuffers; + uint32_t maxDescriptorSetUpdateAfterBindStorageBuffersDynamic; + uint32_t maxDescriptorSetUpdateAfterBindSampledImages; + uint32_t maxDescriptorSetUpdateAfterBindStorageImages; + uint32_t maxDescriptorSetUpdateAfterBindInputAttachments; +} VkPhysicalDeviceDescriptorIndexingPropertiesEXT; -typedef struct VkPhysicalDeviceFeatures2 +typedef struct VkPhysicalDeviceFragmentDensityMapFeaturesEXT { VkStructureType sType; void *pNext; - VkPhysicalDeviceFeatures features; -} VkPhysicalDeviceFeatures2; + VkBool32 fragmentDensityMap; + VkBool32 fragmentDensityMapDynamic; + VkBool32 fragmentDensityMapNonSubsampledImages; +} VkPhysicalDeviceFragmentDensityMapFeaturesEXT; typedef struct VkPhysicalDeviceMemoryProperties { @@ -4297,24 +4528,29 @@ typedef struct VkPhysicalDeviceMemoryProperties VkMemoryHeap WINE_VK_ALIGN(8) memoryHeaps[VK_MAX_MEMORY_HEAPS]; } VkPhysicalDeviceMemoryProperties; -typedef struct VkPhysicalDeviceSampleLocationsPropertiesEXT +typedef struct VkPhysicalDeviceSamplerFilterMinmaxPropertiesEXT { VkStructureType sType; void *pNext; - VkSampleCountFlags sampleLocationSampleCounts; - VkExtent2D maxSampleLocationGridSize; - float sampleLocationCoordinateRange[2]; - uint32_t sampleLocationSubPixelBits; - VkBool32 variableSampleLocations; -} VkPhysicalDeviceSampleLocationsPropertiesEXT; + VkBool32 filterMinmaxSingleComponentFormats; + VkBool32 filterMinmaxImageComponentMapping; +} VkPhysicalDeviceSamplerFilterMinmaxPropertiesEXT; -typedef struct VkPhysicalDeviceTransformFeedbackFeaturesEXT +typedef struct VkPhysicalDeviceTransformFeedbackPropertiesEXT { VkStructureType sType; void *pNext; - VkBool32 transformFeedback; - VkBool32 geometryStreams; -} VkPhysicalDeviceTransformFeedbackFeaturesEXT; + uint32_t maxTransformFeedbackStreams; + uint32_t maxTransformFeedbackBuffers; + VkDeviceSize WINE_VK_ALIGN(8) maxTransformFeedbackBufferSize; + uint32_t maxTransformFeedbackStreamDataSize; + uint32_t maxTransformFeedbackBufferDataSize; + uint32_t maxTransformFeedbackBufferDataStride; + VkBool32 transformFeedbackQueries; + VkBool32 transformFeedbackStreamsLinesTriangles; + VkBool32 transformFeedbackRasterizationStreamSelect; + VkBool32 transformFeedbackDraw; +} VkPhysicalDeviceTransformFeedbackPropertiesEXT; typedef struct VkPipelineDiscardRectangleStateCreateInfoEXT { @@ -4334,13 +4570,13 @@ typedef struct VkPipelineSampleLocationsStateCreateInfoEXT VkSampleLocationsInfoEXT sampleLocationsInfo; } VkPipelineSampleLocationsStateCreateInfoEXT; -typedef struct VkPipelineViewportExclusiveScissorStateCreateInfoNV +typedef struct VkPipelineVertexInputDivisorStateCreateInfoEXT { VkStructureType sType; const void *pNext; - uint32_t exclusiveScissorCount; - const VkRect2D *pExclusiveScissors; -} VkPipelineViewportExclusiveScissorStateCreateInfoNV; + uint32_t vertexBindingDivisorCount; + const VkVertexInputBindingDivisorDescriptionEXT *pVertexBindingDivisors; +} VkPipelineVertexInputDivisorStateCreateInfoEXT; typedef struct VkPresentRegionKHR { @@ -4348,79 +4584,57 @@ typedef struct VkPresentRegionKHR const VkRectLayerKHR *pRectangles; } VkPresentRegionKHR; -typedef struct VkQueueFamilyProperties2 +typedef struct VkQueueFamilyProperties { - VkStructureType sType; - void *pNext; - VkQueueFamilyProperties queueFamilyProperties; -} VkQueueFamilyProperties2; + VkQueueFlags queueFlags; + uint32_t queueCount; + uint32_t timestampValidBits; + VkExtent3D minImageTransferGranularity; +} VkQueueFamilyProperties; -typedef struct VkRenderPassCreateInfo2KHR +typedef struct VkRenderPassCreateInfo { VkStructureType sType; const void *pNext; VkRenderPassCreateFlags flags; uint32_t attachmentCount; - const VkAttachmentDescription2KHR *pAttachments; + const VkAttachmentDescription *pAttachments; uint32_t subpassCount; - const VkSubpassDescription2KHR *pSubpasses; + const VkSubpassDescription *pSubpasses; uint32_t dependencyCount; - const VkSubpassDependency2KHR *pDependencies; - uint32_t correlatedViewMaskCount; - const uint32_t *pCorrelatedViewMasks; -} VkRenderPassCreateInfo2KHR; + const VkSubpassDependency *pDependencies; +} VkRenderPassCreateInfo; -typedef struct VkSamplerYcbcrConversionCreateInfo +typedef struct VkSparseImageFormatProperties2 { VkStructureType sType; - const void *pNext; - VkFormat format; - VkSamplerYcbcrModelConversion ycbcrModel; - VkSamplerYcbcrRange ycbcrRange; - VkComponentMapping components; - VkChromaLocation xChromaOffset; - VkChromaLocation yChromaOffset; - VkFilter chromaFilter; - VkBool32 forceExplicitReconstruction; -} VkSamplerYcbcrConversionCreateInfo; + void *pNext; + VkSparseImageFormatProperties properties; +} VkSparseImageFormatProperties2; -typedef struct VkSparseBufferMemoryBindInfo +typedef struct VkSparseImageMemoryRequirements2 { - VkBuffer WINE_VK_ALIGN(8) buffer; - uint32_t bindCount; - const VkSparseMemoryBind *pBinds; -} VkSparseBufferMemoryBindInfo; + VkStructureType sType; + void *pNext; + VkSparseImageMemoryRequirements WINE_VK_ALIGN(8) memoryRequirements; +} VkSparseImageMemoryRequirements2; -typedef struct VkStencilOpState +typedef struct VkViewportWScalingNV { - VkStencilOp failOp; - VkStencilOp passOp; - VkStencilOp depthFailOp; - VkCompareOp compareOp; - uint32_t compareMask; - uint32_t writeMask; - uint32_t reference; -} VkStencilOpState; - -typedef struct VkSurfaceCapabilitiesKHR -{ - uint32_t minImageCount; - uint32_t maxImageCount; - VkExtent2D currentExtent; - VkExtent2D minImageExtent; - VkExtent2D maxImageExtent; - uint32_t maxImageArrayLayers; - VkSurfaceTransformFlagsKHR supportedTransforms; - VkSurfaceTransformFlagBitsKHR currentTransform; - VkCompositeAlphaFlagsKHR supportedCompositeAlpha; - VkImageUsageFlags supportedUsageFlags; -} VkSurfaceCapabilitiesKHR; + float xcoeff; + float ycoeff; +} VkViewportWScalingNV; -typedef struct VkAttachmentSampleLocationsEXT +typedef struct VkAccelerationStructureInfoNV { - uint32_t attachmentIndex; - VkSampleLocationsInfoEXT sampleLocationsInfo; -} VkAttachmentSampleLocationsEXT; + VkStructureType sType; + const void *pNext; + VkAccelerationStructureTypeNV type; + VkBuildAccelerationStructureFlagsNV flags; + uint32_t instanceCount; + uint32_t geometryCount; + const VkGeometryNV *pGeometries; +} VkAccelerationStructureInfoNV; typedef struct VkClearAttachment { @@ -4429,6 +4643,14 @@ typedef struct VkClearAttachment VkClearValue clearValue; } VkClearAttachment; +typedef struct VkDedicatedAllocationMemoryAllocateInfoNV +{ + VkStructureType sType; + const void *pNext; + VkImage WINE_VK_ALIGN(8) image; + VkBuffer WINE_VK_ALIGN(8) buffer; +} VkDedicatedAllocationMemoryAllocateInfoNV; + typedef struct VkDeviceGroupBindSparseInfo { VkStructureType sType; @@ -4437,15 +4659,6 @@ typedef struct VkDeviceGroupBindSparseInfo uint32_t memoryDeviceIndex; } VkDeviceGroupBindSparseInfo; -typedef struct VkDrawIndexedIndirectCommand -{ - uint32_t indexCount; - uint32_t instanceCount; - uint32_t firstIndex; - int32_t vertexOffset; - uint32_t firstInstance; -} VkDrawIndexedIndirectCommand; - typedef struct VkExternalBufferProperties { VkStructureType sType; @@ -4460,21 +4673,20 @@ typedef struct VkFormatProperties2 VkFormatProperties formatProperties; } VkFormatProperties2; -typedef struct VkImageCopy +typedef struct VkImageFormatListCreateInfoKHR { - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffset; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffset; - VkExtent3D extent; -} VkImageCopy; + VkStructureType sType; + const void *pNext; + uint32_t viewFormatCount; + const VkFormat *pViewFormats; +} VkImageFormatListCreateInfoKHR; -typedef struct VkPhysicalDeviceExternalFenceInfo +typedef struct VkPhysicalDeviceExternalImageFormatInfo { VkStructureType sType; const void *pNext; - VkExternalFenceHandleTypeFlagBits handleType; -} VkPhysicalDeviceExternalFenceInfo; + VkExternalMemoryHandleTypeFlagBits handleType; +} VkPhysicalDeviceExternalImageFormatInfo; typedef struct VkPhysicalDeviceMemoryProperties2 { @@ -4491,242 +4703,314 @@ typedef struct VkPhysicalDeviceShadingRateImageFeaturesNV VkBool32 shadingRateCoarseSampleOrder; } VkPhysicalDeviceShadingRateImageFeaturesNV; -typedef struct VkPipelineDepthStencilStateCreateInfo +typedef struct VkPipelineLayoutCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineDepthStencilStateCreateFlags flags; - VkBool32 depthTestEnable; - VkBool32 depthWriteEnable; - VkCompareOp depthCompareOp; - VkBool32 depthBoundsTestEnable; - VkBool32 stencilTestEnable; - VkStencilOpState front; - VkStencilOpState back; - float minDepthBounds; - float maxDepthBounds; -} VkPipelineDepthStencilStateCreateInfo; + VkPipelineLayoutCreateFlags flags; + uint32_t setLayoutCount; + const VkDescriptorSetLayout *pSetLayouts; + uint32_t pushConstantRangeCount; + const VkPushConstantRange *pPushConstantRanges; +} VkPipelineLayoutCreateInfo; -typedef struct VkPipelineVertexInputDivisorStateCreateInfoEXT +typedef struct VkPipelineViewportExclusiveScissorStateCreateInfoNV { VkStructureType sType; const void *pNext; - uint32_t vertexBindingDivisorCount; - const VkVertexInputBindingDivisorDescriptionEXT *pVertexBindingDivisors; -} VkPipelineVertexInputDivisorStateCreateInfoEXT; + uint32_t exclusiveScissorCount; + const VkRect2D *pExclusiveScissors; +} VkPipelineViewportExclusiveScissorStateCreateInfoNV; -typedef struct VkPipelineViewportStateCreateInfo +typedef struct VkPresentRegionsKHR { VkStructureType sType; const void *pNext; - VkPipelineViewportStateCreateFlags flags; - uint32_t viewportCount; - const VkViewport *pViewports; - uint32_t scissorCount; - const VkRect2D *pScissors; -} VkPipelineViewportStateCreateInfo; + uint32_t swapchainCount; + const VkPresentRegionKHR *pRegions; +} VkPresentRegionsKHR; -typedef struct VkRenderPassBeginInfo +typedef struct VkRenderPassCreateInfo2KHR { VkStructureType sType; const void *pNext; - VkRenderPass WINE_VK_ALIGN(8) renderPass; - VkFramebuffer WINE_VK_ALIGN(8) framebuffer; - VkRect2D renderArea; - uint32_t clearValueCount; - const VkClearValue *pClearValues; -} VkRenderPassBeginInfo; + VkRenderPassCreateFlags flags; + uint32_t attachmentCount; + const VkAttachmentDescription2KHR *pAttachments; + uint32_t subpassCount; + const VkSubpassDescription2KHR *pSubpasses; + uint32_t dependencyCount; + const VkSubpassDependency2KHR *pDependencies; + uint32_t correlatedViewMaskCount; + const uint32_t *pCorrelatedViewMasks; +} VkRenderPassCreateInfo2KHR; -typedef struct VkRenderPassSampleLocationsBeginInfoEXT +typedef struct VkSparseBufferMemoryBindInfo +{ + VkBuffer WINE_VK_ALIGN(8) buffer; + uint32_t bindCount; + const VkSparseMemoryBind *pBinds; +} VkSparseBufferMemoryBindInfo; + +typedef struct VkSubpassBeginInfoKHR { VkStructureType sType; const void *pNext; - uint32_t attachmentInitialSampleLocationsCount; - const VkAttachmentSampleLocationsEXT *pAttachmentInitialSampleLocations; - uint32_t postSubpassSampleLocationsCount; - const VkSubpassSampleLocationsEXT *pPostSubpassSampleLocations; -} VkRenderPassSampleLocationsBeginInfoEXT; + VkSubpassContents contents; +} VkSubpassBeginInfoKHR; -typedef struct VkSparseImageMemoryBindInfo +typedef struct VkWriteDescriptorSetInlineUniformBlockEXT { - VkImage WINE_VK_ALIGN(8) image; - uint32_t bindCount; - const VkSparseImageMemoryBind *pBinds; -} VkSparseImageMemoryBindInfo; + VkStructureType sType; + const void *pNext; + uint32_t dataSize; + const void *pData; +} VkWriteDescriptorSetInlineUniformBlockEXT; -typedef struct VkVertexInputAttributeDescription +typedef struct VkAccelerationStructureCreateInfoNV { - uint32_t location; - uint32_t binding; - VkFormat format; - uint32_t offset; -} VkVertexInputAttributeDescription; + VkStructureType sType; + const void *pNext; + VkDeviceSize WINE_VK_ALIGN(8) compactedSize; + VkAccelerationStructureInfoNV info; +} VkAccelerationStructureCreateInfoNV; -typedef struct VkBindSparseInfo +typedef struct VkComponentMapping +{ + VkComponentSwizzle r; + VkComponentSwizzle g; + VkComponentSwizzle b; + VkComponentSwizzle a; +} VkComponentMapping; + +typedef struct VkDescriptorSetLayoutCreateInfo { VkStructureType sType; const void *pNext; - uint32_t waitSemaphoreCount; - const VkSemaphore *pWaitSemaphores; - uint32_t bufferBindCount; - const VkSparseBufferMemoryBindInfo *pBufferBinds; - uint32_t imageOpaqueBindCount; - const VkSparseImageOpaqueMemoryBindInfo *pImageOpaqueBinds; - uint32_t imageBindCount; - const VkSparseImageMemoryBindInfo *pImageBinds; - uint32_t signalSemaphoreCount; - const VkSemaphore *pSignalSemaphores; -} VkBindSparseInfo; + VkDescriptorSetLayoutCreateFlags flags; + uint32_t bindingCount; + const VkDescriptorSetLayoutBinding *pBindings; +} VkDescriptorSetLayoutCreateInfo; -typedef struct VkDescriptorSetLayoutBinding +typedef struct VkImagePlaneMemoryRequirementsInfo { - uint32_t binding; - VkDescriptorType descriptorType; - uint32_t descriptorCount; - VkShaderStageFlags stageFlags; - const VkSampler *pImmutableSamplers; -} VkDescriptorSetLayoutBinding; + VkStructureType sType; + const void *pNext; + VkImageAspectFlagBits planeAspect; +} VkImagePlaneMemoryRequirementsInfo; -typedef struct VkDispatchIndirectCommand +typedef struct VkMemoryDedicatedAllocateInfo { - uint32_t x; - uint32_t y; - uint32_t z; -} VkDispatchIndirectCommand; + VkStructureType sType; + const void *pNext; + VkImage WINE_VK_ALIGN(8) image; + VkBuffer WINE_VK_ALIGN(8) buffer; +} VkMemoryDedicatedAllocateInfo; -typedef struct VkExternalImageFormatProperties +typedef struct VkPhysicalDeviceImageFormatInfo2 { VkStructureType sType; - void *pNext; - VkExternalMemoryProperties externalMemoryProperties; -} VkExternalImageFormatProperties; + const void *pNext; + VkFormat format; + VkImageType type; + VkImageTiling tiling; + VkImageUsageFlags usage; + VkImageCreateFlags flags; +} VkPhysicalDeviceImageFormatInfo2; -typedef struct VkImageResolve +typedef struct VkPipelineColorBlendAttachmentState { - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffset; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffset; - VkExtent3D extent; -} VkImageResolve; + VkBool32 blendEnable; + VkBlendFactor srcColorBlendFactor; + VkBlendFactor dstColorBlendFactor; + VkBlendOp colorBlendOp; + VkBlendFactor srcAlphaBlendFactor; + VkBlendFactor dstAlphaBlendFactor; + VkBlendOp alphaBlendOp; + VkColorComponentFlags colorWriteMask; +} VkPipelineColorBlendAttachmentState; -typedef struct VkPhysicalDevice8BitStorageFeaturesKHR +typedef struct VkPipelineShaderStageCreateInfo { VkStructureType sType; - void *pNext; - VkBool32 storageBuffer8BitAccess; - VkBool32 uniformAndStorageBuffer8BitAccess; - VkBool32 storagePushConstant8; -} VkPhysicalDevice8BitStorageFeaturesKHR; + const void *pNext; + VkPipelineShaderStageCreateFlags flags; + VkShaderStageFlagBits stage; + VkShaderModule WINE_VK_ALIGN(8) module; + const char *pName; + const VkSpecializationInfo *pSpecializationInfo; +} VkPipelineShaderStageCreateInfo; -typedef struct VkPhysicalDeviceProperties2 +typedef struct VkQueueFamilyProperties2 { VkStructureType sType; void *pNext; - VkPhysicalDeviceProperties WINE_VK_ALIGN(8) properties; -} VkPhysicalDeviceProperties2; + VkQueueFamilyProperties queueFamilyProperties; +} VkQueueFamilyProperties2; -typedef struct VkPipelineLayoutCreateInfo +typedef struct VkSamplerYcbcrConversionCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineLayoutCreateFlags flags; - uint32_t setLayoutCount; - const VkDescriptorSetLayout *pSetLayouts; - uint32_t pushConstantRangeCount; - const VkPushConstantRange *pPushConstantRanges; -} VkPipelineLayoutCreateInfo; + VkFormat format; + VkSamplerYcbcrModelConversion ycbcrModel; + VkSamplerYcbcrRange ycbcrRange; + VkComponentMapping components; + VkChromaLocation xChromaOffset; + VkChromaLocation yChromaOffset; + VkFilter chromaFilter; + VkBool32 forceExplicitReconstruction; +} VkSamplerYcbcrConversionCreateInfo; -typedef struct VkPresentRegionsKHR +typedef struct VkValidationCacheCreateInfoEXT { VkStructureType sType; const void *pNext; - uint32_t swapchainCount; - const VkPresentRegionKHR *pRegions; -} VkPresentRegionsKHR; + VkValidationCacheCreateFlagsEXT flags; + size_t initialDataSize; + const void *pInitialData; +} VkValidationCacheCreateInfoEXT; -typedef struct VkCommandBufferBeginInfo +typedef struct VkAttachmentSampleLocationsEXT +{ + uint32_t attachmentIndex; + VkSampleLocationsInfoEXT sampleLocationsInfo; +} VkAttachmentSampleLocationsEXT; + +typedef struct VkComputePipelineCreateInfo { VkStructureType sType; const void *pNext; - VkCommandBufferUsageFlags flags; - const VkCommandBufferInheritanceInfo *pInheritanceInfo; -} VkCommandBufferBeginInfo; + VkPipelineCreateFlags flags; + VkPipelineShaderStageCreateInfo WINE_VK_ALIGN(8) stage; + VkPipelineLayout WINE_VK_ALIGN(8) layout; + VkPipeline WINE_VK_ALIGN(8) basePipelineHandle; + int32_t basePipelineIndex; +} VkComputePipelineCreateInfo; -typedef struct VkMemoryBarrier +typedef struct VkExternalImageFormatProperties { VkStructureType sType; - const void *pNext; - VkAccessFlags srcAccessMask; - VkAccessFlags dstAccessMask; -} VkMemoryBarrier; + void *pNext; + VkExternalMemoryProperties externalMemoryProperties; +} VkExternalImageFormatProperties; -typedef struct VkPipelineColorBlendAdvancedStateCreateInfoEXT +typedef struct VkImageViewCreateInfo { VkStructureType sType; const void *pNext; - VkBool32 srcPremultiplied; - VkBool32 dstPremultiplied; - VkBlendOverlapEXT blendOverlap; -} VkPipelineColorBlendAdvancedStateCreateInfoEXT; + VkImageViewCreateFlags flags; + VkImage WINE_VK_ALIGN(8) image; + VkImageViewType viewType; + VkFormat format; + VkComponentMapping components; + VkImageSubresourceRange subresourceRange; +} VkImageViewCreateInfo; -typedef struct VkSubpassDescription +typedef struct VkPhysicalDeviceProperties { - VkSubpassDescriptionFlags flags; - VkPipelineBindPoint pipelineBindPoint; - uint32_t inputAttachmentCount; - const VkAttachmentReference *pInputAttachments; - uint32_t colorAttachmentCount; - const VkAttachmentReference *pColorAttachments; - const VkAttachmentReference *pResolveAttachments; - const VkAttachmentReference *pDepthStencilAttachment; - uint32_t preserveAttachmentCount; - const uint32_t *pPreserveAttachments; -} VkSubpassDescription; + uint32_t apiVersion; + uint32_t driverVersion; + uint32_t vendorID; + uint32_t deviceID; + VkPhysicalDeviceType deviceType; + char deviceName[VK_MAX_PHYSICAL_DEVICE_NAME_SIZE]; + uint8_t pipelineCacheUUID[VK_UUID_SIZE]; + VkPhysicalDeviceLimits WINE_VK_ALIGN(8) limits; + VkPhysicalDeviceSparseProperties sparseProperties; +} VkPhysicalDeviceProperties; -typedef struct VkDescriptorSetLayoutCreateInfo +typedef struct VkPipelineColorBlendStateCreateInfo { VkStructureType sType; const void *pNext; - VkDescriptorSetLayoutCreateFlags flags; - uint32_t bindingCount; - const VkDescriptorSetLayoutBinding *pBindings; -} VkDescriptorSetLayoutCreateInfo; + VkPipelineColorBlendStateCreateFlags flags; + VkBool32 logicOpEnable; + VkLogicOp logicOp; + uint32_t attachmentCount; + const VkPipelineColorBlendAttachmentState *pAttachments; + float blendConstants[4]; +} VkPipelineColorBlendStateCreateInfo; -typedef struct VkPhysicalDeviceImageFormatInfo2 +typedef struct VkRayTracingPipelineCreateInfoNV { VkStructureType sType; const void *pNext; - VkFormat format; - VkImageType type; - VkImageTiling tiling; - VkImageUsageFlags usage; - VkImageCreateFlags flags; -} VkPhysicalDeviceImageFormatInfo2; + VkPipelineCreateFlags flags; + uint32_t stageCount; + const VkPipelineShaderStageCreateInfo *pStages; + uint32_t groupCount; + const VkRayTracingShaderGroupCreateInfoNV *pGroups; + uint32_t maxRecursionDepth; + VkPipelineLayout WINE_VK_ALIGN(8) layout; + VkPipeline WINE_VK_ALIGN(8) basePipelineHandle; + int32_t basePipelineIndex; +} VkRayTracingPipelineCreateInfoNV; -typedef struct VkRenderPassCreateInfo +typedef struct VkSparseImageMemoryBind +{ + VkImageSubresource subresource; + VkOffset3D offset; + VkExtent3D extent; + VkDeviceMemory WINE_VK_ALIGN(8) memory; + VkDeviceSize WINE_VK_ALIGN(8) memoryOffset; + VkSparseMemoryBindFlags flags; +} VkSparseImageMemoryBind; + +typedef struct VkDeviceQueueInfo2 { VkStructureType sType; const void *pNext; - VkRenderPassCreateFlags flags; - uint32_t attachmentCount; - const VkAttachmentDescription *pAttachments; - uint32_t subpassCount; - const VkSubpassDescription *pSubpasses; - uint32_t dependencyCount; - const VkSubpassDependency *pDependencies; -} VkRenderPassCreateInfo; + VkDeviceQueueCreateFlags flags; + uint32_t queueFamilyIndex; + uint32_t queueIndex; +} VkDeviceQueueInfo2; -typedef struct VkPipelineVertexInputStateCreateInfo +typedef struct VkPhysicalDeviceASTCDecodeFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 decodeModeSharedExponent; +} VkPhysicalDeviceASTCDecodeFeaturesEXT; + +typedef struct VkPipelineViewportWScalingStateCreateInfoNV { VkStructureType sType; const void *pNext; - VkPipelineVertexInputStateCreateFlags flags; - uint32_t vertexBindingDescriptionCount; - const VkVertexInputBindingDescription *pVertexBindingDescriptions; - uint32_t vertexAttributeDescriptionCount; - const VkVertexInputAttributeDescription *pVertexAttributeDescriptions; -} VkPipelineVertexInputStateCreateInfo; + VkBool32 viewportWScalingEnable; + uint32_t viewportCount; + const VkViewportWScalingNV *pViewportWScalings; +} VkPipelineViewportWScalingStateCreateInfoNV; + +typedef struct VkSparseImageMemoryBindInfo +{ + VkImage WINE_VK_ALIGN(8) image; + uint32_t bindCount; + const VkSparseImageMemoryBind *pBinds; +} VkSparseImageMemoryBindInfo; + +typedef struct VkBindSparseInfo +{ + VkStructureType sType; + const void *pNext; + uint32_t waitSemaphoreCount; + const VkSemaphore *pWaitSemaphores; + uint32_t bufferBindCount; + const VkSparseBufferMemoryBindInfo *pBufferBinds; + uint32_t imageOpaqueBindCount; + const VkSparseImageOpaqueMemoryBindInfo *pImageOpaqueBinds; + uint32_t imageBindCount; + const VkSparseImageMemoryBindInfo *pImageBinds; + uint32_t signalSemaphoreCount; + const VkSemaphore *pSignalSemaphores; +} VkBindSparseInfo; + +typedef struct VkPhysicalDeviceProperties2 +{ + VkStructureType sType; + void *pNext; + VkPhysicalDeviceProperties WINE_VK_ALIGN(8) properties; +} VkPhysicalDeviceProperties2; typedef struct VkGraphicsPipelineCreateInfo { @@ -4751,12 +5035,23 @@ typedef struct VkGraphicsPipelineCreateInfo int32_t basePipelineIndex; } VkGraphicsPipelineCreateInfo; +typedef struct VkRenderPassSampleLocationsBeginInfoEXT +{ + VkStructureType sType; + const void *pNext; + uint32_t attachmentInitialSampleLocationsCount; + const VkAttachmentSampleLocationsEXT *pAttachmentInitialSampleLocations; + uint32_t postSubpassSampleLocationsCount; + const VkSubpassSampleLocationsEXT *pPostSubpassSampleLocations; +} VkRenderPassSampleLocationsBeginInfoEXT; + typedef VkResult (VKAPI_PTR *PFN_vkAcquireNextImage2KHR)(VkDevice, const VkAcquireNextImageInfoKHR *, uint32_t *); typedef VkResult (VKAPI_PTR *PFN_vkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); typedef VkResult (VKAPI_PTR *PFN_vkAllocateCommandBuffers)(VkDevice, const VkCommandBufferAllocateInfo *, VkCommandBuffer *); typedef VkResult (VKAPI_PTR *PFN_vkAllocateDescriptorSets)(VkDevice, const VkDescriptorSetAllocateInfo *, VkDescriptorSet *); typedef VkResult (VKAPI_PTR *PFN_vkAllocateMemory)(VkDevice, const VkMemoryAllocateInfo *, const VkAllocationCallbacks *, VkDeviceMemory *); typedef VkResult (VKAPI_PTR *PFN_vkBeginCommandBuffer)(VkCommandBuffer, const VkCommandBufferBeginInfo *); +typedef VkResult (VKAPI_PTR *PFN_vkBindAccelerationStructureMemoryNV)(VkDevice, uint32_t, const VkBindAccelerationStructureMemoryInfoNV *); typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory)(VkDevice, VkBuffer, VkDeviceMemory, VkDeviceSize); typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory2)(VkDevice, uint32_t, const VkBindBufferMemoryInfo *); typedef VkResult (VKAPI_PTR *PFN_vkBindBufferMemory2KHR)(VkDevice, uint32_t, const VkBindBufferMemoryInfo *); @@ -4776,9 +5071,11 @@ typedef void (VKAPI_PTR *PFN_vkCmdBindShadingRateImageNV)(VkCommandBuffer, VkIma typedef void (VKAPI_PTR *PFN_vkCmdBindTransformFeedbackBuffersEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *, const VkDeviceSize *); typedef void (VKAPI_PTR *PFN_vkCmdBindVertexBuffers)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *); typedef void (VKAPI_PTR *PFN_vkCmdBlitImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageBlit *, VkFilter); +typedef void (VKAPI_PTR *PFN_vkCmdBuildAccelerationStructureNV)(VkCommandBuffer, const VkAccelerationStructureInfoNV *, VkBuffer, VkDeviceSize, VkBool32, VkAccelerationStructureNV, VkAccelerationStructureNV, VkBuffer, VkDeviceSize); typedef void (VKAPI_PTR *PFN_vkCmdClearAttachments)(VkCommandBuffer, uint32_t, const VkClearAttachment *, uint32_t, const VkClearRect *); typedef void (VKAPI_PTR *PFN_vkCmdClearColorImage)(VkCommandBuffer, VkImage, VkImageLayout, const VkClearColorValue *, uint32_t, const VkImageSubresourceRange *); typedef void (VKAPI_PTR *PFN_vkCmdClearDepthStencilImage)(VkCommandBuffer, VkImage, VkImageLayout, const VkClearDepthStencilValue *, uint32_t, const VkImageSubresourceRange *); +typedef void (VKAPI_PTR *PFN_vkCmdCopyAccelerationStructureNV)(VkCommandBuffer, VkAccelerationStructureNV, VkAccelerationStructureNV, VkCopyAccelerationStructureModeNV); typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer)(VkCommandBuffer, VkBuffer, VkBuffer, uint32_t, const VkBufferCopy *); typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage)(VkCommandBuffer, VkBuffer, VkImage, VkImageLayout, uint32_t, const VkBufferImageCopy *); typedef void (VKAPI_PTR *PFN_vkCmdCopyImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageCopy *); @@ -4836,10 +5133,14 @@ typedef void (VKAPI_PTR *PFN_vkCmdSetStencilWriteMask)(VkCommandBuffer, VkStenci typedef void (VKAPI_PTR *PFN_vkCmdSetViewport)(VkCommandBuffer, uint32_t, uint32_t, const VkViewport *); typedef void (VKAPI_PTR *PFN_vkCmdSetViewportShadingRatePaletteNV)(VkCommandBuffer, uint32_t, uint32_t, const VkShadingRatePaletteNV *); typedef void (VKAPI_PTR *PFN_vkCmdSetViewportWScalingNV)(VkCommandBuffer, uint32_t, uint32_t, const VkViewportWScalingNV *); +typedef void (VKAPI_PTR *PFN_vkCmdTraceRaysNV)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, VkBuffer, VkDeviceSize, VkDeviceSize, uint32_t, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdUpdateBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize, const void *); typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents)(VkCommandBuffer, uint32_t, const VkEvent *, VkPipelineStageFlags, VkPipelineStageFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier *, uint32_t, const VkImageMemoryBarrier *); +typedef void (VKAPI_PTR *PFN_vkCmdWriteAccelerationStructuresPropertiesNV)(VkCommandBuffer, uint32_t, const VkAccelerationStructureNV *, VkQueryType, VkQueryPool, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarkerAMD)(VkCommandBuffer, VkPipelineStageFlagBits, VkBuffer, VkDeviceSize, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp)(VkCommandBuffer, VkPipelineStageFlagBits, VkQueryPool, uint32_t); +typedef VkResult (VKAPI_PTR *PFN_vkCompileDeferredNV)(VkDevice, VkPipeline, uint32_t); +typedef VkResult (VKAPI_PTR *PFN_vkCreateAccelerationStructureNV)(VkDevice, const VkAccelerationStructureCreateInfoNV *, const VkAllocationCallbacks *, VkAccelerationStructureNV *); typedef VkResult (VKAPI_PTR *PFN_vkCreateBuffer)(VkDevice, const VkBufferCreateInfo *, const VkAllocationCallbacks *, VkBuffer *); typedef VkResult (VKAPI_PTR *PFN_vkCreateBufferView)(VkDevice, const VkBufferViewCreateInfo *, const VkAllocationCallbacks *, VkBufferView *); typedef VkResult (VKAPI_PTR *PFN_vkCreateCommandPool)(VkDevice, const VkCommandPoolCreateInfo *, const VkAllocationCallbacks *, VkCommandPool *); @@ -4859,6 +5160,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateInstance)(const VkInstanceCreateInfo *, typedef VkResult (VKAPI_PTR *PFN_vkCreatePipelineCache)(VkDevice, const VkPipelineCacheCreateInfo *, const VkAllocationCallbacks *, VkPipelineCache *); typedef VkResult (VKAPI_PTR *PFN_vkCreatePipelineLayout)(VkDevice, const VkPipelineLayoutCreateInfo *, const VkAllocationCallbacks *, VkPipelineLayout *); typedef VkResult (VKAPI_PTR *PFN_vkCreateQueryPool)(VkDevice, const VkQueryPoolCreateInfo *, const VkAllocationCallbacks *, VkQueryPool *); +typedef VkResult (VKAPI_PTR *PFN_vkCreateRayTracingPipelinesNV)(VkDevice, VkPipelineCache, uint32_t, const VkRayTracingPipelineCreateInfoNV *, const VkAllocationCallbacks *, VkPipeline *); typedef VkResult (VKAPI_PTR *PFN_vkCreateRenderPass)(VkDevice, const VkRenderPassCreateInfo *, const VkAllocationCallbacks *, VkRenderPass *); typedef VkResult (VKAPI_PTR *PFN_vkCreateRenderPass2KHR)(VkDevice, const VkRenderPassCreateInfo2KHR *, const VkAllocationCallbacks *, VkRenderPass *); typedef VkResult (VKAPI_PTR *PFN_vkCreateSampler)(VkDevice, const VkSamplerCreateInfo *, const VkAllocationCallbacks *, VkSampler *); @@ -4869,6 +5171,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateShaderModule)(VkDevice, const VkShaderM typedef VkResult (VKAPI_PTR *PFN_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); typedef VkResult (VKAPI_PTR *PFN_vkCreateValidationCacheEXT)(VkDevice, const VkValidationCacheCreateInfoEXT *, const VkAllocationCallbacks *, VkValidationCacheEXT *); typedef VkResult (VKAPI_PTR *PFN_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); +typedef void (VKAPI_PTR *PFN_vkDestroyAccelerationStructureNV)(VkDevice, VkAccelerationStructureNV, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyBuffer)(VkDevice, VkBuffer, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyBufferView)(VkDevice, VkBufferView, const VkAllocationCallbacks *); typedef void (VKAPI_PTR *PFN_vkDestroyCommandPool)(VkDevice, VkCommandPool, const VkAllocationCallbacks *); @@ -4910,6 +5213,8 @@ typedef VkResult (VKAPI_PTR *PFN_vkFlushMappedMemoryRanges)(VkDevice, uint32_t, typedef void (VKAPI_PTR *PFN_vkFreeCommandBuffers)(VkDevice, VkCommandPool, uint32_t, const VkCommandBuffer *); typedef VkResult (VKAPI_PTR *PFN_vkFreeDescriptorSets)(VkDevice, VkDescriptorPool, uint32_t, const VkDescriptorSet *); typedef void (VKAPI_PTR *PFN_vkFreeMemory)(VkDevice, VkDeviceMemory, const VkAllocationCallbacks *); +typedef VkResult (VKAPI_PTR *PFN_vkGetAccelerationStructureHandleNV)(VkDevice, VkAccelerationStructureNV, size_t, void *); +typedef void (VKAPI_PTR *PFN_vkGetAccelerationStructureMemoryRequirementsNV)(VkDevice, const VkAccelerationStructureMemoryRequirementsInfoNV *, VkMemoryRequirements2KHR *); typedef void (VKAPI_PTR *PFN_vkGetBufferMemoryRequirements)(VkDevice, VkBuffer, VkMemoryRequirements *); typedef void (VKAPI_PTR *PFN_vkGetBufferMemoryRequirements2)(VkDevice, const VkBufferMemoryRequirementsInfo2 *, VkMemoryRequirements2 *); typedef void (VKAPI_PTR *PFN_vkGetBufferMemoryRequirements2KHR)(VkDevice, const VkBufferMemoryRequirementsInfo2 *, VkMemoryRequirements2 *); @@ -4964,6 +5269,7 @@ typedef VkBool32 (VKAPI_PTR *PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR) typedef VkResult (VKAPI_PTR *PFN_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *); typedef VkResult (VKAPI_PTR *PFN_vkGetQueryPoolResults)(VkDevice, VkQueryPool, uint32_t, uint32_t, size_t, void *, VkDeviceSize, VkQueryResultFlags); typedef void (VKAPI_PTR *PFN_vkGetQueueCheckpointDataNV)(VkQueue, uint32_t *, VkCheckpointDataNV *); +typedef VkResult (VKAPI_PTR *PFN_vkGetRayTracingShaderGroupHandlesNV)(VkDevice, VkPipeline, uint32_t, uint32_t, size_t, void *); typedef void (VKAPI_PTR *PFN_vkGetRenderAreaGranularity)(VkDevice, VkRenderPass, VkExtent2D *); typedef VkResult (VKAPI_PTR *PFN_vkGetShaderInfoAMD)(VkDevice, VkPipeline, VkShaderStageFlagBits, VkShaderInfoTypeAMD, size_t *, void *); typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); @@ -4997,6 +5303,7 @@ VkResult VKAPI_CALL vkAllocateCommandBuffers(VkDevice device, const VkCommandBuf VkResult VKAPI_CALL vkAllocateDescriptorSets(VkDevice device, const VkDescriptorSetAllocateInfo *pAllocateInfo, VkDescriptorSet *pDescriptorSets); VkResult VKAPI_CALL vkAllocateMemory(VkDevice device, const VkMemoryAllocateInfo *pAllocateInfo, const VkAllocationCallbacks *pAllocator, VkDeviceMemory *pMemory); VkResult VKAPI_CALL vkBeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo *pBeginInfo); +VkResult VKAPI_CALL vkBindAccelerationStructureMemoryNV(VkDevice device, uint32_t bindInfoCount, const VkBindAccelerationStructureMemoryInfoNV *pBindInfos); VkResult VKAPI_CALL vkBindBufferMemory(VkDevice device, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize memoryOffset); VkResult VKAPI_CALL vkBindBufferMemory2(VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo *pBindInfos); VkResult VKAPI_CALL vkBindBufferMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo *pBindInfos); @@ -5016,9 +5323,11 @@ void VKAPI_CALL vkCmdBindShadingRateImageNV(VkCommandBuffer commandBuffer, VkIma void VKAPI_CALL vkCmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes); void VKAPI_CALL vkCmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets); void VKAPI_CALL vkCmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit *pRegions, VkFilter filter); +void VKAPI_CALL vkCmdBuildAccelerationStructureNV(VkCommandBuffer commandBuffer, const VkAccelerationStructureInfoNV *pInfo, VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkBuffer scratch, VkDeviceSize scratchOffset); void VKAPI_CALL vkCmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment *pAttachments, uint32_t rectCount, const VkClearRect *pRects); void VKAPI_CALL vkCmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue *pColor, uint32_t rangeCount, const VkImageSubresourceRange *pRanges); void VKAPI_CALL vkCmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue *pDepthStencil, uint32_t rangeCount, const VkImageSubresourceRange *pRanges); +void VKAPI_CALL vkCmdCopyAccelerationStructureNV(VkCommandBuffer commandBuffer, VkAccelerationStructureNV dst, VkAccelerationStructureNV src, VkCopyAccelerationStructureModeNV mode); void VKAPI_CALL vkCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy *pRegions); void VKAPI_CALL vkCmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy *pRegions); void VKAPI_CALL vkCmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy *pRegions); @@ -5076,10 +5385,14 @@ void VKAPI_CALL vkCmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStenci void VKAPI_CALL vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport *pViewports); void VKAPI_CALL vkCmdSetViewportShadingRatePaletteNV(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkShadingRatePaletteNV *pShadingRatePalettes); void VKAPI_CALL vkCmdSetViewportWScalingNV(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewportWScalingNV *pViewportWScalings); +void VKAPI_CALL vkCmdTraceRaysNV(VkCommandBuffer commandBuffer, VkBuffer raygenShaderBindingTableBuffer, VkDeviceSize raygenShaderBindingOffset, VkBuffer missShaderBindingTableBuffer, VkDeviceSize missShaderBindingOffset, VkDeviceSize missShaderBindingStride, VkBuffer hitShaderBindingTableBuffer, VkDeviceSize hitShaderBindingOffset, VkDeviceSize hitShaderBindingStride, VkBuffer callableShaderBindingTableBuffer, VkDeviceSize callableShaderBindingOffset, VkDeviceSize callableShaderBindingStride, uint32_t width, uint32_t height, uint32_t depth); void VKAPI_CALL vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData); void VKAPI_CALL vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers); +void VKAPI_CALL vkCmdWriteAccelerationStructuresPropertiesNV(VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureNV *pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery); void VKAPI_CALL vkCmdWriteBufferMarkerAMD(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); void VKAPI_CALL vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query); +VkResult VKAPI_CALL vkCompileDeferredNV(VkDevice device, VkPipeline pipeline, uint32_t shader); +VkResult VKAPI_CALL vkCreateAccelerationStructureNV(VkDevice device, const VkAccelerationStructureCreateInfoNV *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkAccelerationStructureNV *pAccelerationStructure); VkResult VKAPI_CALL vkCreateBuffer(VkDevice device, const VkBufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBuffer *pBuffer); VkResult VKAPI_CALL vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBufferView *pView); VkResult VKAPI_CALL vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCommandPool); @@ -5099,6 +5412,7 @@ VkResult VKAPI_CALL vkCreateInstance(const VkInstanceCreateInfo *pCreateInfo, co VkResult VKAPI_CALL vkCreatePipelineCache(VkDevice device, const VkPipelineCacheCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkPipelineCache *pPipelineCache); VkResult VKAPI_CALL vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkPipelineLayout *pPipelineLayout); VkResult VKAPI_CALL vkCreateQueryPool(VkDevice device, const VkQueryPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkQueryPool *pQueryPool); +VkResult VKAPI_CALL vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines); VkResult VKAPI_CALL vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass); VkResult VKAPI_CALL vkCreateRenderPass2KHR(VkDevice device, const VkRenderPassCreateInfo2KHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass); VkResult VKAPI_CALL vkCreateSampler(VkDevice device, const VkSamplerCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSampler *pSampler); @@ -5109,6 +5423,7 @@ VkResult VKAPI_CALL vkCreateShaderModule(VkDevice device, const VkShaderModuleCr VkResult VKAPI_CALL vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSwapchainKHR *pSwapchain); VkResult VKAPI_CALL vkCreateValidationCacheEXT(VkDevice device, const VkValidationCacheCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkValidationCacheEXT *pValidationCache); VkResult VKAPI_CALL vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface); +void VKAPI_CALL vkDestroyAccelerationStructureNV(VkDevice device, VkAccelerationStructureNV accelerationStructure, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyBufferView(VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks *pAllocator); void VKAPI_CALL vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator); @@ -5150,6 +5465,8 @@ VkResult VKAPI_CALL vkFlushMappedMemoryRanges(VkDevice device, uint32_t memoryRa void VKAPI_CALL vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers); VkResult VKAPI_CALL vkFreeDescriptorSets(VkDevice device, VkDescriptorPool descriptorPool, uint32_t descriptorSetCount, const VkDescriptorSet *pDescriptorSets); void VKAPI_CALL vkFreeMemory(VkDevice device, VkDeviceMemory memory, const VkAllocationCallbacks *pAllocator); +VkResult VKAPI_CALL vkGetAccelerationStructureHandleNV(VkDevice device, VkAccelerationStructureNV accelerationStructure, size_t dataSize, void *pData); +void VKAPI_CALL vkGetAccelerationStructureMemoryRequirementsNV(VkDevice device, const VkAccelerationStructureMemoryRequirementsInfoNV *pInfo, VkMemoryRequirements2KHR *pMemoryRequirements); void VKAPI_CALL vkGetBufferMemoryRequirements(VkDevice device, VkBuffer buffer, VkMemoryRequirements *pMemoryRequirements); void VKAPI_CALL vkGetBufferMemoryRequirements2(VkDevice device, const VkBufferMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements); void VKAPI_CALL vkGetBufferMemoryRequirements2KHR(VkDevice device, const VkBufferMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements); @@ -5204,6 +5521,7 @@ VkBool32 VKAPI_CALL vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDev VkResult VKAPI_CALL vkGetPipelineCacheData(VkDevice device, VkPipelineCache pipelineCache, size_t *pDataSize, void *pData); VkResult VKAPI_CALL vkGetQueryPoolResults(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void *pData, VkDeviceSize stride, VkQueryResultFlags flags); void VKAPI_CALL vkGetQueueCheckpointDataNV(VkQueue queue, uint32_t *pCheckpointDataCount, VkCheckpointDataNV *pCheckpointData); +VkResult VKAPI_CALL vkGetRayTracingShaderGroupHandlesNV(VkDevice device, VkPipeline pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void *pData); void VKAPI_CALL vkGetRenderAreaGranularity(VkDevice device, VkRenderPass renderPass, VkExtent2D *pGranularity); VkResult VKAPI_CALL vkGetShaderInfoAMD(VkDevice device, VkPipeline pipeline, VkShaderStageFlagBits shaderStage, VkShaderInfoTypeAMD infoType, size_t *pInfoSize, void *pInfo); VkResult VKAPI_CALL vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages); -- 2.18.1

1 0

[PATCH v2 4/4] winhttp: Store Accept headers like the other headers.
by Hans Leidekker 26 Nov '18

26 Nov '18

Based on a patch by Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 10 ++-------- dlls/winhttp/session.c | 31 +++++-------------------------- dlls/winhttp/winhttp_private.h | 5 ++--- 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a081b608ab..5525c1c0bb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -398,8 +398,7 @@ static BOOL delete_header( struct request *request, DWORD index ) return TRUE; } -static BOOL process_header( struct request *request, const WCHAR *field, const WCHAR *value, DWORD flags, - BOOL request_only ) +BOOL process_header( struct request *request, const WCHAR *field, const WCHAR *value, DWORD flags, BOOL request_only ) { int index; struct header hdr; @@ -2180,16 +2179,11 @@ static BOOL send_request( struct request *request, const WCHAR *headers, DWORD h struct session *session = connect->session; char *wire_req; int bytes_sent; - DWORD len, i, flags; + DWORD len; clear_response_headers( request ); drain_content( request ); - flags = WINHTTP_ADDREQ_FLAG_ADD|WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA; - for (i = 0; i < request->num_accept_types; i++) - { - process_header( request, attr_accept, request->accept_types[i], flags, TRUE ); - } if (session->agent) process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f8d98d0c86..39e8d8233f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -626,8 +626,6 @@ static void request_destroy( struct object_header *hdr ) heap_free( request->headers[i].value ); } heap_free( request->headers ); - for (i = 0; i < request->num_accept_types; i++) heap_free( request->accept_types[i] ); - heap_free( request->accept_types ); for (i = 0; i < TARGET_MAX; i++) { for (j = 0; j < SCHEME_MAX; j++) @@ -1042,34 +1040,15 @@ static const struct object_vtbl request_vtbl = request_set_option }; -static BOOL store_accept_types( struct request *request, const WCHAR **accept_types ) +static BOOL add_accept_types_header( struct request *request, const WCHAR **types ) { - const WCHAR **types = accept_types; - DWORD i; + static const WCHAR acceptW[] = {'A','c','c','e','p','t',0}; + static const DWORD flags = WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA; if (!types) return TRUE; while (*types) { - request->num_accept_types++; - types++; - } - if (!request->num_accept_types) return TRUE; - if (!(request->accept_types = heap_alloc( request->num_accept_types * sizeof(WCHAR *)))) - { - request->num_accept_types = 0; - return FALSE; - } - types = accept_types; - for (i = 0; i < request->num_accept_types; i++) - { - if (!(request->accept_types[i] = strdupW( *types ))) - { - for ( ; i > 0; --i) heap_free( request->accept_types[i - 1] ); - heap_free( request->accept_types ); - request->accept_types = NULL; - request->num_accept_types = 0; - return FALSE; - } + if (!process_header( request, acceptW, *types, flags, TRUE )) return FALSE; types++; } return TRUE; @@ -1151,7 +1130,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!version || !version[0]) version = http1_1; if (!(request->version = strdupW( version ))) goto end; - if (!(store_accept_types( request, types ))) goto end; + if (!(add_accept_types_header( request, types ))) goto end; if (!(hrequest = alloc_handle( &request->hdr ))) goto end; request->hdr.handle = hrequest; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 14cee4403b..b46f7087d8 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -198,8 +198,6 @@ struct request char read_buf[8192]; /* buffer for already read but not returned data */ struct header *headers; DWORD num_headers; - WCHAR **accept_types; - DWORD num_accept_types; struct authinfo *authinfo; struct authinfo *proxy_authinfo; HANDLE task_wait; @@ -288,7 +286,8 @@ void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -void release_host( struct hostdata *host ) DECLSPEC_HIDDEN; +void release_host( struct hostdata * ) DECLSPEC_HIDDEN; +BOOL process_header( struct request *, const WCHAR *, const WCHAR *, DWORD, BOOL ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH v2 3/4] winhttp: Use the thread pool for COM object requests.
by Hans Leidekker 26 Nov '18

26 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 52 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f78cb2e6d4..a081b608ab 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3067,9 +3067,10 @@ struct winhttp_request HINTERNET hrequest; VARIANT data; WCHAR *verb; - HANDLE thread; + HANDLE done; HANDLE wait; HANDLE cancel; + BOOL proc_running; char *buffer; DWORD offset; DWORD bytes_available; @@ -3103,15 +3104,16 @@ static void cancel_request( struct winhttp_request *request ) { if (request->state <= REQUEST_STATE_CANCELLED) return; - SetEvent( request->cancel ); - LeaveCriticalSection( &request->cs ); - WaitForSingleObject( request->thread, INFINITE ); - EnterCriticalSection( &request->cs ); + if (request->proc_running) + { + SetEvent( request->cancel ); + LeaveCriticalSection( &request->cs ); - request->state = REQUEST_STATE_CANCELLED; + WaitForSingleObject( request->done, INFINITE ); - CloseHandle( request->thread ); - request->thread = NULL; + EnterCriticalSection( &request->cs ); + } + request->state = REQUEST_STATE_CANCELLED; } /* critical section must be held */ @@ -3121,7 +3123,7 @@ static void free_request( struct winhttp_request *request ) WinHttpCloseHandle( request->hrequest ); WinHttpCloseHandle( request->hconnect ); WinHttpCloseHandle( request->hsession ); - CloseHandle( request->thread ); + CloseHandle( request->done ); CloseHandle( request->wait ); CloseHandle( request->cancel ); heap_free( request->proxy.lpszProxy ); @@ -3450,6 +3452,7 @@ static void initialize_request( struct winhttp_request *request ) { request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->done = CreateEventW( NULL, FALSE, FALSE, NULL ); request->connect_timeout = 60000; request->send_timeout = 30000; request->receive_timeout = 30000; @@ -3747,19 +3750,22 @@ static void wait_set_status_callback( struct winhttp_request *request, DWORD sta static DWORD wait_for_completion( struct winhttp_request *request ) { HANDLE handles[2] = { request->wait, request->cancel }; + DWORD ret; switch (WaitForMultipleObjects( 2, handles, FALSE, INFINITE )) { case WAIT_OBJECT_0: + ret = request->error; break; case WAIT_OBJECT_0 + 1: - request->error = ERROR_CANCELLED; + ret = request->error = ERROR_CANCELLED; + SetEvent( request->done ); break; default: - request->error = GetLastError(); + ret = request->error = GetLastError(); break; } - return request->error; + return ret; } static HRESULT request_receive( struct winhttp_request *request ) @@ -3917,27 +3923,21 @@ error: return HRESULT_FROM_WIN32( err ); } -static HRESULT request_send_and_receive( struct winhttp_request *request ) -{ - HRESULT hr = request_send( request ); - if (hr == S_OK) hr = request_receive( request ); - return hr; -} - -static DWORD CALLBACK send_and_receive_proc( void *arg ) +static void CALLBACK send_and_receive_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct winhttp_request *request = (struct winhttp_request *)arg; - return request_send_and_receive( request ); + struct winhttp_request *request = (struct winhttp_request *)ctx; + if (request_send( request ) == S_OK) request_receive( request ); + SetEvent( request->done ); } /* critical section must be held */ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) { - HANDLE thread = request->thread; + HANDLE done = request->done; DWORD err, ret; LeaveCriticalSection( &request->cs ); - while ((err = MsgWaitForMultipleObjects( 1, &thread, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) + while ((err = MsgWaitForMultipleObjects( 1, &done, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) { MSG msg; while (PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE )) @@ -3960,6 +3960,7 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) break; } EnterCriticalSection( &request->cs ); + if (!ret) request->proc_running = FALSE; return ret; } @@ -3989,11 +3990,12 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return hr; } - if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) + if (!TrySubmitThreadpoolCallback( send_and_receive_proc, request, NULL )) { LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( GetLastError() ); } + request->proc_running = TRUE; if (!request->async) { hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) ); -- 2.11.0

1 0

[PATCH v2 2/4] winhttp: Make sure the COM request object is properly initialized.
by Hans Leidekker 26 Nov '18

26 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index edfebac05c..f78cb2e6d4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3049,7 +3049,6 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write enum request_state { - REQUEST_STATE_UNINITIALIZED, REQUEST_STATE_INITIALIZED, REQUEST_STATE_CANCELLED, REQUEST_STATE_OPEN, @@ -3113,10 +3112,6 @@ static void cancel_request( struct winhttp_request *request ) CloseHandle( request->thread ); request->thread = NULL; - CloseHandle( request->wait ); - request->wait = NULL; - CloseHandle( request->cancel ); - request->cancel = NULL; } /* critical section must be held */ @@ -3453,25 +3448,8 @@ done: static void initialize_request( struct winhttp_request *request ) { - request->hrequest = NULL; - request->hconnect = NULL; - request->hsession = NULL; - request->thread = NULL; - request->wait = NULL; - request->cancel = NULL; - request->buffer = NULL; - request->verb = NULL; - request->offset = 0; - request->bytes_available = 0; - request->bytes_read = 0; - request->error = ERROR_SUCCESS; - request->async = FALSE; - request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; - request->disable_feature = 0; - request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; - request->proxy.lpszProxy = NULL; - request->proxy.lpszProxyBypass = NULL; - request->resolve_timeout = 0; + request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); request->connect_timeout = 60000; request->send_timeout = 30000; request->receive_timeout = 30000; @@ -3495,8 +3473,17 @@ static void reset_request( struct winhttp_request *request ) request->bytes_available = 0; request->bytes_read = 0; request->error = ERROR_SUCCESS; + request->logon_policy = 0; + request->disable_feature = 0; request->async = FALSE; + request->connect_timeout = 60000; + request->send_timeout = 30000; + request->receive_timeout = 30000; request->url_codepage = CP_UTF8; + heap_free( request->proxy.lpszProxy ); + request->proxy.lpszProxy = NULL; + heap_free( request->proxy.lpszProxyBypass ); + request->proxy.lpszProxyBypass = NULL; VariantClear( &request->data ); request->state = REQUEST_STATE_INITIALIZED; } @@ -3533,8 +3520,7 @@ static HRESULT WINAPI winhttp_request_Open( if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( GetLastError() ); EnterCriticalSection( &request->cs ); - if (request->state < REQUEST_STATE_INITIALIZED) initialize_request( request ); - else reset_request( request ); + reset_request( request ); if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) goto error; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); @@ -4008,8 +3994,6 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( GetLastError() ); } - request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); if (!request->async) { hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) ); @@ -4613,15 +4597,12 @@ HRESULT WinHttpRequest_create( void **obj ) TRACE("%p\n", obj); - if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; + if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; - request->state = REQUEST_STATE_UNINITIALIZED; - request->proxy.lpszProxy = NULL; - request->proxy.lpszProxyBypass = NULL; - request->url_codepage = CP_UTF8; InitializeCriticalSection( &request->cs ); request->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": winhttp_request.cs"); + initialize_request( request ); *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj); -- 2.11.0

1 0

[PATCH v2 1/4] winhttp: Use the thread pool for the connection collector.
by Hans Leidekker 26 Nov '18

26 Nov '18

v2: Use FreeLibraryWhenCallbackReturns. Thanks Jacek and Chip. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 61af6ea977..edfebac05c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1457,7 +1457,7 @@ void release_host( struct hostdata *host ) static BOOL connection_collector_running; -static DWORD WINAPI connection_collector(void *arg) +static void CALLBACK connection_collector( TP_CALLBACK_INSTANCE *instance, void *ctx ) { unsigned int remaining_connections; struct netconn *netconn, *next_netconn; @@ -1483,10 +1483,7 @@ static DWORD WINAPI connection_collector(void *arg) list_remove(&netconn->entry); netconn_close(netconn); } - else - { - remaining_connections++; - } + else remaining_connections++; } } @@ -1495,7 +1492,7 @@ static DWORD WINAPI connection_collector(void *arg) LeaveCriticalSection(&connection_pool_cs); } while(remaining_connections); - FreeLibraryAndExitThread( winhttp_instance, 0 ); + FreeLibraryWhenCallbackReturns( instance, winhttp_instance ); } static void cache_connection( struct netconn *netconn ) @@ -1510,20 +1507,11 @@ static void cache_connection( struct netconn *netconn ) if (!connection_collector_running) { HMODULE module; - HANDLE thread; - GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)winhttp_instance, &module ); + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)winhttp_instance, &module ); - thread = CreateThread(NULL, 0, connection_collector, NULL, 0, NULL); - if (thread) - { - CloseHandle( thread ); - connection_collector_running = TRUE; - } - else - { - FreeLibrary( winhttp_instance ); - } + if (TrySubmitThreadpoolCallback( connection_collector, NULL, NULL )) connection_collector_running = TRUE; + else FreeLibrary( winhttp_instance ); } LeaveCriticalSection( &connection_pool_cs ); -- 2.11.0

1 0

[PATCH 1/2] msi: Set stale function pointers to NULL
by Brendan McGrath 26 Nov '18

26 Nov '18

A crash occurs during install of dotnet35 on a 64-bit prefix as when msi_destroy_assembly_caches is called, the mscoree library is unloaded but the function pointers are not set back to NULL. The crash occurs within get_clr_version as pGetFileVersion ends up with a value that is neither NULL or valid. This patch sets the stale function pointers back to NULL. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- With this patch - a crash still occurs - but this time in PresentationFontCache.exe and the install of dotnet35 continues. dlls/msi/assembly.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 7857e8b687f1..f46ff02eeb65 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -36,7 +36,6 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); @@ -52,6 +51,7 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; + HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); @@ -121,6 +121,9 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; pCreateAssemblyCacheNet40 = NULL; + pGetFileVersion = NULL; + pCreateAssemblyNameObject = NULL; + pCreateAssemblyEnum = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 ); -- 2.17.1

2 3

[PATCH 1/4] shcore: Turn COM exports to stubs.
by Nikolay Sivov 26 Nov '18

26 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Shcore.dll does not take over shell32.dll registration, or objects it implements. dlls/shcore/shcore.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 0b20781635..dac4274e49 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -3,9 +3,9 @@ @ stub CreateRandomAccessStreamOnFile @ stub CreateRandomAccessStreamOverStream @ stub CreateStreamOverRandomAccessStream -@ stdcall -private DllCanUnloadNow() shell32.DllCanUnloadNow +@ stub DllCanUnloadNow @ stub DllGetActivationFactory -@ stdcall -private DllGetClassObject(ptr ptr ptr) shell32.DllGetClassObject +@ stub DllGetClassObject @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent -- 2.19.2

1 3

[PATCH] dwrite/tests: Add some tests for GetUnicodeRanges().
by Nikolay Sivov 26 Nov '18

26 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Tests are disabled on Wine for now. dlls/dwrite/tests/font.c | 356 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 355 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 86efb8cc05..f752afd08e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -396,6 +396,66 @@ struct WOFFHeader2 ULONG privLength; }; +struct cmap_encoding_record +{ + WORD platformID; + WORD encodingID; + DWORD offset; +}; + +struct cmap_header +{ + WORD version; + WORD numTables; + struct cmap_encoding_record tables[1]; +}; + +struct cmap_segmented_coverage_group +{ + DWORD startCharCode; + DWORD endCharCode; + DWORD startGlyphID; +}; + +struct cmap_segmented_coverage +{ + WORD format; + WORD reserved; + DWORD length; + DWORD language; + DWORD nGroups; + struct cmap_segmented_coverage_group groups[1]; +}; + +struct cmap_segmented_mapping_0 +{ + WORD format; + WORD length; + WORD language; + WORD segCountX2; + WORD searchRange; + WORD entrySelector; + WORD rangeShift; + WORD endCode[1]; +}; + +enum opentype_cmap_table_platform +{ + OPENTYPE_CMAP_TABLE_PLATFORM_WIN = 3, +}; + +enum opentype_cmap_table_encoding +{ + OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_BMP = 1, + OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_FULL = 10, +}; + +enum opentype_cmap_table_format +{ + OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING = 4, + OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE = 12, +}; + #include "poppack.h" static void *create_factory_iid(REFIID riid) @@ -3318,14 +3378,220 @@ static void test_shared_isolated(void) ok(ref == 0, "factory not released, %u\n", ref); } +struct dwrite_fonttable +{ + BYTE *data; + void *context; + UINT32 size; +}; + +static WORD table_read_be_word(const struct dwrite_fonttable *table, void *ptr, DWORD offset) +{ + if (!ptr) + ptr = table->data; + + if ((BYTE *)ptr < table->data || (BYTE *)ptr - table->data >= table->size) + return 0; + + if (offset > table->size - sizeof(WORD)) + return 0; + + return GET_BE_WORD(*(WORD *)((BYTE *)ptr + offset)); +} + +static DWORD table_read_be_dword(const struct dwrite_fonttable *table, void *ptr, DWORD offset) +{ + if (!ptr) + ptr = table->data; + + if ((BYTE *)ptr < table->data || (BYTE *)ptr - table->data >= table->size) + return 0; + + if (offset > table->size - sizeof(WORD)) + return 0; + + return GET_BE_DWORD(*(DWORD *)((BYTE *)ptr + offset)); +} + +static void array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return; + + *elements = new_elements; + *capacity = new_capacity; +} + +static void opentype_cmap_read_table(const struct dwrite_fonttable *table, UINT16 cmap_index, UINT32 *count, + size_t *capacity, DWRITE_UNICODE_RANGE **ranges) +{ + const BYTE *tables = table->data + FIELD_OFFSET(struct cmap_header, tables); + struct cmap_encoding_record *record; + DWORD table_offset; + WORD format; + int j; + + record = (struct cmap_encoding_record *)(tables + cmap_index * sizeof(*record)); + + if (!(table_offset = table_read_be_dword(table, record, FIELD_OFFSET(struct cmap_encoding_record, offset)))) + return; + + format = table_read_be_word(table, NULL, table_offset); + switch (format) + { + case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: + { + UINT16 segment_count = table_read_be_word(table, NULL, table_offset + + FIELD_OFFSET(struct cmap_segmented_mapping_0, segCountX2)) / 2; + DWORD start_code_offset = table_offset + sizeof(struct cmap_segmented_mapping_0) + + sizeof(WORD) * segment_count; + + for (j = 0; j < segment_count; ++j) { + WORD endcode = table_read_be_word(table, NULL, table_offset + + FIELD_OFFSET(struct cmap_segmented_mapping_0, endCode) + j * sizeof(WORD)); + WORD first; + + if (endcode == 0xffff) + break; + + first = table_read_be_word(table, NULL, start_code_offset + j * sizeof(WORD)); + + array_reserve((void **)ranges, capacity, *count + 1, sizeof(**ranges)); + (*ranges)[*count].first = first; + (*ranges)[*count].last = endcode; + (*count)++; + } + break; + } + case OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE: + { + DWORD num_groups = table_read_be_dword(table, NULL, table_offset + + FIELD_OFFSET(struct cmap_segmented_coverage, nGroups)); + + for (j = 0; j < num_groups; ++j) { + DWORD group_offset = table_offset + FIELD_OFFSET(struct cmap_segmented_coverage, groups) + + j * sizeof(struct cmap_segmented_coverage_group); + DWORD first = table_read_be_dword(table, NULL, group_offset + + FIELD_OFFSET(struct cmap_segmented_coverage_group, startCharCode)); + DWORD last = table_read_be_dword(table, NULL, group_offset + + FIELD_OFFSET(struct cmap_segmented_coverage_group, endCharCode)); + + array_reserve((void **)ranges, capacity, *count + 1, sizeof(**ranges)); + (*ranges)[*count].first = first; + (*ranges)[*count].last = last; + (*count)++; + } + break; + } + default: + ok(0, "%u table format %#x unhandled.\n", cmap_index, format); + } +} + +static UINT32 opentype_cmap_get_unicode_ranges(const struct dwrite_fonttable *table, DWRITE_UNICODE_RANGE **ranges) +{ + int index_full = -1, index_bmp = -1; + unsigned int i, count = 0; + size_t capacity = 0; + const BYTE *tables; + WORD num_tables; + + *ranges = NULL; + + num_tables = table_read_be_word(table, 0, FIELD_OFFSET(struct cmap_header, numTables)); + tables = table->data + FIELD_OFFSET(struct cmap_header, tables); + + for (i = 0; i < num_tables; ++i) + { + struct cmap_encoding_record *record = (struct cmap_encoding_record *)(tables + i * sizeof(*record)); + WORD platform, encoding; + + platform = table_read_be_word(table, record, FIELD_OFFSET(struct cmap_encoding_record, platformID)); + encoding = table_read_be_word(table, record, FIELD_OFFSET(struct cmap_encoding_record, encodingID)); + + if (platform == OPENTYPE_CMAP_TABLE_PLATFORM_WIN) + { + if (encoding == OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_FULL) + { + index_full = i; + break; + } + else if (encoding == OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_BMP) + index_bmp = i; + } + } + + if (index_full != -1) + opentype_cmap_read_table(table, index_full, &count, &capacity, ranges); + else if (index_bmp != -1) + opentype_cmap_read_table(table, index_bmp, &count, &capacity, ranges); + + return count; +} + +static UINT32 fontface_get_expected_unicode_ranges(IDWriteFontFace1 *fontface, DWRITE_UNICODE_RANGE **out) +{ + struct dwrite_fonttable cmap; + DWRITE_UNICODE_RANGE *ranges; + UINT32 i, j, count; + BOOL exists; + HRESULT hr; + + *out = NULL; + + hr = IDWriteFontFace1_TryGetFontTable(fontface, MS_CMAP_TAG, (const void **)&cmap.data, + &cmap.size, &cmap.context, &exists); + if (FAILED(hr) || !exists) + return 0; + + count = opentype_cmap_get_unicode_ranges(&cmap, &ranges); + IDWriteFontFace1_ReleaseFontTable(fontface, cmap.context); + + *out = heap_alloc(count * sizeof(**out)); + + /* Eliminate duplicates and merge ranges together. */ + for (i = 0, j = 0; i < count; ++i) { + if (j) { + DWRITE_UNICODE_RANGE *prev = &(*out)[j-1]; + /* Merge adjacent ranges. */ + if (ranges[i].first == prev->last + 1) { + prev->last = ranges[i].last; + continue; + } + } + (*out)[j++] = ranges[i]; + } + + heap_free(ranges); + + return j; +} + static void test_GetUnicodeRanges(void) { + IDWriteFontCollection *syscollection; DWRITE_UNICODE_RANGE *ranges, r; IDWriteFontFile *ffile = NULL; IDWriteFontFace1 *fontface1; IDWriteFontFace *fontface; IDWriteFactory *factory; - UINT32 count; + UINT32 count, i; HRESULT hr; HRSRC font; ULONG ref; @@ -3383,6 +3649,94 @@ static void test_GetUnicodeRanges(void) ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFace1_Release(fontface1); + +if (strcmp(winetest_platform, "wine")) { + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); + + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + WCHAR familynameW[256], facenameW[128]; + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 j, k, fontcount; + IDWriteFont *font; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "Failed to get font family, hr %#x.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get family names, hr %#x.\n", hr); + + get_enus_string(names, familynameW, ARRAY_SIZE(familynameW)); + IDWriteLocalizedStrings_Release(names); + + fontcount = IDWriteFontFamily_GetFontCount(family); + for (j = 0; j < fontcount; j++) { + DWRITE_UNICODE_RANGE *expected_ranges = NULL; + UINT32 range_count, expected_count; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + hr = IDWriteFont_GetFaceNames(font, &names); + ok(hr == S_OK, "Failed to get face names, hr %#x.\n", hr); + IDWriteFont_Release(font); + + get_enus_string(names, facenameW, ARRAY_SIZE(facenameW)); + + IDWriteLocalizedStrings_Release(names); + + if (IDWriteFontFace_IsSymbolFont(fontface)) { + skip("Skipping for symbol font %s %s.\n", wine_dbgstr_w(familynameW), wine_dbgstr_w(facenameW)); + IDWriteFontFace_Release(fontface); + continue; + } + + IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1); + + hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, 0, NULL, &range_count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + + ranges = heap_alloc(range_count * sizeof(*ranges)); + + hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, range_count, ranges, &range_count); + ok(hr == S_OK, "Failed to get ranges, hr %#x.\n", hr); + + expected_count = fontface_get_expected_unicode_ranges(fontface1, &expected_ranges); + ok(expected_count == range_count, "%s - %s: unexpected range count %u, expected %u.\n", + wine_dbgstr_w(familynameW), wine_dbgstr_w(facenameW), range_count, expected_count); + + if (expected_count == range_count) { + if (memcmp(expected_ranges, ranges, expected_count * sizeof(*ranges))) { + for (k = 0; k < expected_count; ++k) { + BOOL failed = memcmp(&expected_ranges[k], &ranges[k], sizeof(*ranges)); + ok(!failed, "%u: %s - %s mismatching range [%#x, %#x] vs [%#x, %#x].\n", k, + wine_dbgstr_w(familynameW), wine_dbgstr_w(facenameW), ranges[k].first, ranges[k].last, + expected_ranges[k].first, expected_ranges[k].last); + if (failed) + break; + } + } + } + + heap_free(expected_ranges); + heap_free(ranges); + + IDWriteFontFace1_Release(fontface1); + IDWriteFontFace_Release(fontface); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(syscollection); +} ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); } -- 2.19.2

1 0

[PATCH 1/5] [DBGHELP 1/5] use correct record in codeview_snarf_public.
by Andreas Maier 26 Nov '18

26 Nov '18

Use public_vx iststead of data_vx for public symbols. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/dbghelp/msc.c | 18 +++++++++--------- include/wine/mscvpdb.h | 10 ++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 493c440ea7..ae51884abc 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2067,29 +2067,29 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY switch (sym->generic.id) { - case S_PUB_V1: /* FIXME is this really a 'data_v1' structure ?? */ + case S_PUB_V1: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - terminate_string(&sym->data_v1.p_name), - codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset), 1); + terminate_string(&sym->public_v1.p_name), + codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1); } break; - case S_PUB_V2: /* FIXME is this really a 'data_v2' structure ?? */ + case S_PUB_V2: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - terminate_string(&sym->data_v2.p_name), - codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset), 1); + terminate_string(&sym->public_v2.p_name), + codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1); } - break; + break; case S_PUB_V3: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - sym->data_v3.name, - codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1); + sym->public_v3.name, + codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1); } break; case S_PUB_FUNC1_V3: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 2f0b47998f..7a4a69beb9 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1352,6 +1352,16 @@ union codeview_symbol { short int len; short int id; + unsigned int offset; + unsigned short segment; + unsigned short symtype; + struct p_string p_name; + } public_v1; + + struct + { + short int len; + short int id; unsigned int symtype; unsigned int offset; unsigned short segment; -- 2.11.0

2 5

[PATCH v4 1/3] setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Zebediah Figura 26 Nov '18

26 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f482..b24480ce1a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); } -- 2.14.1

1 2

[PATCH 3/3] comsvcs: Add initial tests
by Alistair Leslie-Hughes 26 Nov '18

26 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/comsvcs/tests/Makefile.in | 5 + dlls/comsvcs/tests/dispenser.c | 250 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 257 insertions(+) create mode 100644 dlls/comsvcs/tests/Makefile.in create mode 100644 dlls/comsvcs/tests/dispenser.c diff --git a/configure b/configure index 3c235e3..7384978 100755 --- a/configure +++ b/configure @@ -19255,6 +19255,7 @@ wine_fn_config_makefile dlls/commdlg.dll16 enable_win16 wine_fn_config_makefile dlls/compobj.dll16 enable_win16 wine_fn_config_makefile dlls/compstui enable_compstui wine_fn_config_makefile dlls/comsvcs enable_comsvcs +wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 wine_fn_config_makefile dlls/connect enable_connect wine_fn_config_makefile dlls/credui enable_credui diff --git a/configure.ac b/configure.ac index 294fe4b..a6b7916 100644 --- a/configure.ac +++ b/configure.ac @@ -3110,6 +3110,7 @@ WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compstui) WINE_CONFIG_MAKEFILE(dlls/comsvcs) +WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) WINE_CONFIG_MAKEFILE(dlls/connect) WINE_CONFIG_MAKEFILE(dlls/credui) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in new file mode 100644 index 0000000..c89c193 --- /dev/null +++ b/dlls/comsvcs/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = comsvcs.dll +IMPORTS = ole32 uuid oleaut32 + +C_SRCS = \ + dispenser.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c new file mode 100644 index 0000000..86a947e --- /dev/null +++ b/dlls/comsvcs/tests/dispenser.c @@ -0,0 +1,250 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "comsvcs.h" + +#include "wine/test.h" + +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + trace(#func "\n"); \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +DEFINE_EXPECT(driver_CreateResource); +DEFINE_EXPECT(driver_DestroyResource); +DEFINE_EXPECT(driver_ResetResource); +DEFINE_EXPECT(driver_Release); + +HRESULT driver_DestroyResource_ret = S_OK; + +static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid, void **object) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispenserDriver)) + { + *object = iface; + + return S_OK; + } + + ok(0, "Unknown iterface %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI driver_AddRef(IDispenserDriver *iface) +{ + trace("AddRef\n"); + return 2; +} + +static ULONG WINAPI driver_Release(IDispenserDriver *iface) +{ + CHECK_EXPECT2(driver_Release); + return 1; +} + +static HRESULT WINAPI driver_CreateResource(IDispenserDriver *iface, const RESTYPID restypid, RESID *resid, TIMEINSECS *destroy) +{ + CHECK_EXPECT2(driver_CreateResource); + + *resid = 10; + return S_OK; +} + +static HRESULT WINAPI driver_RateResource(IDispenserDriver *iface, const RESTYPID restypid, const RESID resid, + const BOOL requires, RESOURCERATING *rating) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_EnlistResource(IDispenserDriver *iface, const RESID resid, const TRANSID transid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_ResetResource(IDispenserDriver *iface, const RESID resid) +{ + CHECK_EXPECT2(driver_ResetResource); + ok((int)resid == 10, "RESID %d\n", (int)resid); + return S_OK; +} + +static HRESULT WINAPI driver_DestroyResource(IDispenserDriver *iface, const RESID resid) +{ + todo_wine CHECK_EXPECT2(driver_DestroyResource); + return driver_DestroyResource_ret; +} + +static HRESULT WINAPI driver_DestroyResourceS(IDispenserDriver *iface, const SRESID resid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + + +static const struct IDispenserDriverVtbl driver_vtbl = +{ + driver_QueryInterface, + driver_AddRef, + driver_Release, + driver_CreateResource, + driver_RateResource, + driver_EnlistResource, + driver_ResetResource, + driver_DestroyResource, + driver_DestroyResourceS +}; + +static IDispenserDriver DispenserDriver = { &driver_vtbl }; + +static void create_dispenser(void) +{ + static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; + static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0}; + static const WCHAR data[] = {'d','a','t','a','1',0}; + HRESULT hr; + IDispenserManager *dispenser = NULL; + IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + RESID resid; + BSTR str; + + hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("DispenserManager not available\n"); + return; + } + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(holder1 != holder2, "same holder object returned\n"); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool1, &holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if(holder1) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder1, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + + IHolder_Release(holder1); + } + if(holder2) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder2, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + /* DestroyResource return doesn't directly affect the Holder Close return value */ + driver_DestroyResource_ret = E_FAIL; + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + driver_DestroyResource_ret = S_OK; + IHolder_Release(holder2); + } + if(holder3) + { + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + IHolder_Release(holder3); + } + + IDispenserManager_Release(dispenser); +} + + +START_TEST(dispenser) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok( hr == S_OK, "failed to init com\n"); + if (hr != S_OK) + return; + + create_dispenser(); + + CoUninitialize(); +} -- 1.9.1

2 1

[PATCH 2/3] comsvcs: Implement IHolder Alloc/Free Resource
by Alistair Leslie-Hughes 26 Nov '18

26 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 21bdd67..d7831cf 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -107,19 +107,29 @@ static ULONG WINAPI holder_Release(IHolder *iface) static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; + TIMEINSECS secs; - FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + TRACE("(%p)->(%08lx, %p) stub\n", This, typeid, resid); - return E_NOTIMPL; + hr = IDispenserDriver_CreateResource(This->driver, typeid, resid, &secs); + + TRACE("<- 0x%08x\n", hr); + return hr; } static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; - FIXME("(%p)->(%08lx) stub\n", This, resid); + TRACE("(%p)->(%08lx) stub\n", This, resid); - return E_NOTIMPL; + hr = IDispenserDriver_DestroyResource(This->driver, resid); + + TRACE("<- 0x%08x\n", hr); + + return hr; } static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) -- 1.9.1

1 0

[PATCH 1/3] comsvcs: Implement IDispenserManager RegisterDispenser
by Alistair Leslie-Hughes 26 Nov '18

26 Nov '18

The Document states the caller of RegisterDispenser is responsible for calling AddRef on the driver and that Release will called on Holder_Close. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/main.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 6b7ec14..21bdd67 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -43,11 +43,180 @@ typedef struct dispensermanager } dispensermanager; +typedef struct holder +{ + IHolder IHolder_iface; + LONG ref; + + IDispenserDriver *driver; +} holder; + static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) { return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); } +static inline holder *impl_from_IHolder(IHolder *iface) +{ + return CONTAINING_RECORD(iface, holder, IHolder_iface); +} + +static HRESULT WINAPI holder_QueryInterface(IHolder *iface, REFIID riid, void **object) +{ + holder *This = impl_from_IHolder(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IHolder)) + { + *object = &This->IHolder_iface; + IUnknown_AddRef( (IUnknown*)*object); + + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),object); + return E_NOINTERFACE; +} + +static ULONG WINAPI holder_AddRef(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI holder_Release(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResourceS(IHolder *iface, const SRESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(resid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResource(IHolder *iface, const RESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %d) stub\n", This, resid, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResourceS(IHolder *iface, const SRESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(resid), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_Close(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p) stub\n", This); + + IDispenserDriver_Release(This->driver); + + return S_OK; +} + +static HRESULT WINAPI holder_RequestDestroyResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +struct IHolderVtbl holder_vtbl = +{ + holder_QueryInterface, + holder_AddRef, + holder_Release, + holder_AllocResource, + holder_FreeResource, + holder_TrackResource, + holder_TrackResourceS, + holder_UntrackResource, + holder_UntrackResourceS, + holder_Close, + holder_RequestDestroyResource +}; + +static HRESULT create_holder(IDispenserDriver *driver, IHolder **object) +{ + holder *hold; + HRESULT ret; + + TRACE("(%p)\n", object); + + hold = heap_alloc(sizeof(*hold)); + if (!hold) + { + *object = NULL; + return E_OUTOFMEMORY; + } + + hold->IHolder_iface.lpVtbl = &holder_vtbl; + hold->ref = 1; + hold->driver = driver; + + ret = holder_QueryInterface(&hold->IHolder_iface, &IID_IHolder, (void**)object); + holder_Release(&hold->IHolder_iface); + + return ret; +} + static HRESULT WINAPI dismanager_QueryInterface(IDispenserManager *iface, REFIID riid, void **object) { dispensermanager *This = impl_from_IDispenserManager(iface); @@ -95,10 +264,18 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi LPCOLESTR name, IHolder **dispenser) { dispensermanager *This = impl_from_IDispenserManager(iface); + HRESULT hr; - FIXME("(%p)->(%p, %s, %p) stub\n", This, driver, debugstr_w(name), dispenser); + TRACE("(%p)->(%p, %s, %p)\n", This, driver, debugstr_w(name), dispenser); - return E_NOTIMPL; + if(!dispenser) + return E_INVALIDARG; + + hr = create_holder(driver, dispenser); + + TRACE("<-- 0x%08x, %p\n", hr, *dispenser); + + return hr; } static HRESULT WINAPI dismanager_GetContext(IDispenserManager *iface, INSTID *id, TRANSID *transid) -- 1.9.1

1 0

[PATCH v3 1/3] setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Zebediah Figura 26 Nov '18

26 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f482..b24480ce1a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); } -- 2.14.1

2 4

[PATCH v2 1/3] setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Zebediah Figura 26 Nov '18

26 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f482..b24480ce1a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); } -- 2.14.1

2 4

[PATCH 1/4] dbghelp: Avoid using inline assembly in do_x86cpuid().
by Zebediah Figura 26 Nov '18

26 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/minidump.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 975bb45c9a..6829a700ac 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -542,20 +542,27 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +extern void do_x86cpuid(unsigned int ax, unsigned int *p); + +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_x86cpuid, + "pushl %edi\n\t" + "pushl %ebx\n\t" + "movl 4(%esp),%eax\n\t" + "movl 8(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %edi\n\t" + "ret" ); +#else +void do_x86cpuid(unsigned int ax, unsigned int *p) { -#if defined(__GNUC__) && defined(__i386__) - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif } +#endif /* From xf86info havecpuid.c 1.11 */ static inline int have_x86cpuid(void) -- 2.14.1

3 9

[PATCH 1/3] setupapi/tests: Remove workarounds in testSetupDiGetINFClassA().
by Zebediah Figura 26 Nov '18

26 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 55 ++++++++++--------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c58e35f482..b24480ce1a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,7 +37,6 @@ static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); -static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -52,7 +51,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiGetINFClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetINFClassA"); } static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) @@ -1157,7 +1155,7 @@ todo_wine } } -static void testSetupDiGetINFClassA(void) +static void test_get_inf_class(void) { static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; @@ -1171,19 +1169,7 @@ static void testSetupDiGetINFClassA(void) HANDLE h; int i; - if(!pSetupDiGetINFClassA) - { - win_skip("SetupDiGetINFClassA not present\n"); - return; - } - - count = GetTempPathA(MAX_PATH, filename); - if(!count) - { - win_skip("GetTempPathA failed\n"); - return; - } - + GetTempPathA(MAX_PATH, filename); strcat(filename, inffile); DeleteFileA(filename); @@ -1191,11 +1177,6 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - if (ERROR_CALL_NOT_IMPLEMENTED == GetLastError()) - { - skip("SetupDiGetINFClassA is not implemented\n"); - return; - } ok(ERROR_FILE_NOT_FOUND == GetLastError(), "expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); @@ -1227,12 +1208,8 @@ static void testSetupDiGetINFClassA(void) /* test file content */ h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1242,13 +1219,9 @@ static void testSetupDiGetINFClassA(void) trace("testing signature %s\n", signatures[i]); h = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(h == INVALID_HANDLE_VALUE) - { - win_skip("failed to create file %s (error %u)\n", filename, GetLastError()); - return; - } - WriteFile( h, content, sizeof(content), &count, NULL); - CloseHandle( h); + ok(h != INVALID_HANDLE_VALUE, "Failed to create file, error %#x.\n", GetLastError()); + WriteFile(h, content, sizeof(content), &count, NULL); + CloseHandle(h); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); @@ -1300,10 +1273,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, 0, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_INVALID_PARAMETER /* 2k3+ */, + "Got unexpected error %#x.\n", GetLastError()); DeleteFileA(filename); @@ -1313,10 +1284,8 @@ static void testSetupDiGetINFClassA(void) SetLastError(0xdeadbeef); retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(!retval, "expected SetupDiGetINFClassA to fail!\n"); - ok(RPC_S_INVALID_STRING_UUID == GetLastError() || - ERROR_INVALID_PARAMETER == GetLastError(), - "expected error RPC_S_INVALID_STRING_UUID or ERROR_INVALID_PARAMETER, " - "got %u\n", GetLastError()); + ok(GetLastError() == RPC_S_INVALID_STRING_UUID || GetLastError() == ERROR_INVALID_PARAMETER /* 7+ */, + "Got unexpected error %#x.\n", GetLastError()); /* network adapter guid */ WritePrivateProfileStringA("Version", "ClassGUID", @@ -1440,7 +1409,7 @@ START_TEST(devinst) test_register_device_iface(); test_registry_property_a(); test_registry_property_w(); - testSetupDiGetINFClassA(); + test_get_inf_class(); test_devnode(); test_device_interface_key(); } -- 2.14.1

2 4

[PATCH 5/5] kernelbase: Implement PathCchAppend.
by Zhiyi Zhang 26 Nov '18

26 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 7 +++ dlls/kernelbase/tests/path.c | 50 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 796b57f457..4f375e0c30 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -3,7 +3,7 @@ @ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx @ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension -@ stub PathCchAppend +@ stdcall PathCchAppend(wstr long wstr) kernelbase.PathCchAppend @ stdcall PathCchAppendEx(wstr long wstr long) kernelbase.PathCchAppendEx @ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 04023e31b6..d1bff9fec5 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1032,7 +1032,7 @@ @ stdcall PathCchAddBackslash(wstr long) @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) @ stdcall PathCchAddExtension(wstr long wstr) -# @ stub PathCchAppend +@ stdcall PathCchAppend(wstr long wstr) @ stdcall PathCchAppendEx(wstr long wstr long) @ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index c5817e26fd..bcd129cce9 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -446,6 +446,13 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens return S_OK; } +HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2) +{ + TRACE("%s %lu %s\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2)); + + return PathCchAppendEx(path1, size, path2, PATHCCH_NONE); +} + HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags) { HRESULT hr; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 0b9b8683da..7b24f00178 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -35,6 +35,7 @@ HRESULT (WINAPI *pPathAllocCombine)(const WCHAR *path1, const WCHAR *path2, DWOR HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchAppend)(WCHAR *path1, SIZE_T size, const WCHAR *path2); HRESULT (WINAPI *pPathCchAppendEx)(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchCanonicalize)(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT (WINAPI *pPathCchCanonicalizeEx)(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); @@ -855,6 +856,53 @@ static const struct append_test append_tests[] = {"a", "b", "a\\b"} }; +static void test_PathCchAppend(void) +{ + WCHAR path1W[PATHCCH_MAX_CCH]; + WCHAR path2W[PATHCCH_MAX_CCH]; + CHAR path1A[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathCchAppend) + { + win_skip("PathCchAppend() is not available.\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, "\\a", -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathCchAppend(NULL, PATHCCH_MAX_CCH, path2W); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAppend(path1W, 0, path2W); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAppend(path1W, PATHCCH_MAX_CCH + 1, path2W); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAppend(path1W, PATHCCH_MAX_CCH, NULL); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + WideCharToMultiByte(CP_ACP, 0, path1W, -1, path1A, ARRAY_SIZE(path1A), NULL, NULL); + ok(!lstrcmpA(path1A, "\\a"), "expect \\a, got %s\n", path1A); + + for (i = 0; i < ARRAY_SIZE(append_tests); i++) + { + const struct append_test *t = append_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path1, -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, t->path2, -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathCchAppend(path1W, PATHCCH_MAX_CCH, path2W); + ok(hr == S_OK, "append \"%s\" \"%s\" expect hr %#x, got %#x\n", t->path1, t->path2, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path1W, -1, path1A, ARRAY_SIZE(path1A), NULL, NULL); + ok(!lstrcmpA(path1A, t->result), "append \"%s\" \"%s\" expect result \"%s\", got \"%s\"\n", t->path1, + t->path2, t->result, path1A); + } + } +} + static void test_PathCchAppendEx(void) { WCHAR path1W[PATHCCH_MAX_CCH]; @@ -2230,6 +2278,7 @@ START_TEST(path) pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); + pPathCchAppend = (void *)GetProcAddress(hmod, "PathCchAppend"); pPathCchAppendEx = (void *)GetProcAddress(hmod, "PathCchAppendEx"); pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); @@ -2252,6 +2301,7 @@ START_TEST(path) test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); + test_PathCchAppend(); test_PathCchAppendEx(); test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); diff --git a/include/pathcch.h b/include/pathcch.h index 18f065c4c6..0c2dc63c41 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,6 +31,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2); HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); -- 2.19.1

1 0

[PATCH 4/5] kernelbase: Implement PathCchAppendEx.
by Zhiyi Zhang 26 Nov '18

26 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 25 ++++ dlls/kernelbase/tests/path.c | 123 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 151 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index a722f24443..796b57f457 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -4,7 +4,7 @@ @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx @ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension @ stub PathCchAppend -@ stub PathCchAppendEx +@ stdcall PathCchAppendEx(wstr long wstr long) kernelbase.PathCchAppendEx @ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx @ stdcall PathCchCombine(ptr long wstr wstr) kernelbase.PathCchCombine diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index bad32e8db4..04023e31b6 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1033,7 +1033,7 @@ @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) @ stdcall PathCchAddExtension(wstr long wstr) # @ stub PathCchAppend -# @ stub PathCchAppendEx +@ stdcall PathCchAppendEx(wstr long wstr long) @ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) @ stdcall PathCchCombine(ptr long wstr wstr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index a9186a1156..c5817e26fd 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -446,6 +446,31 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens return S_OK; } +HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags) +{ + HRESULT hr; + WCHAR *result; + + TRACE("%s %lu %s %#x\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2), flags); + + if (!path1 || !size) return E_INVALIDARG; + + /* Create a temporary buffer for result because we need to keep path1 unchanged if error occurs. + * And PathCchCombineEx writes empty result if there is error so we can't just use path1 as output + * buffer for PathCchCombineEx */ + result = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!result) return E_OUTOFMEMORY; + + /* Avoid the single backslash behavior with PathCchCombineEx when appending */ + if (path2 && path2[0] == '\\' && path2[1] != '\\') path2++; + + hr = PathCchCombineEx(result, size, path1, path2, flags); + if (SUCCEEDED(hr)) memcpy(path1, result, size * sizeof(WCHAR)); + + HeapFree(GetProcessHeap(), 0, result); + return hr; +} + HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in) { TRACE("%p %lu %s\n", out, size, wine_dbgstr_w(in)); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 30528b7768..0b9b8683da 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -35,6 +35,7 @@ HRESULT (WINAPI *pPathAllocCombine)(const WCHAR *path1, const WCHAR *path2, DWOR HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchAppendEx)(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchCanonicalize)(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT (WINAPI *pPathCchCanonicalizeEx)(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); HRESULT (WINAPI *pPathCchCombine)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); @@ -786,6 +787,126 @@ static const struct addextension_test addextension_tests[] = {"C:\\1.exe", " ", NULL, E_INVALIDARG} }; +struct append_test +{ + const CHAR *path1; + const CHAR *path2; + const CHAR *result; +}; + +static const struct append_test append_tests[] = +{ + /* normal paths */ + {"C:\\", "a", "C:\\a"}, + {"C:\\b", "..\\a", "C:\\a"}, + {"C:", "a", "C:\\a"}, + {"C:\\", ".", "C:\\"}, + {"C:\\", "..", "C:\\"}, + {"C:\\a", "", "C:\\a"}, + + /* normal UNC paths */ + {"\\\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a"}, + {"\\\\192.168.1.1\\test", "..", "\\\\192.168.1.1"}, + {"\\a", "b", "\\a\\b"}, + {"\\", "a", "\\a"}, + {"\\\\", "a", "\\\\a"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a"}, + + /* NT paths */ + {"\\\\?\\C:\\", "a", "C:\\a"}, + {"\\\\?\\C:\\", "..", "C:\\"}, + {"\\\\?\\C:", "a", "C:\\a"}, + + /* NT UNC path */ + {"\\\\?\\UNC\\", "a", "\\\\a"}, + {"\\\\?\\UNC\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a"}, + {"\\\\?\\UNC\\192.168.1.1\\test", "..", "\\\\192.168.1.1"}, + + /* Second path begins with a single backslash */ + {"C:a\\b", "\\1", "C:a\\b\\1"}, + {"C:\\a\\b", "\\1", "C:\\a\\b\\1"}, + {"\\a\\b", "\\1", "\\a\\b\\1"}, + {"\\\\a\\b", "\\1", "\\\\a\\b\\1"}, + {"\\\\a\\b\\c", "\\1", "\\\\a\\b\\c\\1"}, + {"\\\\?\\UNC\\a", "\\1", "\\\\a\\1"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", "\\1", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a\\1"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", "\\1", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\1"}, + {"C:\\a\\b", "\\", "C:\\a\\b"}, + + /* Second path is fully qualified */ + {"X:\\", "C:", "C:\\"}, + {"X:\\", "C:\\", "C:\\"}, + {"X:\\", "\\\\", "\\\\"}, + {"X:\\", "\\\\?\\C:", "C:\\"}, + {"X:\\", "\\\\?\\C:\\", "C:\\"}, + {"X:\\", "\\\\?\\UNC\\", "\\\\"}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, + + /* Canonicalization */ + {"C:\\a", ".\\b", "C:\\a\\b"}, + {"C:\\a", "..\\b", "C:\\b"}, + + /* Other */ + {"", "", "\\"}, + {"a", "b", "a\\b"} +}; + +static void test_PathCchAppendEx(void) +{ + WCHAR path1W[PATHCCH_MAX_CCH]; + WCHAR path2W[PATHCCH_MAX_CCH]; + CHAR path1A[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathCchAppendEx) + { + win_skip("PathCchAppendEx() is not available.\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, "\\a", -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathCchAppendEx(NULL, ARRAY_SIZE(path1W), path2W, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAppendEx(path1W, 0, path2W, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(path1W[0] == '\\', "expect path1 unchanged\n"); + + hr = pPathCchAppendEx(path1W, PATHCCH_MAX_CCH + 1, path2W, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(path1W[0] == '\\', "expect path1 unchanged\n"); + + hr = pPathCchAppendEx(path1W, ARRAY_SIZE(path1W), NULL, 0); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + WideCharToMultiByte(CP_ACP, 0, path1W, -1, path1A, ARRAY_SIZE(path1A), NULL, NULL); + ok(!lstrcmpA(path1A, "\\a"), "expect \\a, got %s\n", path1A); + + hr = pPathCchAppendEx(path1W, PATHCCH_MAX_CCH, path2W, 0); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(append_tests); i++) + { + const struct append_test *t = append_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path1, -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, t->path2, -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathCchAppendEx(path1W, PATHCCH_MAX_CCH, path2W, 0); + ok(hr == S_OK, "append \"%s\" \"%s\" expect hr %#x, got %#x\n", t->path1, t->path2, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path1W, -1, path1A, ARRAY_SIZE(path1A), NULL, NULL); + ok(!lstrcmpA(path1A, t->result), "append \"%s\" \"%s\" expect result \"%s\", got \"%s\"\n", t->path1, + t->path2, t->result, path1A); + } + } +} + static void test_PathCchAddExtension(void) { WCHAR pathW[PATHCCH_MAX_CCH + 1]; @@ -2109,6 +2230,7 @@ START_TEST(path) pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); + pPathCchAppendEx = (void *)GetProcAddress(hmod, "PathCchAppendEx"); pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); pPathCchCombine = (void *)GetProcAddress(hmod, "PathCchCombine"); @@ -2130,6 +2252,7 @@ START_TEST(path) test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); + test_PathCchAppendEx(); test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); test_PathCchCombine(); diff --git a/include/pathcch.h b/include/pathcch.h index 205d4a23a3..18f065c4c6 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,6 +31,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); -- 2.19.1

1 0

[PATCH 3/5] kernelbase: Implement PathCchCombine.
by Zhiyi Zhang 26 Nov '18

26 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 7 ++ dlls/kernelbase/tests/path.c | 64 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index dfa7b81ba0..a722f24443 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -7,7 +7,7 @@ @ stub PathCchAppendEx @ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx -@ stub PathCchCombine +@ stdcall PathCchCombine(ptr long wstr wstr) kernelbase.PathCchCombine @ stdcall PathCchCombineEx(ptr long wstr wstr long) kernelbase.PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stdcall PathCchIsRoot(wstr) kernelbase.PathCchIsRoot diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9040633324..bad32e8db4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1036,7 +1036,7 @@ # @ stub PathCchAppendEx @ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) -# @ stub PathCchCombine +@ stdcall PathCchCombine(ptr long wstr wstr) @ stdcall PathCchCombineEx(ptr long wstr wstr long) @ stdcall PathCchFindExtension(wstr long ptr) @ stdcall PathCchIsRoot(wstr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 92a747bd0b..a9186a1156 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -496,6 +496,13 @@ HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, D return hr; } +HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2) +{ + TRACE("%p %s %s\n", out, wine_dbgstr_w(path1), wine_dbgstr_w(path2)); + + return PathCchCombineEx(out, size, path1, path2, PATHCCH_NONE); +} + HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags) { HRESULT hr; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 4061988fb1..30528b7768 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -37,6 +37,7 @@ HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT (WINAPI *pPathCchCanonicalize)(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT (WINAPI *pPathCchCanonicalizeEx)(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); +HRESULT (WINAPI *pPathCchCombine)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL (WINAPI *pPathCchIsRoot)(const WCHAR *path); @@ -474,6 +475,67 @@ static void test_PathAllocCombine(void) } } +static void test_PathCchCombine(void) +{ + WCHAR expected[PATHCCH_MAX_CCH] = {'C', ':', '\\', 'a', 0}; + WCHAR p1[PATHCCH_MAX_CCH] = {'C', ':', '\\', 0}; + WCHAR p2[PATHCCH_MAX_CCH] = {'a', 0}; + WCHAR output[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathCchCombine) + { + win_skip("PathCchCombine() is not available.\n"); + return; + } + + hr = pPathCchCombine(output, 5, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = pPathCchCombine(NULL, 2, p1, p2); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + memset(output, 0xff, sizeof(output)); + hr = pPathCchCombine(output, 0, p1, p2); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(output[0] == 0xffff, "Expected output buffer to be unchanged\n"); + + memset(output, 0xff, sizeof(output)); + hr = pPathCchCombine(output, 1, p1, p2); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Expected STRSAFE_E_INSUFFICIENT_BUFFER, got %08x\n", hr); + ok(output[0] == 0, "Expected output buffer to contain NULL string\n"); + + memset(output, 0xff, sizeof(output)); + hr = pPathCchCombine(output, 4, p1, p2); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Expected STRSAFE_E_INSUFFICIENT_BUFFER, got %08x\n", hr); + ok(output[0] == 0x0, "Expected output buffer to contain NULL string\n"); + + memset(output, 0xff, sizeof(output)); + hr = pPathCchCombine(output, 5, p1, p2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(output, expected), "Combination of %s + %s returned %s, expected %s\n", wine_dbgstr_w(p1), + wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); + + hr = pPathCchCombine(output, PATHCCH_MAX_CCH + 1, p1, p2); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = pPathCchCombine(output, PATHCCH_MAX_CCH, p1, p2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + for (i = 0; i < ARRAY_SIZE(combine_tests); i++) + { + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].path1, -1, p1, ARRAY_SIZE(p1)); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].path2, -1, p2, ARRAY_SIZE(p2)); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].result, -1, expected, ARRAY_SIZE(expected)); + + hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), + wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); + } +} + static void test_PathCchCombineEx(void) { WCHAR expected[MAX_PATH] = {'C',':','\\','a',0}; @@ -2049,6 +2111,7 @@ START_TEST(path) pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); + pPathCchCombine = (void *)GetProcAddress(hmod, "PathCchCombine"); pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); @@ -2069,6 +2132,7 @@ START_TEST(path) test_PathCchAddExtension(); test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); + test_PathCchCombine(); test_PathCchCombineEx(); test_PathCchFindExtension(); test_PathCchIsRoot(); diff --git a/include/pathcch.h b/include/pathcch.h index 3cec09cadc..205d4a23a3 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -33,6 +33,7 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); +HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL WINAPI PathCchIsRoot(const WCHAR *path); -- 2.19.1

1 0

[PATCH 2/5] kernelbase: Implement PathCchCombineEx.
by Zhiyi Zhang 26 Nov '18

26 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42474 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 32 +++++++++++++++++++ dlls/kernelbase/tests/path.c | 21 ++++++++++-- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index f33d589d03..dfa7b81ba0 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -8,7 +8,7 @@ @ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx @ stub PathCchCombine -@ stub PathCchCombineEx +@ stdcall PathCchCombineEx(ptr long wstr wstr long) kernelbase.PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stdcall PathCchIsRoot(wstr) kernelbase.PathCchIsRoot @ stdcall PathCchRemoveBackslash(wstr long) kernelbase.PathCchRemoveBackslash diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 303fd3bf47..9040633324 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1037,7 +1037,7 @@ @ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) # @ stub PathCchCombine -# @ stub PathCchCombineEx +@ stdcall PathCchCombineEx(ptr long wstr wstr long) @ stdcall PathCchFindExtension(wstr long ptr) @ stdcall PathCchIsRoot(wstr) @ stdcall PathCchRemoveBackslash(wstr long) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 3380b8b4e4..92a747bd0b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -496,6 +496,38 @@ HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, D return hr; } +HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags) +{ + HRESULT hr; + WCHAR *buffer; + SIZE_T length; + + TRACE("%p %s %s %#x\n", out, wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags); + + if (!out || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + hr = PathAllocCombine(path1, path2, flags, &buffer); + if (FAILED(hr)) + { + out[0] = 0; + return hr; + } + + length = strlenW(buffer); + if (length + 1 > size) + { + out[0] = 0; + LocalFree(buffer); + return STRSAFE_E_INSUFFICIENT_BUFFER; + } + else + { + memcpy(out, buffer, (length + 1) * sizeof(WCHAR)); + LocalFree(buffer); + return S_OK; + } +} + HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension) { const WCHAR *lastpoint = NULL; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 2c012ab2bc..4061988fb1 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -485,12 +485,19 @@ static void test_PathCchCombineEx(void) if (!pPathCchCombineEx) { - skip("PathCchCombineEx() is not available.\n"); + win_skip("PathCchCombineEx() is not available.\n"); return; } + output[0] = 0xff; + hr = pPathCchCombineEx(output, 5, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(output[0] == 0, "Expected output buffer to be empty\n"); + + output[0] = 0xff; hr = pPathCchCombineEx(NULL, 2, p1, p2, 0); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(output[0] == 0xff, "Expected output buffer to be unchanged\n"); memset(output, 0xff, sizeof(output)); hr = pPathCchCombineEx(output, 0, p1, p2, 0); @@ -507,6 +514,14 @@ static void test_PathCchCombineEx(void) ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Expected STRSAFE_E_INSUFFICIENT_BUFFER, got %08x\n", hr); ok(output[0] == 0x0, "Expected output buffer to contain NULL string\n"); + output[0] = 0xff; + hr = pPathCchCombineEx(output, PATHCCH_MAX_CCH + 1, p1, p2, 0); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(output[0] == 0xff, "Expected output buffer to be 0xff\n"); + + hr = pPathCchCombineEx(output, PATHCCH_MAX_CCH, p1, p2, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + memset(output, 0xff, sizeof(output)); hr = pPathCchCombineEx(output, 5, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -2029,12 +2044,12 @@ START_TEST(path) pPathAllocCanonicalize = (void *)GetProcAddress(hmod, "PathAllocCanonicalize"); pPathAllocCombine = (void *)GetProcAddress(hmod, "PathAllocCombine"); - pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); + pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); pPathCchRemoveBackslash = (void *)GetProcAddress(hmod, "PathCchRemoveBackslash"); @@ -2049,12 +2064,12 @@ START_TEST(path) test_PathAllocCanonicalize(); test_PathAllocCombine(); - test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); + test_PathCchCombineEx(); test_PathCchFindExtension(); test_PathCchIsRoot(); test_PathCchRemoveBackslash(); -- 2.19.1

1 0

[PATCH 1/5] kernelbase: Implement PathAllocCombine.
by Zhiyi Zhang 26 Nov '18

26 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 57 +++++++++ dlls/kernelbase/tests/path.c | 117 ++++++++++++++++-- include/pathcch.h | 1 + 5 files changed, 166 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 6896e4a8d4..f33d589d03 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall PathAllocCanonicalize(wstr long ptr) kernelbase.PathAllocCanonicalize -@ stub PathAllocCombine +@ stdcall PathAllocCombine(wstr wstr long ptr) kernelbase.PathAllocCombine @ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx @ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 752d489fba..303fd3bf47 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1024,7 +1024,7 @@ @ stdcall PathAddExtensionA(str str) shlwapi.PathAddExtensionA @ stdcall PathAddExtensionW(wstr wstr) shlwapi.PathAddExtensionW @ stdcall PathAllocCanonicalize(wstr long ptr) -# @ stub PathAllocCombine +@ stdcall PathAllocCombine(wstr wstr long ptr) @ stdcall PathAppendA(str str) shlwapi.PathAppendA @ stdcall PathAppendW(wstr wstr) shlwapi.PathAppendW @ stdcall PathCanonicalizeA(ptr str) shlwapi.PathCanonicalizeA diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index cc15d1c097..3380b8b4e4 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -308,6 +308,63 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** return S_OK; } +HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out) +{ + SIZE_T combined_length, length2; + WCHAR *combined_path; + BOOL from_path2 = FALSE; + HRESULT hr; + + TRACE("%s %s %#x %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out); + + if ((!path1 && !path2) || !out) + { + if (out) *out = NULL; + return E_INVALIDARG; + } + + if (!path1 || !path2) return PathAllocCanonicalize(path1 ? path1 : path2, flags, out); + + /* If path2 is fully qualified, use path2 only */ + if (path2 && ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\'))) + { + path1 = path2; + path2 = NULL; + from_path2 = TRUE; + } + + length2 = path2 ? strlenW(path2) : 0; + /* path1 length + path2 length + possible backslash + NULL */ + combined_length = strlenW(path1) + length2 + 2; + + combined_path = HeapAlloc(GetProcessHeap(), 0, combined_length * sizeof(WCHAR)); + if (!combined_path) + { + *out = NULL; + return E_OUTOFMEMORY; + } + + lstrcpyW(combined_path, path1); + PathCchStripPrefix(combined_path, combined_length); + if (from_path2) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + + if (path2 && path2[0]) + { + if (path2[0] == '\\' && path2[1] != '\\') + { + PathCchStripToRoot(combined_path, combined_length); + path2++; + } + + PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + lstrcatW(combined_path, path2); + } + + hr = PathAllocCanonicalize(combined_path, flags, out); + HeapFree(GetProcessHeap(), 0, combined_path); + return hr; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index fd9c81df59..2c012ab2bc 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -31,6 +31,7 @@ #include "wine/test.h" HRESULT (WINAPI *pPathAllocCanonicalize)(const WCHAR *path_in, DWORD flags, WCHAR **path_out); +HRESULT (WINAPI *pPathAllocCombine)(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out); HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); @@ -352,13 +353,14 @@ static void test_PathAllocCanonicalize(void) } } -static const struct +struct combine_test { - const char *path1; - const char *path2; - const char *result; -} -combine_test[] = + const CHAR *path1; + const CHAR *path2; + const CHAR *result; +}; + +static const struct combine_test combine_tests[] = { /* normal paths */ {"C:\\", "a", "C:\\a" }, @@ -366,21 +368,112 @@ combine_test[] = {"C:", "a", "C:\\a" }, {"C:\\", ".", "C:\\" }, {"C:\\", "..", "C:\\" }, - {"\\a", "b", "\\a\\b" }, + {"C:\\a", "", "C:\\a" }, + {"\\", "a", "\\a"}, + {"\\a", "b", "\\a\\b" }, /* normal UNC paths */ {"\\\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a" }, {"\\\\192.168.1.1\\test", "..", "\\\\192.168.1.1" }, + {"\\\\", "a", "\\\\a"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a"}, /* NT paths */ {"\\\\?\\C:\\", "a", "C:\\a" }, {"\\\\?\\C:\\", "..", "C:\\" }, + {"\\\\?\\C:", "a", "C:\\a"}, /* NT UNC path */ + {"\\\\?\\UNC\\", "a", "\\\\a"}, {"\\\\?\\UNC\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a" }, {"\\\\?\\UNC\\192.168.1.1\\test", "..", "\\\\192.168.1.1" }, + + /* Second path begins with a single backslash */ + {"C:a\\b", "\\1", "C:\\1"}, + {"C:\\a\\b", "\\1", "C:\\1"}, + {"\\a\\b", "\\1", "\\1"}, + {"\\\\a\\b", "\\1", "\\\\a\\b\\1"}, + {"\\\\a\\b\\c", "\\1", "\\\\a\\b\\1"}, + {"\\\\?\\UNC\\a", "\\1", "\\\\a\\1"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", "\\1", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", "\\1", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1"}, + {"C:\\a\\b", "\\", "C:\\"}, + + /* Second path is fully qualified */ + {"X:\\", "C:", "C:\\"}, + {"X:\\", "C:\\", "C:\\"}, + {"X:\\", "\\\\", "\\\\"}, + {"X:\\", "\\\\?\\C:", "C:\\"}, + {"X:\\", "\\\\?\\C:\\", "C:\\"}, + {"X:\\", "\\\\?\\UNC\\", "\\\\"}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, + + /* Canonicalization */ + {"C:\\a", ".\\b", "C:\\a\\b"}, + {"C:\\a", "..\\b", "C:\\b"}, + + /* Other */ + {"", "", "\\"}, + {"a", "b", "a\\b"} }; +static void test_PathAllocCombine(void) +{ + WCHAR path1W[PATHCCH_MAX_CCH]; + WCHAR path2W[PATHCCH_MAX_CCH]; + WCHAR *resultW; + CHAR resultA[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathAllocCombine) + { + win_skip("PathAllocCombine() is not available.\n"); + return; + } + + resultW = (WCHAR *)0xdeadbeef; + hr = pPathAllocCombine(NULL, NULL, 0, &resultW); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(resultW == NULL, "expect resultW null, got %p\n", resultW); + + MultiByteToWideChar(CP_ACP, 0, "\\a", -1, path1W, ARRAY_SIZE(path1W)); + hr = pPathAllocCombine(path1W, NULL, 0, &resultW); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + ok(!lstrcmpA(resultA, "\\a"), "expect \\a, got %s\n", resultA); + + MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathAllocCombine(NULL, path2W, 0, &resultW); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + ok(!lstrcmpA(resultA, "\\b"), "expect \\b, got %s\n", resultA); + + hr = pPathAllocCombine(path1W, path2W, 0, NULL); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(combine_tests); i++) + { + const struct combine_test *t = combine_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path1, -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, t->path2, -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathAllocCombine(path1W, path2W, 0, &resultW); + ok(hr == S_OK, "combine %s %s expect hr %#x, got %#x\n", t->path1, t->path2, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, + resultA); + LocalFree(resultW); + } + } +} + static void test_PathCchCombineEx(void) { WCHAR expected[MAX_PATH] = {'C',':','\\','a',0}; @@ -421,11 +514,11 @@ static void test_PathCchCombineEx(void) "Combination of %s + %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); - for (i = 0; i < ARRAY_SIZE(combine_test); i++) + for (i = 0; i < ARRAY_SIZE(combine_tests); i++) { - MultiByteToWideChar(CP_ACP, 0, combine_test[i].path1, -1, p1, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, combine_test[i].path2, -1, p2, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, combine_test[i].result, -1, expected, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].path1, -1, p1, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].path2, -1, p2, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].result, -1, expected, MAX_PATH); hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1935,6 +2028,7 @@ START_TEST(path) HMODULE hmod = LoadLibraryA("kernelbase.dll"); pPathAllocCanonicalize = (void *)GetProcAddress(hmod, "PathAllocCanonicalize"); + pPathAllocCombine = (void *)GetProcAddress(hmod, "PathAllocCombine"); pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); @@ -1954,6 +2048,7 @@ START_TEST(path) pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); test_PathAllocCanonicalize(); + test_PathAllocCombine(); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); diff --git a/include/pathcch.h b/include/pathcch.h index 708e00e146..3cec09cadc 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -27,6 +27,7 @@ #define PATHCCH_MAX_CCH 0x8000 HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out); +HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out); HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -- 2.19.1

1 0

[PATCH] testbot/web: Add a legend to the statistics page.
by Francois Gouget 26 Nov '18

26 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index ccabb321a3..2d426ac4e2 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -334,6 +334,22 @@ sub GenerateBody($) _GenStatsLine($VMsStats, "error.count", "Transient errors", $SortedVMKeys); print "</tbody></table></div>\n"; +} + +sub GenerateFooter($) +{ + my ($self) = @_; + print "<p></p><div class='CollectionBlock'><table>\n"; + print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; + print "<tbody><tr><td class='Record'>\n"; + + print "<p>The <b>Job rate</b> and <b>Task rate</b> show the average hourly rate at which jobs / tasks are submitted to the TestBot. The <b>Revert rate</b> shows how many reverts have been done per hour to run those tasks. Note that the job and task rates provide a first approximation upper limit on the average time a job or task can take to complete.</p>\n"; + print "<p>The <b>Busy time</b> indicates how long the TestBot had at least one pending task and the <b>Busy %</b> shows how much of the wall clock time this represents. Note that the busy percentage and average <b>Job completion</b> times can be optimized by balancing the load on the different VM hosts.</p>\n"; + print "<p>The average and maximum time statistics show how long the VMs spend in each state of their lifecycle. A VM starts in the powered off or dirty state. It is then <b>reverted</b> to a clean state with the right configuration for the tests. Then it goes into the <b>sleep</b> state during which it gets ready to run the tests. Depending on the VM configuration this may be immediate or may require booting the VM first. Then it goes into the <b>run</b> state while the tests are being uploaded, run, and the results retrieved. This means the test itself takes less time to run than indicated in this statistic. Also note that the <b>WineTest</b> and <b>Wine update</b> tasks are tallied separately because they take much longer than regular tasks. Once the tests complete the VM is marked <b>dirty</b> while it waits for the TestBot to decide whether to power it off, or immediately revert it for the next task.</p>\n"; + print "<p>The errors section shows how many <b>Timeouts</b> occurred, that is how many tasks failed to complete within the alloted time; how many failed due to a <b>TestBot error</b>; and how many had to be rerun due to a <b>Transient error</b> such as a network connection issue.</p>\n"; + + print "</td></tr></tbody>\n"; + print "</tbody></table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; print "</div>\n"; } -- 2.19.1

1 0

[PATCH 1/3] setupapi/devinst: Factor out get_device().
by Zebediah Figura 25 Nov '18

25 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 385 ++++++++++++------------------------------------ 1 file changed, 95 insertions(+), 290 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 771fc70395..630d3e9587 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -129,6 +129,34 @@ struct device_iface struct list entry; }; +static struct device *get_device(HDEVINFO devinfo, const SP_DEVINFO_DATA *data) +{ + struct DeviceInfoSet *set = devinfo; + struct device *device; + + if (!devinfo || devinfo == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + if (!data || data->cbSize != sizeof(*data) || !data->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + device = (struct device *)data->Reserved; + + if (device->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + return device; +} + static inline void copy_device_data(SP_DEVINFO_DATA *data, const struct device *device) { data->ClassGuid = device->class; @@ -1233,44 +1261,18 @@ HKEY WINAPI SetupDiCreateDevRegKeyA( /*********************************************************************** * SetupDiCreateDevRegKeyW (SETUPAPI.@) */ -HKEY WINAPI SetupDiCreateDevRegKeyW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Scope, - DWORD HwProfile, - DWORD KeyType, - HINF InfHandle, - PCWSTR InfSectionName) +HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD Scope, + DWORD HwProfile, DWORD KeyType, HINF InfHandle, const WCHAR *InfSectionName) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; HKEY key = INVALID_HANDLE_VALUE; - TRACE("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, - HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); + TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, inf_handle %p, inf_section %s.\n", + devinfo, device_data, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return INVALID_HANDLE_VALUE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return INVALID_HANDLE_VALUE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) { SetLastError(ERROR_INVALID_FLAGS); @@ -1301,8 +1303,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( } if (InfHandle) SetupInstallFromInfSectionW(NULL, InfHandle, InfSectionName, SPINST_ALL, - NULL, NULL, SP_COPY_NEWER_ONLY, NULL, NULL, DeviceInfoSet, - DeviceInfoData); + NULL, NULL, SP_COPY_NEWER_ONLY, NULL, NULL, devinfo, device_data); return key; } @@ -1497,42 +1498,17 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceName, /*********************************************************************** * SetupDiRegisterDeviceInfo (SETUPAPI.@) */ -BOOL WINAPI SetupDiRegisterDeviceInfo( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Flags, - PSP_DETSIG_CMPPROC CompareProc, - PVOID CompareContext, - PSP_DEVINFO_DATA DupDeviceInfoData) +BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD flags, + PSP_DETSIG_CMPPROC compare_proc, void *context, SP_DEVINFO_DATA *duplicate_data) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %08x %p %p %p\n", DeviceInfoSet, DeviceInfoData, Flags, - CompareProc, CompareContext, DupDeviceInfoData); + TRACE("devinfo %p, data %p, flags %#x, compare_proc %p, context %p, duplicate_data %p.\n", + devinfo, device_data, flags, compare_proc, context, duplicate_data); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (device->phantom) { device->phantom = FALSE; @@ -1675,41 +1651,17 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA( /*********************************************************************** * SetupDiGetDeviceInstanceIdW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstanceIdW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PWSTR DeviceInstanceId, - DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) +BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + WCHAR *DeviceInstanceId, DWORD DeviceInstanceIdSize, DWORD *RequiredSize) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, - DeviceInstanceIdSize, RequiredSize); + TRACE("devinfo %p, device_data %p, DeviceInstanceId %p, DeviceInstanceIdSize %d, RequiredSize %p.\n", + devinfo, device_data, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + TRACE("instance ID: %s\n", debugstr_w(device->instanceId)); if (DeviceInstanceIdSize < strlenW(device->instanceId) + 1) { @@ -2466,51 +2418,25 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceA( /*********************************************************************** * SetupDiCreateDeviceInterfaceW (SETUPAPI.@) */ -BOOL WINAPI SetupDiCreateDeviceInterfaceW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - const GUID *InterfaceClassGuid, - PCWSTR ReferenceString, - DWORD CreationFlags, - SP_DEVICE_INTERFACE_DATA *iface_data) +BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + const GUID *class, const WCHAR *refstr, DWORD flags, SP_DEVICE_INTERFACE_DATA *iface_data) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; struct device_iface *iface; - TRACE("%p %p %s %s %08x %p\n", DeviceInfoSet, DeviceInfoData, - debugstr_guid(InterfaceClassGuid), debugstr_w(ReferenceString), - CreationFlags, iface_data); + TRACE("devinfo %p, device_data %p, class %s, refstr %s, flags %#x, iface_data %p.\n", + devinfo, device_data, debugstr_guid(class), debugstr_w(refstr), flags, iface_data); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (!InterfaceClassGuid) + + if (!class) { SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - if (!(iface = SETUPDI_CreateDeviceInterface(device, InterfaceClassGuid, - ReferenceString))) + + if (!(iface = SETUPDI_CreateDeviceInterface(device, class, refstr))) return FALSE; if (iface_data) @@ -2960,45 +2886,25 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( /*********************************************************************** * SetupDiGetDeviceRegistryPropertyA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - PDWORD PropertyRegDataType, - PBYTE PropertyBuffer, - DWORD PropertyBufferSize, - PDWORD RequiredSize) +BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, DWORD Property, DWORD *PropertyRegDataType, + BYTE *PropertyBuffer, DWORD PropertyBufferSize, DWORD *RequiredSize) { BOOL ret = FALSE; - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, - Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, - RequiredSize); + TRACE("devinfo %p, device_data %p, property %d, type %p, buffer %p, size %d, required %p\n", + devinfo, device_data, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } + if (PropertyBufferSize && PropertyBuffer == NULL) { SetLastError(ERROR_INVALID_DATA); return FALSE; } - device = (struct device *)DeviceInfoData->Reserved; + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameA) { DWORD size = PropertyBufferSize; @@ -3022,45 +2928,25 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( /*********************************************************************** * SetupDiGetDeviceRegistryPropertyW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - PDWORD PropertyRegDataType, - PBYTE PropertyBuffer, - DWORD PropertyBufferSize, - PDWORD RequiredSize) +BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, DWORD Property, DWORD *PropertyRegDataType, + BYTE *PropertyBuffer, DWORD PropertyBufferSize, DWORD *RequiredSize) { BOOL ret = FALSE; - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, - Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, - RequiredSize); + TRACE("devinfo %p, device_data %p, prop %d, type %p, buffer %p, size %d, required %p\n", + devinfo, device_data, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (PropertyBufferSize && PropertyBuffer == NULL) { SetLastError(ERROR_INVALID_DATA); return FALSE; } - device = (struct device *)DeviceInfoData->Reserved; + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameW) { DWORD size = PropertyBufferSize; @@ -3084,37 +2970,18 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( /*********************************************************************** * SetupDiSetDeviceRegistryPropertyA (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - const BYTE *PropertyBuffer, - DWORD PropertyBufferSize) +BOOL WINAPI SetupDiSetDeviceRegistryPropertyA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + DWORD Property, const BYTE *PropertyBuffer, DWORD PropertyBufferSize) { BOOL ret = FALSE; - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, - PropertyBuffer, PropertyBufferSize); + TRACE("devinfo %p, device_data %p, prop %d, buffer %p, size %d.\n", + devinfo, device_data, Property, PropertyBuffer, PropertyBufferSize); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - device = (struct device *)DeviceInfoData->Reserved; + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameA) { LONG l = RegSetValueExA(device->key, PropertyMap[Property].nameA, 0, @@ -3134,29 +3001,14 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD prop, const BYTE *buffer, DWORD size) { - struct DeviceInfoSet *set = devinfo; struct device *device; - TRACE("%p %p %d %p %d\n", devinfo, device_data, prop, buffer, size); + TRACE("devinfo %p, device_data %p, prop %d, buffer %p, size %d.\n", + devinfo, device_data, prop, buffer, size); - if (!devinfo || devinfo == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (!device_data || device_data->cbSize != sizeof(SP_DEVINFO_DATA) - || !device_data->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - device = (struct device *)device_data->Reserved; return SETUPDI_SetDeviceRegistryPropertyW(device, prop, buffer, size); } @@ -3649,37 +3501,18 @@ static HKEY SETUPDI_OpenDrvKey(struct device *device, REGSAM samDesired) /*********************************************************************** * SetupDiOpenDevRegKey (SETUPAPI.@) */ -HKEY WINAPI SetupDiOpenDevRegKey( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Scope, - DWORD HwProfile, - DWORD KeyType, - REGSAM samDesired) +HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + DWORD Scope, DWORD HwProfile, DWORD KeyType, REGSAM samDesired) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; HKEY key = INVALID_HANDLE_VALUE; - TRACE("%p %p %d %d %d %x\n", DeviceInfoSet, DeviceInfoData, - Scope, HwProfile, KeyType, samDesired); + TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, access %#x.\n", + devinfo, device_data, Scope, HwProfile, KeyType, samDesired); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return INVALID_HANDLE_VALUE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return INVALID_HANDLE_VALUE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) { SetLastError(ERROR_INVALID_FLAGS); @@ -3690,12 +3523,7 @@ HKEY WINAPI SetupDiOpenDevRegKey( SetLastError(ERROR_INVALID_FLAGS); return INVALID_HANDLE_VALUE; } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } + if (device->phantom) { SetLastError(ERROR_DEVINFO_NOT_REGISTERED); @@ -3766,36 +3594,18 @@ static BOOL SETUPDI_DeleteDrvKey(struct device *device) /*********************************************************************** * SetupDiDeleteDevRegKey (SETUPAPI.@) */ -BOOL WINAPI SetupDiDeleteDevRegKey( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Scope, - DWORD HwProfile, - DWORD KeyType) +BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + DWORD Scope, DWORD HwProfile, DWORD KeyType) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; BOOL ret = FALSE; - TRACE("%p %p %d %d %d\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, - KeyType); + TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d.\n", + devinfo, device_data, Scope, HwProfile, KeyType); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) { SetLastError(ERROR_INVALID_FLAGS); @@ -3806,12 +3616,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey( SetLastError(ERROR_INVALID_FLAGS); return FALSE; } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (device->phantom) { SetLastError(ERROR_DEVINFO_NOT_REGISTERED); -- 2.14.1

1 2

Wine staging 3.21 release
by Alistair Leslie-Hughes 25 Nov '18

25 Nov '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.21 (850 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * ddraw: Prevent division by zero in viewport_activate. * kernelbase: Implement PathCchRemoveBackslash()/PathCchRemoveBackslashEx() * oleaut32: Handle TKIND_COCLASS in proxy/stub marshalling. * oleaut32: Initial preparation to make marshalling compatible with x86_64. * oleaut32: Implement TMStubImpl_Invoke on x86_64. * oleaut32: Implement asm proxys for x86_64. * oleaut32: Fix calling function with instance and VARIANT return type. * oleaut32: Pass a HREFTYPE to get_iface_guid. * oleaut32: Implement ITypeInfo_fnInvoke for TKIND_COCLASS in arguments. * oleaut32/tests: Add a test for TKIND_COCLASS in proxy/stub marshalling. * wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and QUERY_TYPE_SO_OVERFLOW. * xinput1_3: Report SUCCESS from XInputSetState when FFB isn't available. Added * 32749 - atl: Implemented AtlAxDialogBox[A,W]. * 41591 - advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs. * 33456 - d3dx9_36: D3DXMatrixTransformation support NULL scaling matrix. * 18889 - ntdll: Support ISOLATIONAWARE_MANIFEST_RESOURCE_ID range. * 42255 - ntdll: Add RtlAddGrowableFunctionTable stub. * 46174 - qwave: Added QOSCreateHandle stub. * 45947 - virtdisk: Add stub for OpenVirtualDisk. * 44300 - wmvcore: Add stub for WMCheckURlExtension. * 37327 - wmvcore: Implement WMCreateSyncReaderPriv. Updated: * advapi32-RegLoadAppKey * bcrypt-BCryptDeriveKeyPBKDF2 * bcrypt-BCryptGenerateKeyPair * kernel32-Processor_Group * ntdll-RtlAddGrowableFunctionTable * server-Signal_Thread * user32-GetPointerType Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] cmd: Avoid naming conflicts with the global HeapAlloc wrappers
by Michael Stefaniuc 25 Nov '18

25 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/batch.c | 4 ++-- programs/cmd/builtins.c | 24 ++++++++++++------------ programs/cmd/directory.c | 14 +++++++------- programs/cmd/wcmd.h | 10 +++------- programs/cmd/wcmdmain.c | 20 ++++++++++---------- 5 files changed, 34 insertions(+), 38 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 5b05d8811b..3bb325537b 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -257,7 +257,7 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) const char *p; cp = GetConsoleCP(); - bufA = heap_alloc(noChars); + bufA = heap_xalloc(noChars); /* Save current file position */ filepos.QuadPart = 0; @@ -508,7 +508,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) size = GetEnvironmentVariableW(env, NULL, 0); if (size > 0) { - WCHAR *fullpath = heap_alloc(size * sizeof(WCHAR)); + WCHAR *fullpath = heap_xalloc(size * sizeof(WCHAR)); if (!fullpath || (GetEnvironmentVariableW(env, fullpath, size) == 0) || (SearchPathW(fullpath, outputparam, NULL, MAX_PATH, outputparam, NULL) == 0)) size = 0; diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 25b98813ba..209de26f10 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -720,7 +720,7 @@ void WCMD_copy(WCHAR * args) { } /* We have found something to process - build a COPY_FILE block to store it */ - thiscopy = heap_alloc(sizeof(COPY_FILES)); + thiscopy = heap_xalloc(sizeof(COPY_FILES)); WINE_TRACE("Not a switch, but probably a filename/list %s\n", wine_dbgstr_w(thisparam)); thiscopy->concatenate = concatnextfilename; @@ -731,7 +731,7 @@ void WCMD_copy(WCHAR * args) { leave space to append \* to the end) , then copy in character by character. Strip off quotes if we find them. */ len = strlenW(thisparam) + (sizeof(WCHAR) * 5); /* 5 spare characters, null + \*.* */ - thiscopy->name = heap_alloc(len*sizeof(WCHAR)); + thiscopy->name = heap_xalloc(len*sizeof(WCHAR)); memset(thiscopy->name, 0x00, len); pos1 = thisparam; @@ -810,7 +810,7 @@ void WCMD_copy(WCHAR * args) { strcpyW(destname, dotW); strcatW(destname, slashW); - destination = heap_alloc(sizeof(COPY_FILES)); + destination = heap_xalloc(sizeof(COPY_FILES)); if (destination == NULL) goto exitreturn; destination->concatenate = FALSE; /* Not used for destination */ destination->binarycopy = binarymode; @@ -1390,7 +1390,7 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { WINE_TRACE("Recursive, Adding to search list '%s'\n", wine_dbgstr_w(subParm)); /* Allocate memory, add to list */ - nextDir = heap_alloc(sizeof(DIRECTORY_STACK)); + nextDir = heap_xalloc(sizeof(DIRECTORY_STACK)); if (allDirs == NULL) allDirs = nextDir; if (lastEntry != NULL) lastEntry->next = nextDir; lastEntry = nextDir; @@ -1476,7 +1476,7 @@ static WCHAR *WCMD_strtrim(const WCHAR *s) const WCHAR *start = s; WCHAR* result; - result = heap_alloc((len + 1) * sizeof(WCHAR)); + result = heap_xalloc((len + 1) * sizeof(WCHAR)); while (isspaceW(*start)) start++; if (*start) { @@ -1787,12 +1787,12 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { (strcmpW(fd.cFileName, dotW) != 0)) { /* Allocate memory, add to list */ - DIRECTORY_STACK *toWalk = heap_alloc(sizeof(DIRECTORY_STACK)); + DIRECTORY_STACK *toWalk = heap_xalloc(sizeof(DIRECTORY_STACK)); WINE_TRACE("(%p->%p)\n", remainingDirs, remainingDirs->next); toWalk->next = remainingDirs->next; remainingDirs->next = toWalk; remainingDirs = toWalk; - toWalk->dirName = heap_alloc(sizeof(WCHAR) * (strlenW(dirsToWalk->dirName) + 2 + strlenW(fd.cFileName))); + toWalk->dirName = heap_xalloc(sizeof(WCHAR) * (strlenW(dirsToWalk->dirName) + 2 + strlenW(fd.cFileName))); strcpyW(toWalk->dirName, dirsToWalk->dirName); strcatW(toWalk->dirName, slashW); strcatW(toWalk->dirName, fd.cFileName); @@ -2228,7 +2228,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Set up the list of directories to recurse if we are going to */ } else if (doRecurse) { /* Allocate memory, add to list */ - dirsToWalk = heap_alloc(sizeof(DIRECTORY_STACK)); + dirsToWalk = heap_xalloc(sizeof(DIRECTORY_STACK)); dirsToWalk->next = NULL; dirsToWalk->dirName = heap_strdupW(optionsRoot); WINE_TRACE("Starting with root directory %s\n", wine_dbgstr_w(dirsToWalk->dirName)); @@ -3673,7 +3673,7 @@ static int WCMD_getprecedence(const WCHAR in) * stack */ static void WCMD_pushnumber(WCHAR *var, int num, VARSTACK **varstack) { - VARSTACK *thisstack = heap_alloc(sizeof(VARSTACK)); + VARSTACK *thisstack = heap_xalloc(sizeof(VARSTACK)); thisstack->isnum = (var == NULL); if (var) { thisstack->variable = var; @@ -3736,7 +3736,7 @@ static int WCMD_popnumber(VARSTACK **varstack) { * Push an operator onto the supplied stack */ static void WCMD_pushoperator(WCHAR op, int precedence, OPSTACK **opstack) { - OPSTACK *thisstack = heap_alloc(sizeof(OPSTACK)); + OPSTACK *thisstack = heap_xalloc(sizeof(OPSTACK)); thisstack->precedence = precedence; thisstack->op = op; thisstack->next = *opstack; @@ -4206,7 +4206,7 @@ void WCMD_setshow_env (WCHAR *s) { WCHAR *src,*dst; /* Remove all quotes before doing any calculations */ - thisexpr = heap_alloc((strlenW(s+2)+1) * sizeof(WCHAR)); + thisexpr = heap_xalloc((strlenW(s+2)+1) * sizeof(WCHAR)); src = s+2; dst = thisexpr; while (*src) { @@ -4407,7 +4407,7 @@ void WCMD_start(WCHAR *args) GetWindowsDirectoryW( file, MAX_PATH ); strcatW( file, exeW ); - cmdline = heap_alloc( (strlenW(file) + strlenW(args) + 8) * sizeof(WCHAR) ); + cmdline = heap_xalloc( (strlenW(file) + strlenW(args) + 8) * sizeof(WCHAR) ); strcpyW( cmdline, file ); strcatW( cmdline, spaceW ); cmdline_params = cmdline + strlenW(cmdline); diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 70507892ea..435e0f36ed 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -203,7 +203,7 @@ static void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) { ULONG domainLen = MAXSTRING; SID_NAME_USE nameuse; - secBuffer = heap_alloc(sizeNeeded * sizeof(BYTE)); + secBuffer = heap_xalloc(sizeNeeded * sizeof(BYTE)); /* Get the owners security descriptor */ if(!GetFileSecurityW(filename, OWNER_SECURITY_INFORMATION, secBuffer, @@ -273,7 +273,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le same directory. Note issuing a directory header with no contents mirrors what windows does */ parms = inputparms; - fd = heap_alloc(sizeof(WIN32_FIND_DATAW)); + fd = heap_xalloc(sizeof(WIN32_FIND_DATAW)); while (parms && strcmpW(inputparms->dirName, parms->dirName) == 0) { concurrentDirs++; @@ -510,7 +510,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le WINE_TRACE("Recursive, Adding to search list '%s'\n", wine_dbgstr_w(string)); /* Allocate memory, add to list */ - thisDir = heap_alloc(sizeof(DIRECTORY_STACK)); + thisDir = heap_xalloc(sizeof(DIRECTORY_STACK)); if (dirStack == NULL) dirStack = thisDir; if (lastEntry != NULL) lastEntry->next = thisDir; lastEntry = thisDir; @@ -841,7 +841,7 @@ void WCMD_directory (WCHAR *args) } WINE_TRACE("Using path '%s'\n", wine_dbgstr_w(path)); - thisEntry = heap_alloc(sizeof(DIRECTORY_STACK)); + thisEntry = heap_xalloc(sizeof(DIRECTORY_STACK)); if (fullParms == NULL) fullParms = thisEntry; if (prevEntry != NULL) prevEntry->next = thisEntry; prevEntry = thisEntry; @@ -853,11 +853,11 @@ void WCMD_directory (WCHAR *args) wine_dbgstr_w(drive), wine_dbgstr_w(dir), wine_dbgstr_w(fname), wine_dbgstr_w(ext)); - thisEntry->dirName = heap_alloc(sizeof(WCHAR) * (strlenW(drive)+strlenW(dir)+1)); + thisEntry->dirName = heap_xalloc(sizeof(WCHAR) * (strlenW(drive)+strlenW(dir)+1)); strcpyW(thisEntry->dirName, drive); strcatW(thisEntry->dirName, dir); - thisEntry->fileName = heap_alloc(sizeof(WCHAR) * (strlenW(fname)+strlenW(ext)+1)); + thisEntry->fileName = heap_xalloc(sizeof(WCHAR) * (strlenW(fname)+strlenW(ext)+1)); strcpyW(thisEntry->fileName, fname); strcatW(thisEntry->fileName, ext); @@ -867,7 +867,7 @@ void WCMD_directory (WCHAR *args) /* If just 'dir' entered, a '*' parameter is assumed */ if (fullParms == NULL) { WINE_TRACE("Inserting default '*'\n"); - fullParms = heap_alloc(sizeof(DIRECTORY_STACK)); + fullParms = heap_xalloc(sizeof(DIRECTORY_STACK)); fullParms->next = NULL; fullParms->dirName = heap_strdupW(cwd); fullParms->fileName = heap_strdupW(starW); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8d6eb6b48e..359c719175 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -28,6 +28,7 @@ #include <stdarg.h> #include <stdio.h> #include <ctype.h> +#include <wine/heap.h> #include <wine/unicode.h> /* msdn specified max for Win XP */ @@ -127,12 +128,7 @@ void WCMD_free_commands(CMD_LIST *cmds); void WCMD_execute (const WCHAR *orig_command, const WCHAR *redirects, CMD_LIST **cmdList, BOOL retrycall); -void *heap_alloc(size_t); - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +void *heap_xalloc(size_t); static inline WCHAR *heap_strdupW(const WCHAR *str) { @@ -142,7 +138,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) size_t size; size = (strlenW(str)+1)*sizeof(WCHAR); - ret = heap_alloc(size); + ret = heap_xalloc(size); memcpy(ret, str, size); } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1c99661b44..637c0e94bd 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -75,7 +75,7 @@ static char *get_file_buffer(void) { static char *output_bufA = NULL; if (!output_bufA) - output_bufA = heap_alloc(MAX_WRITECONSOLE_SIZE); + output_bufA = heap_xalloc(MAX_WRITECONSOLE_SIZE); return output_bufA; } @@ -438,11 +438,11 @@ static void WCMD_show_prompt (BOOL newLine) { WCMD_output_asis (out_string); } -void *heap_alloc(size_t size) +void *heap_xalloc(size_t size) { void *ret; - ret = HeapAlloc(GetProcessHeap(), 0, size); + ret = heap_alloc(size); if(!ret) { ERR("Out of memory\n"); ExitProcess(1); @@ -981,7 +981,7 @@ static void init_msvcrt_io_block(STARTUPINFOW* st) * its new input & output handles) */ sz = max(sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * 3, st_p.cbReserved2); - ptr = heap_alloc(sz); + ptr = heap_xalloc(sz); flags = (char*)(ptr + sizeof(unsigned)); handles = (HANDLE*)(flags + num * sizeof(char)); @@ -1300,12 +1300,12 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, wine_dbgstr_w(command), cmdList); /* Move copy of the command onto the heap so it can be expanded */ - new_cmd = heap_alloc(MAXSTRING * sizeof(WCHAR)); + new_cmd = heap_xalloc(MAXSTRING * sizeof(WCHAR)); strcpyW(new_cmd, command); cmd = new_cmd; /* Move copy of the redirects onto the heap so it can be expanded */ - new_redir = heap_alloc(MAXSTRING * sizeof(WCHAR)); + new_redir = heap_xalloc(MAXSTRING * sizeof(WCHAR)); redir = new_redir; /* Strip leading whitespaces, and a '@' if supplied */ @@ -1708,16 +1708,16 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, CMD_LIST *thisEntry = NULL; /* Allocate storage for command */ - thisEntry = heap_alloc(sizeof(CMD_LIST)); + thisEntry = heap_xalloc(sizeof(CMD_LIST)); /* Copy in the command */ if (command) { - thisEntry->command = heap_alloc((*commandLen+1) * sizeof(WCHAR)); + thisEntry->command = heap_xalloc((*commandLen+1) * sizeof(WCHAR)); memcpy(thisEntry->command, command, *commandLen * sizeof(WCHAR)); thisEntry->command[*commandLen] = 0x00; /* Copy in the redirects */ - thisEntry->redirects = heap_alloc((*redirLen+1) * sizeof(WCHAR)); + thisEntry->redirects = heap_xalloc((*redirLen+1) * sizeof(WCHAR)); memcpy(thisEntry->redirects, redirs, *redirLen * sizeof(WCHAR)); thisEntry->redirects[*redirLen] = 0x00; thisEntry->pipeFile[0] = 0x00; @@ -1849,7 +1849,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) - extraSpace = heap_alloc((MAXSTRING+1) * sizeof(WCHAR)); + extraSpace = heap_xalloc((MAXSTRING+1) * sizeof(WCHAR)); if (!extraSpace) { WINE_ERR("Could not allocate memory for extraSpace\n"); -- 2.14.5

1 0

[PATCH] mf: Return S_OK from IMFMediaSession::Close.
by Sven Baars 25 Nov '18

25 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 18c5f3bf01..5913af39b9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -176,7 +176,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) FIXME("(%p)\n", This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) -- 2.17.1

1 1

[PATCH 2/2] user32/tests: Add a message test for group of radio buttons.
by Dmitry Timoshkov 25 Nov '18

25 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 125 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 28b58b6787..b39d0b251b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6670,6 +6670,130 @@ static void test_button_bm_get_set_image(void) ReleaseDC(0, hdc); } +#define ID_RADIO1 0x00e1 +#define ID_RADIO2 0x00e2 + +static const struct message auto_radio_button_WM_CLICK[] = +{ + { BM_CLICK, sent|wparam|lparam, 0, 0 }, + { WM_LBUTTONDOWN, sent|wparam|lparam|defwinproc, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO2, BN_CLICKED) }, + { WM_NCHITTEST, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_SETCURSOR, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_MOUSEMOVE, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { 0 } +}; + +static void test_autoradio_messages(void) +{ + HWND parent, radio1, radio2, radio3, child; + RECT rc; + MSG msg; + DWORD ret; + + subclass_button(); + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "failed to create parent window\n"); + radio1 = CreateWindowExA(0, "my_button_class", "radio1", WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY, + 0, 0, 70, 18, parent, (HMENU)ID_RADIO1, 0, NULL); + ok(radio1 != 0, "failed to create child window\n"); + radio3 = CreateWindowExA(0, "my_button_class", "radio3", WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY, + 0, 25, 70, 18, parent, (HMENU)-1, 0, NULL); + ok(radio3 != 0, "failed to create child window\n"); + child = CreateWindowExA(0, "my_button_class", "text", WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY, + 0, 50, 70, 18, parent, (HMENU)-1, 0, NULL); + ok(child != 0, "failed to create child window\n"); + radio2 = CreateWindowExA(0, "my_button_class", "radio2", WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY, + 0, 75, 70, 18, parent, (HMENU)ID_RADIO2, 0, NULL); + ok(radio2 != 0, "failed to create child window\n"); + + /* this avoids focus messages in the generated sequence */ + SetFocus(radio2); + + flush_events(); + flush_sequence(); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio1, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio2, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio3, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + + GetWindowRect(radio2, &rc); + SetCursorPos(rc.left+1, rc.top+1); + + flush_events(); + flush_sequence(); + + log_all_parent_messages++; + + SendMessageA(radio2, BM_CLICK, 0, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_WM_CLICK, "BM_CLICK on auto-radio button", FALSE); + + log_all_parent_messages--; + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + DestroyWindow(parent); +} + /****************** static message test *************************/ static const struct message WmSetFontStaticSeq2[] = { @@ -17130,6 +17254,7 @@ START_TEST(msg) test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image(); + test_autoradio_messages(); test_static_messages(); test_listbox_messages(); test_combobox_messages(); -- 2.17.1

2 1

[PATCH 1/2] user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler.
by Dmitry Timoshkov 25 Nov '18

25 Nov '18

This patch also changes the logic to get the control style with WM_GETDLGCODE instead of GetWindowLong to make the message test pass. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/button.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9255a46343..9a011ba266 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -309,7 +309,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, SendMessageW( hWnd, BM_SETCHECK, !(state & BST_CHECKED), 0 ); break; case BS_AUTORADIOBUTTON: - SendMessageW( hWnd, BM_SETCHECK, TRUE, 0 ); + BUTTON_CheckAutoRadioButton( hWnd ); break; case BS_AUTO3STATE: SendMessageW( hWnd, BM_SETCHECK, @@ -475,8 +475,6 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, set_button_state( hWnd, (state & ~3) | wParam ); paint_button( hWnd, btn_type, ODA_SELECT ); } - if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) - BUTTON_CheckAutoRadioButton( hWnd ); break; case BM_GETSTATE: @@ -961,13 +959,12 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) parent = GetParent(hwnd); /* make sure that starting control is not disabled or invisible */ - start = sibling = GetNextDlgGroupItem( parent, hwnd, TRUE ); + start = sibling = hwnd; do { if (!sibling) break; - if ((hwnd != sibling) && - ((GetWindowLongW( sibling, GWL_STYLE) & BS_TYPEMASK) == BS_AUTORADIOBUTTON)) - SendMessageW( sibling, BM_SETCHECK, BST_UNCHECKED, 0 ); + if (SendMessageW( sibling, WM_GETDLGCODE, 0, 0 ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + SendMessageW( sibling, BM_SETCHECK, sibling == hwnd ? BST_CHECKED : BST_UNCHECKED, 0 ); sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); } -- 2.17.1

2 1

[PATCH] user32: Don't force a combobox repaint on WM_SIZE.
by Dmitry Timoshkov 25 Nov '18

25 Nov '18

This breaks z-order based painting and causes side effects for applications that during the WM_PAINT processing reference internal data associated with a not fully initialized window. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 31ec6af526..59c2e6484c 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1536,7 +1536,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); } -- 2.17.1

1 0

[PATCH] kernel32: Implement GetCurrentThreadStackLimits
by André Hentschel 25 Nov '18

25 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46179 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- ...api-ms-win-core-processthreads-l1-1-1.spec | 2 +- ...api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/thread.c | 26 +++++++++++++++++++ dlls/kernel32/thread.c | 12 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 563bd79b67..708a8eff09 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -15,7 +15,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -@ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess @ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 85830a11fc..a29ef43566 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -15,7 +15,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -@ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess @ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 85fce3725a..ae7bc886c5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -635,6 +635,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() @ stdcall -norelay GetCurrentThreadId() +@ stdcall GetCurrentThreadStackLimits(ptr ptr) @ stdcall -arch=x86_64 GetCurrentUmsThread() @ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index b69d2eb371..f27bbdf2b5 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -76,6 +76,7 @@ #define ARCH "none" #endif +static void (WINAPI *pGetCurrentThreadStackLimits)(PULONG_PTR,PULONG_PTR); static BOOL (WINAPI *pGetThreadPriorityBoost)(HANDLE,PBOOL); static HANDLE (WINAPI *pOpenThread)(DWORD,BOOL,DWORD); static BOOL (WINAPI *pQueueUserWorkItem)(LPTHREAD_START_ROUTINE,PVOID,ULONG); @@ -992,6 +993,29 @@ static VOID test_thread_processor(void) win_skip("Get/SetThreadGroupAffinity not available\n"); } +static VOID test_GetCurrentThreadStackLimits(void) +{ + ULONG_PTR low = 0, high = 0; + + if (!pGetCurrentThreadStackLimits) + { + win_skip("GetCurrentThreadStackLimits not available.\n"); + return; + } + + if (0) + { + /* crashes on native */ + pGetCurrentThreadStackLimits(NULL, NULL); + pGetCurrentThreadStackLimits(NULL, &high); + pGetCurrentThreadStackLimits(&low, NULL); + } + + pGetCurrentThreadStackLimits(&low, &high); + ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "exptected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); + ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "exptected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); +} + static VOID test_GetThreadExitCode(void) { DWORD exitCode, threadid; @@ -1999,6 +2023,7 @@ static void init_funcs(void) so that the compile passes */ #define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) + X(GetCurrentThreadStackLimits); X(GetThreadPriorityBoost); X(OpenThread); X(QueueUserWorkItem); @@ -2084,6 +2109,7 @@ START_TEST(thread) test_TerminateThread(); test_CreateThread_stack(); test_thread_priority(); + test_GetCurrentThreadStackLimits(); test_GetThreadTimes(); test_thread_processor(); test_GetThreadExitCode(); diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index e6b99aed62..deff94e75f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -701,6 +701,18 @@ HANDLE WINAPI GetCurrentThread(void) return (HANDLE)~(ULONG_PTR)1; } +/*********************************************************************** + * GetCurrentThreadStackLimits (KERNEL32.@) + * + * Get the current thread stack limits. + * + */ +void WINAPI GetCurrentThreadStackLimits(ULONG_PTR *low, ULONG_PTR *high) +{ + *low = (ULONG_PTR)NtCurrentTeb()->DeallocationStack; + *high = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase; +} + #ifdef __i386__ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 752d489fba..649bf96300 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -471,7 +471,7 @@ # @ stub GetCurrentTargetPlatformContext @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -# @ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) kernel32.GetDateFormatEx @ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW -- 2.17.1

1 0

[PATCH] msvcp90: Add missing break in time_get::do_get (coverity).
by Piotr Caban 25 Nov '18

25 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

Release 4.0
by Alexandre Julliard 25 Nov '18

25 Nov '18

Folks, As the end of the year approaches, we will soon be entering into everybody's favorite season: code freeze! Following the timing of previous years, the plan is for code freeze to start with the next release, on December 7. We'll then have weekly release candidates for a month or so, with the final 4.0 in January. So if there are things you want to get into 4.0, now is the time to submit them... -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH 1/6] ntoskrnl.exe: Implement KeWaitForMultipleObjects().
by Zebediah Figura 25 Nov '18

25 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- We have plenty of space in which to store a kernel handle inside a DISPATCHER_HEADER. However, the storage is volatile, and there is no way to know when to close it. Therefore, we create the handle when KeWaitForMultipleObjects() is called, and keep it open as long as at least one thread is waiting on the object. dlls/ntoskrnl.exe/Makefile.in | 3 +- dlls/ntoskrnl.exe/ntoskrnl.c | 13 ----- dlls/ntoskrnl.exe/sync.c | 114 ++++++++++++++++++++++++++++++++++++++++++ include/ddk/ntddk.h | 9 ---- include/ddk/wdm.h | 10 ++++ 5 files changed, 126 insertions(+), 23 deletions(-) create mode 100644 dlls/ntoskrnl.exe/sync.c diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index afb22fe3e0..8cafaada85 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -5,6 +5,7 @@ DELAYIMPORTS = setupapi user32 C_SRCS = \ instr.c \ - ntoskrnl.c + ntoskrnl.c \ + sync.c RC_SRCS = ntoskrnl.rc diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3b42e29b27..4c84a789d6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2488,19 +2488,6 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, return STATUS_NOT_IMPLEMENTED; } -/*********************************************************************** - * KeWaitForMultipleObjects (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG Count, PVOID Object[], WAIT_TYPE WaitType, - KWAIT_REASON WaitReason, KPROCESSOR_MODE WaitMode, - BOOLEAN Alertable, PLARGE_INTEGER Timeout, - PKWAIT_BLOCK WaitBlockArray) -{ - FIXME( "stub: %u, %p, %d, %d, %d, %d, %p, %p\n", Count, Object, WaitType, WaitReason, WaitMode, - Alertable, Timeout, WaitBlockArray ); - return STATUS_NOT_IMPLEMENTED; -} - /*********************************************************************** * IoRegisterFileSystem (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c new file mode 100644 index 0000000000..19af4f677a --- /dev/null +++ b/dlls/ntoskrnl.exe/sync.c @@ -0,0 +1,114 @@ +/* + * Kernel synchronization + * + * Copyright (C) 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/ntddk.h" +#include "ddk/wdm.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); + +enum object_type +{ + TYPE_MANUAL_EVENT = 0, + TYPE_AUTO_EVENT = 1, +}; + +static CRITICAL_SECTION sync_cs; +static CRITICAL_SECTION_DEBUG sync_cs_debug = +{ + 0, 0, &sync_cs, + { &sync_cs_debug.ProcessLocksList, &sync_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": sync_cs") } +}; +static CRITICAL_SECTION sync_cs = { &sync_cs_debug, -1, 0, 0, 0, 0 }; + +/*********************************************************************** + * KeWaitForMultipleObjects (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], + WAIT_TYPE wait_type, KWAIT_REASON reason, KPROCESSOR_MODE mode, + BOOLEAN alertable, LARGE_INTEGER *timeout, KWAIT_BLOCK *wait_blocks) +{ + DISPATCHER_HEADER **objs = (DISPATCHER_HEADER **)pobjs; + HANDLE handles[MAXIMUM_WAIT_OBJECTS]; + NTSTATUS ret; + ULONG i; + + TRACE("count %u, objs %p, wait_type %u, reason %u, mode %d, alertable %u, timeout %p, wait_blocks %p.\n", + count, objs, wait_type, reason, mode, alertable, timeout, wait_blocks); + + /* We co-opt DISPATCHER_HEADER.WaitListHead: + * Blink stores a handle to the synchronization object, + * Flink stores the number of threads currently waiting on this object. */ + + EnterCriticalSection( &sync_cs ); + for (i = 0; i < count; i++) + { + ++*((ULONG_PTR *)&objs[i]->WaitListHead.Flink); + if (!objs[i]->WaitListHead.Blink) + { + switch (objs[i]->Type) + { + case TYPE_MANUAL_EVENT: + objs[i]->WaitListHead.Blink = CreateEventW( NULL, TRUE, objs[i]->SignalState, NULL ); + break; + case TYPE_AUTO_EVENT: + objs[i]->WaitListHead.Blink = CreateEventW( NULL, FALSE, objs[i]->SignalState, NULL ); + break; + } + } + + handles[i] = objs[i]->WaitListHead.Blink; + } + LeaveCriticalSection( &sync_cs ); + + ret = NtWaitForMultipleObjects( count, handles, (wait_type == WaitAny), alertable, timeout ); + + EnterCriticalSection( &sync_cs ); + for (i = 0; i < count; i++) + { + if (ret == i || (!ret && wait_type == WaitAll)) + { + switch (objs[i]->Type) + { + case TYPE_AUTO_EVENT: + objs[i]->SignalState = FALSE; + break; + } + } + + if (!--*((ULONG_PTR *)&objs[i]->WaitListHead.Flink)) + { + CloseHandle(objs[i]->WaitListHead.Blink); + objs[i]->WaitListHead.Blink = NULL; + } + } + LeaveCriticalSection( &sync_cs ); + + return ret; +} diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index fdf035d148..dc051e1e18 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -140,15 +140,6 @@ typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION LARGE_INTEGER ValidDataLength; } FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; -typedef struct _KWAIT_BLOCK { - LIST_ENTRY WaitListEntry; - struct _KTHREAD *RESTRICTED_POINTER Thread; - PVOID Object; - struct _KWAIT_BLOCK *RESTRICTED_POINTER NextWaitBlock; - USHORT WaitKey; - USHORT WaitType; -} KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; - typedef struct _RTL_BALANCED_LINKS { struct _RTL_BALANCED_LINKS *Parent; struct _RTL_BALANCED_LINKS *LeftChild; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cd057d5a9f..ec2fc151ec 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -144,6 +144,15 @@ typedef enum _KWAIT_REASON MaximumWaitReason, } KWAIT_REASON; +typedef struct _KWAIT_BLOCK { + LIST_ENTRY WaitListEntry; + struct _KTHREAD *RESTRICTED_POINTER Thread; + PVOID Object; + struct _KWAIT_BLOCK *RESTRICTED_POINTER NextWaitBlock; + USHORT WaitKey; + USHORT WaitType; +} KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; + typedef struct _ALLOCATE_FUNCTION *PALLOCATE_FUNCTION; typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; @@ -1422,6 +1431,7 @@ LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY); +NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG,void*[],WAIT_TYPE,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*,KWAIT_BLOCK*); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); -- 2.14.1

1 5

[PATCH] ntdll: Use 32bit when COM header marks it required
by Brendan McGrath 24 Nov '18

24 Nov '18

Currently, when using wine64 to to load a .NET application which has the 32-bit required flag switched on, it fails with a c0000017 error (ERROR_NOT_ENOUGH_MEMORY). (This used to be the error for all 32-bit .NET applications run via wine64 until 926dd780697852b375ec0a193c762e7723a3f5e6) This patch allows applications marked with the 32-bit required flag to fallback to execution under 32-bit wine. --- dlls/ntdll/loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5bded9955fe5..d6bef36a9147 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2138,9 +2138,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) if (!info->contains_code) return TRUE; if (info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) { - if (!convert_to_pe64( module, info )) return FALSE; + return convert_to_pe64( module, info ); } - if (info->image_flags & IMAGE_FLAGS_ComPlusILOnly) return TRUE; return FALSE; #else return FALSE; /* no wow64 support on other platforms */ -- 2.17.1

1 1

[PATCH] winegcc: don't rely on PATH to find winebuild.
by Andre Heider 24 Nov '18

24 Nov '18

This also avoids mixing binaries of multiple WINE installations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40245 Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- tools/winegcc/Makefile.in | 1 + tools/winegcc/winegcc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index daeb91be1e..d39249d70f 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ winegcc_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ + -DBINDIR="\"${bindir}\"" \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3365..87fd661b3f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -733,7 +733,7 @@ static strarray *get_winebuild_args(struct options *opts) const char* winebuild = getenv("WINEBUILD"); strarray *spec_args = strarray_alloc(); - if (!winebuild) winebuild = "winebuild"; + if (!winebuild) winebuild = BINDIR "/winebuild"; strarray_add( spec_args, winebuild ); if (verbose) strarray_add( spec_args, "-v" ); if (keep_generated) strarray_add( spec_args, "--save-temps" ); -- 2.19.1

2 3

[PATCH] hid: Implement HidP_SetUsageValue
by Aric Stewart 23 Nov '18

23 Nov '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 67 insertions(+), 1 deletion(-)

1 0

[PATCH v3 1/7] comctl32/tests: Confirm that emptying the listbox sends a LB_RESETCONTENT to itself
by Gabriel Ivăncescu 23 Nov '18

23 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/tests/listbox.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 43da3ca..d457b13 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -110,6 +110,15 @@ static HWND create_listbox(DWORD add_style, HWND parent) return handle; } +static UINT lb_resetcontent_count; +static WNDPROC lb_test_subclass_proc_prev; +static LRESULT WINAPI lb_test_subclass_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == LB_RESETCONTENT) lb_resetcontent_count++; + + return CallWindowProcW(lb_test_subclass_proc_prev, hwnd, msg, wParam, lParam); +} + struct listbox_prop { DWORD add_style; @@ -227,6 +236,17 @@ static void run_test(DWORD style, const struct listbox_test test) res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); ok(res == 4, "Expected 4 items, got %d\n", res); + /* Confirm that emptying the listbox sends a LB_RESETCONTENT to itself */ + lb_test_subclass_proc_prev = (WNDPROC)SetWindowLongPtrW(hLB, GWLP_WNDPROC, (LONG_PTR)lb_test_subclass_proc); + + lb_resetcontent_count = 0; + for (i = 4; i--;) + { + res = SendMessageA(hLB, LB_DELETESTRING, 0, 0); + ok(res == i, "Expected %d items, got %d\n", i, res); + } + ok(lb_resetcontent_count == 1, "Expected 1 LB_RESETCONTENT message, got %u\n", lb_resetcontent_count); + DestroyWindow(hLB); } @@ -1798,6 +1818,14 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + /* Confirm that emptying the listbox sends a LB_RESETCONTENT to itself */ + lb_test_subclass_proc_prev = (WNDPROC)SetWindowLongPtrW(listbox, GWLP_WNDPROC, (LONG_PTR)lb_test_subclass_proc); + + lb_resetcontent_count = 0; + ret = SendMessageA(listbox, LB_SETCOUNT, 0, 0); + ok(ret == 0, "got %d\n", ret); + ok(lb_resetcontent_count == 1, "Expected 1 LB_RESETCONTENT message, got %u\n", lb_resetcontent_count); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i) -- 2.19.1

5 23

[PATCH 5/5] wined3d: Get rid of the redundant WINED3D_TEXTURE_CREATE_MAPPABLE flag in surface_convert_format().
by Henri Verbeet 23 Nov '18

23 Nov '18

We already set WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 18542e1b741..85f94899cd6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -640,8 +640,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr desc.height = wined3d_texture_get_level_height(src_texture, texture_level); desc.depth = 1; desc.size = 0; - if (FAILED(wined3d_texture_create(device, &desc, 1, 1, - WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_DISCARD, + if (FAILED(wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_DISCARD, NULL, NULL, &wined3d_null_parent_ops, &dst_texture))) { ERR("Failed to create a destination texture for conversion.\n"); -- 2.11.0

2 1

[PATCH 4/5] d3d8: Pass wined3d parameter types to d3d8_device_create_surface().
by Henri Verbeet 23 Nov '18

23 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 67996a78e70..3c83811103f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1144,29 +1144,26 @@ static HRESULT WINAPI d3d8_device_CreateIndexBuffer(IDirect3DDevice8 *iface, UIN return D3D_OK; } -static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width, UINT height, - D3DFORMAT format, DWORD flags, IDirect3DSurface8 **surface, UINT usage, D3DPOOL pool, - D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) +static HRESULT d3d8_device_create_surface(struct d3d8_device *device, enum wined3d_format_id format, + enum wined3d_multisample_type multisample_type, unsigned int bind_flags, unsigned int access, + unsigned int width, unsigned int height, IDirect3DSurface8 **surface) { struct wined3d_resource_desc desc; struct d3d8_surface *surface_impl; struct wined3d_texture *texture; HRESULT hr; - TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p, " - "usage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", - device, width, height, format, flags, surface, - usage, pool, multisample_type, multisample_quality); + TRACE("device %p, format %#x, multisample_type %#x, bind_flags %#x, " + "access %#x, width %u, height %u, surface %p.\n", + device, format, multisample_type, bind_flags, access, width, height, surface); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; - desc.format = wined3dformat_from_d3dformat(format); + desc.format = format; desc.multisample_type = multisample_type; - desc.multisample_quality = multisample_quality; - desc.usage = usage & WINED3DUSAGE_MASK; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; - desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); - desc.access = wined3daccess_from_d3dpool(pool, usage); + desc.multisample_quality = 0; + desc.usage = 0; + desc.bind_flags = bind_flags; + desc.access = access; desc.width = width; desc.height = height; desc.depth = 1; @@ -1175,7 +1172,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width wined3d_mutex_lock(); if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &desc, - 1, 1, flags, NULL, NULL, &d3d8_null_wined3d_parent_ops, &texture))) + 1, 1, 0, NULL, NULL, &d3d8_null_wined3d_parent_ops, &texture))) { wined3d_mutex_unlock(); WARN("Failed to create texture, hr %#x.\n", hr); @@ -1198,7 +1195,7 @@ static HRESULT WINAPI d3d8_device_CreateRenderTarget(IDirect3DDevice8 *iface, UI IDirect3DSurface8 **surface) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - DWORD flags = 0; + unsigned int access = WINED3D_RESOURCE_ACCESS_GPU; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, lockable %#x, surface %p.\n", iface, width, height, format, multisample_type, lockable, surface); @@ -1208,10 +1205,10 @@ static HRESULT WINAPI d3d8_device_CreateRenderTarget(IDirect3DDevice8 *iface, UI *surface = NULL; if (lockable) - flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; + access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - return d3d8_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, 0); + return d3d8_device_create_surface(device, wined3dformat_from_d3dformat(format), + multisample_type, WINED3D_BIND_RENDER_TARGET, access, width, height, surface); } static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *iface, @@ -1228,9 +1225,9 @@ static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *if *surface = NULL; - /* TODO: Verify that Discard is false */ - return d3d8_device_create_surface(device, width, height, format, 0, - surface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, 0); + return d3d8_device_create_surface(device, wined3dformat_from_d3dformat(format), + multisample_type, WINED3D_BIND_DEPTH_STENCIL, + WINED3D_RESOURCE_ACCESS_GPU, width, height, surface); } /* IDirect3DDevice8Impl::CreateImageSurface returns surface with pool type SYSTEMMEM */ @@ -1238,14 +1235,16 @@ static HRESULT WINAPI d3d8_device_CreateImageSurface(IDirect3DDevice8 *iface, UI UINT height, D3DFORMAT format, IDirect3DSurface8 **surface) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + unsigned int access = WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; TRACE("iface %p, width %u, height %u, format %#x, surface %p.\n", iface, width, height, format, surface); *surface = NULL; - return d3d8_device_create_surface(device, width, height, format, 0, - surface, 0, D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0); + return d3d8_device_create_surface(device, wined3dformat_from_d3dformat(format), + WINED3D_MULTISAMPLE_NONE, 0, access, width, height, surface); } static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, -- 2.11.0

2 1

[PATCH 3/5] d3d9: Pass wined3d parameter types to d3d9_device_create_surface().
by Henri Verbeet 23 Nov '18

23 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 56 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0dec4ce215a..f19e2ae6f65 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1377,29 +1377,28 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U return D3D_OK; } -static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width, UINT height, - D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool, - D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, void *user_mem) +static HRESULT d3d9_device_create_surface(struct d3d9_device *device, unsigned int flags, + enum wined3d_format_id format, enum wined3d_multisample_type multisample_type, + unsigned int multisample_quality, unsigned int usage, unsigned int bind_flags, unsigned int access, + unsigned int width, unsigned int height, void *user_mem, IDirect3DSurface9 **surface) { struct wined3d_resource_desc desc; struct d3d9_surface *surface_impl; struct wined3d_texture *texture; HRESULT hr; - TRACE("device %p, width %u, height %u, format %#x, flags %#x, surface %p.\n" - "usage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", - device, width, height, format, flags, surface, usage, pool, - multisample_type, multisample_quality); + TRACE("device %p, flags %#x, format %#x, multisample_type %#x, multisample_quality %u, " + "usage %#x, bind_flags %#x, access %#x, width %u, height %u, user_mem %p, surface %p.\n", + device, flags, format, multisample_type, multisample_quality, usage, + bind_flags, access, width, height, user_mem, surface); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; - desc.format = wined3dformat_from_d3dformat(format); + desc.format = format; desc.multisample_type = multisample_type; desc.multisample_quality = multisample_quality; - desc.usage = usage & WINED3DUSAGE_MASK; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; - desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage); - desc.access = wined3daccess_from_d3dpool(pool, usage); + desc.usage = usage; + desc.bind_flags = bind_flags; + desc.access = access; desc.width = width; desc.height = height; desc.depth = 1; @@ -1457,7 +1456,7 @@ static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - DWORD flags = 0; + unsigned int access = WINED3D_RESOURCE_ACCESS_GPU; TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" "lockable %#x, surface %p, shared_handle %p.\n", @@ -1477,10 +1476,10 @@ static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, } if (lockable) - flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; + access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); + return d3d9_device_create_surface(device, 0, wined3dformat_from_d3dformat(format), multisample_type, + multisample_quality, 0, WINED3D_BIND_RENDER_TARGET, access, width, height, NULL, surface); } static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex *iface, UINT width, UINT height, @@ -1510,8 +1509,9 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurface(IDirect3DDevice9Ex * if (discard) flags |= WINED3D_TEXTURE_CREATE_DISCARD; - return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); + return d3d9_device_create_surface(device, flags, wined3dformat_from_d3dformat(format), + multisample_type, multisample_quality, 0, WINED3D_BIND_DEPTH_STENCIL, + WINED3D_RESOURCE_ACCESS_GPU, width, height, NULL, surface); } @@ -1785,6 +1785,7 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex HANDLE *shared_handle) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + unsigned int usage, access; void *user_mem = NULL; TRACE("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p.\n", @@ -1818,8 +1819,14 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex } } - return d3d9_device_create_surface(device, width, height, format, - WINED3D_TEXTURE_CREATE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0, user_mem); + usage = 0; + if (pool == D3DPOOL_SCRATCH) + usage |= WINED3DUSAGE_SCRATCH; + access = wined3daccess_from_d3dpool(pool, usage) + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + + return d3d9_device_create_surface(device, 0, wined3dformat_from_d3dformat(format), + WINED3D_MULTISAMPLE_NONE, 0, usage, 0, access, width, height, user_mem, surface); } static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWORD idx, IDirect3DSurface9 *surface) @@ -3885,7 +3892,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); - if (usage & D3DUSAGE_DEPTHSTENCIL) + if (usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) { WARN("Invalid usage %#x.\n", usage); return D3DERR_INVALIDCALL; @@ -3898,8 +3905,9 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex flags |= WINED3D_TEXTURE_CREATE_DISCARD; *surface = NULL; - return d3d9_device_create_surface(device, width, height, format, flags, surface, - D3DUSAGE_DEPTHSTENCIL | usage, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); + return d3d9_device_create_surface(device, flags, wined3dformat_from_d3dformat(format), + multisample_type, multisample_quality, usage & WINED3DUSAGE_MASK, WINED3D_BIND_DEPTH_STENCIL, + WINED3D_RESOURCE_ACCESS_GPU, width, height, NULL, surface); } static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, -- 2.11.0

2 1

[PATCH 2/5] d3d9: Disallow creating managed 2D textures on d3d9ex devices.
by Henri Verbeet 23 Nov '18

23 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 4 ++-- dlls/d3d9/texture.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 6601c94631f..82acaf4d6a8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4273,8 +4273,8 @@ static void test_resource_access(void) case SURFACE_2D: hr = IDirect3DDevice9Ex_CreateTexture(device, 16, 16, 1, tests[j].usage, format, tests[j].pool, &texture_2d, NULL); - todo_wine_if(!tests[j].valid && !tests[j].usage && (tests[j].format == FORMAT_DEPTH - || tests[j].pool == D3DPOOL_MANAGED)) + todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH + && !tests[j].usage && tests[j].pool != D3DPOOL_MANAGED) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 0c585190e36..c73cbc0d523 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1301,6 +1301,12 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, DWORD flags = 0; HRESULT hr; + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl; d3d9_resource_init(&texture->resource); list_init(&texture->rtv_list); -- 2.11.0

2 1

[PATCH 4/6] winhttp: Use the thread pool for the connection collector.
by Hans Leidekker 23 Nov '18

23 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 61af6ea977..0f9580734d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1457,7 +1457,7 @@ void release_host( struct hostdata *host ) static BOOL connection_collector_running; -static DWORD WINAPI connection_collector(void *arg) +static void CALLBACK connection_collector( TP_CALLBACK_INSTANCE *instance, void *ctx ) { unsigned int remaining_connections; struct netconn *netconn, *next_netconn; @@ -1483,10 +1483,7 @@ static DWORD WINAPI connection_collector(void *arg) list_remove(&netconn->entry); netconn_close(netconn); } - else - { - remaining_connections++; - } + else remaining_connections++; } } @@ -1495,7 +1492,7 @@ static DWORD WINAPI connection_collector(void *arg) LeaveCriticalSection(&connection_pool_cs); } while(remaining_connections); - FreeLibraryAndExitThread( winhttp_instance, 0 ); + FreeLibrary( winhttp_instance ); } static void cache_connection( struct netconn *netconn ) @@ -1510,20 +1507,11 @@ static void cache_connection( struct netconn *netconn ) if (!connection_collector_running) { HMODULE module; - HANDLE thread; - GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)winhttp_instance, &module ); + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)winhttp_instance, &module ); - thread = CreateThread(NULL, 0, connection_collector, NULL, 0, NULL); - if (thread) - { - CloseHandle( thread ); - connection_collector_running = TRUE; - } - else - { - FreeLibrary( winhttp_instance ); - } + if (TrySubmitThreadpoolCallback( connection_collector, NULL, NULL )) connection_collector_running = TRUE; + else FreeLibrary( winhttp_instance ); } LeaveCriticalSection( &connection_pool_cs ); -- 2.11.0

3 2

[PATCH 1/5] d3d9: Disallow creating managed cube textures on d3d9ex devices.
by Henri Verbeet 23 Nov '18

23 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 4 ++-- dlls/d3d9/texture.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 538729672b5..6601c94631f 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4289,8 +4289,8 @@ static void test_resource_access(void) case SURFACE_CUBE: hr = IDirect3DDevice9Ex_CreateCubeTexture(device, 16, 1, tests[j].usage, format, tests[j].pool, &texture_cube, NULL); - todo_wine_if(!tests[j].valid && !tests[j].usage && (tests[j].format == FORMAT_DEPTH - || tests[j].pool == D3DPOOL_MANAGED)) + todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH + && !tests[j].usage && tests[j].pool != D3DPOOL_MANAGED) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 456e41e82e2..0c585190e36 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1383,6 +1383,12 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic DWORD flags = 0; HRESULT hr; + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl; d3d9_resource_init(&texture->resource); list_init(&texture->rtv_list); -- 2.11.0

2 1

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 23 Nov '18

23 Nov '18

From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 787dd9aa23..b377dc8ae0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-25 11:43-0500\n" +"PO-Revision-Date: 2018-11-21 10:10-0600\n" "Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" @@ -2414,16 +2414,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "您已成功完成证书导出向导。" #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "选择证书存储" +msgstr "选择证书" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "选择您要使用的证书存储" +msgstr "选择您要使用的证书" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2936,20 +2932,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "注意：证书的私钥不可导出。" #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "预期用途：" +msgstr "预期用途" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "位置" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "选择证书存储" +msgstr "选择证书" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH 1/3] wined3d: Do not crash when trying to draw to buffer render target.
by Józef Kucia 23 Nov '18

23 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4cd46c66c677..4096673d3166 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4840,6 +4840,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!(rtv = fb->render_targets[0])) rtv = fb->depth_stencil; + + if (rtv && rtv->resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer render targets not implemented.\n"); + return; + } + if (rtv) context = context_acquire(device, wined3d_texture_from_resource(rtv->resource), rtv->sub_resource_idx); else -- 2.18.1

2 1

[PATCH 3/3] wined3d: Propagate HRESULTs in wined3d_swapchain_resize_target().
by Józef Kucia 23 Nov '18

23 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b95623be7ca8..43582ceb2eea 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1358,7 +1358,7 @@ HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchai &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; + return hr; } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); -- 2.18.1

2 1

[PATCH 2/3] dxgi/tests: Add missing ok() call.
by Józef Kucia 23 Nov '18

23 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 9073a03554dd..b3a470506bf4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2433,10 +2433,11 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, } ret = MoveWindow(window, 0, 0, 0, 0, TRUE); - ok(ret, "MoveWindow failed.\n"); + ok(ret, "Failed to move window.\n"); GetWindowRect(window, &e->window_rect); GetClientRect(window, &e->client_rect); ret = MoveWindow(window, 0, 0, 200, 200, TRUE); + ok(ret, "Failed to move window.\n"); memset(&mode, 0, sizeof(mode)); hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); -- 2.18.1

3 2

[PATCH 4/5] d3d11/tests: Add test for SV_VertexID.
by Józef Kucia 23 Nov '18

23 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 190 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e0a3fed7155..2c9e5f1e4557 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11736,6 +11736,195 @@ static void test_instance_id(void) release_test_context(&test_context); } +static void test_vertex_id(void) +{ + static const DWORD vs_code[] = + { +#if 0 + uint4 main(uint id : ID, uint instance_id : SV_InstanceID, uint vertex_id : SV_VertexID) : OUTPUT + { + return uint4(id, instance_id, vertex_id, 0); + } +#endif + 0x43425844, 0x5625197b, 0x588ccf8f, 0x48694905, 0x961d19ca, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x000000a4, 0x000000d4, 0x4e475349, 0x00000070, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x00000053, 0x00000000, 0x00000008, + 0x00000001, 0x00000001, 0x00000101, 0x00000061, 0x00000000, 0x00000006, 0x00000001, 0x00000002, + 0x00000101, 0x53004449, 0x6e495f56, 0x6e617473, 0x44496563, 0x5f565300, 0x74726556, 0x44497865, + 0xababab00, 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x0000000f, 0x5054554f, 0xab005455, 0x52444853, 0x00000094, 0x00010040, + 0x00000025, 0x0300005f, 0x00101012, 0x00000000, 0x04000060, 0x00101012, 0x00000001, 0x00000008, + 0x04000060, 0x00101012, 0x00000002, 0x00000006, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010100a, + 0x00000001, 0x05000036, 0x00102042, 0x00000000, 0x0010100a, 0x00000002, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, + }; + D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"ID", 0, DXGI_FORMAT_R32_UINT, 0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const D3D11_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "OUTPUT", 0, 0, 4, 0}, + }; + static const unsigned int vertices[] = + { + 0, + 1, + 2, + + 3, + 4, + 5, + + 6, + 7, + 8, + + 5, + 6, + 7, + }; + static const unsigned int indices[] = + { + 6, 7, 8, + + 0, 1, 2, + }; + struct uvec4 expected_values[] = + { + {0, 0, 0}, + {1, 0, 1}, + {2, 0, 2}, + {0, 1, 0}, + {1, 1, 1}, + {2, 1, 2}, + + {3, 0, 0}, + {4, 0, 1}, + {5, 0, 2}, + + {6, 0, 6}, + {7, 0, 7}, + {8, 0, 8}, + {6, 1, 6}, + {7, 1, 7}, + {8, 1, 8}, + + {5, 0, 0}, + {6, 0, 1}, + {7, 0, 2}, + }; + + BOOL found_values[ARRAY_SIZE(expected_values)] = {0}; + BOOL used_values[ARRAY_SIZE(expected_values)] = {0}; + struct d3d11_test_context test_context; + D3D11_QUERY_DATA_SO_STATISTICS data; + ID3D11Buffer *vb, *ib, *so_buffer; + ID3D11InputLayout *input_layout; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + struct resource_readback rb; + unsigned int stride, offset; + ID3D11Asynchronous *query; + ID3D11GeometryShader *gs; + ID3D11VertexShader *vs; + ID3D11Device *device; + unsigned int count; + unsigned int i, j; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + query_desc.Query = D3D11_QUERY_SO_STATISTICS; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(hr == S_OK, "Failed to create input layout, hr %#x.\n", hr); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(hr == S_OK, "Failed to create vertex shader, hr %#x.\n", hr); + + stride = 16; + hr = ID3D11Device_CreateGeometryShaderWithStreamOutput(device, vs_code, sizeof(vs_code), + so_declaration, ARRAY_SIZE(so_declaration), + &stride, 1, D3D11_SO_NO_RASTERIZED_STREAM, NULL, &gs); + ok(hr == S_OK, "Failed to create geometry shader with stream output, hr %#x.\n", hr); + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(vertices), vertices); + ib = create_buffer(device, D3D11_BIND_INDEX_BUFFER, sizeof(indices), indices); + so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); + + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 0); + offset = 0; + stride = sizeof(*vertices); + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + + ID3D11DeviceContext_Begin(context, query); + + ID3D11DeviceContext_DrawInstanced(context, 3, 2, 0, 0); + ID3D11DeviceContext_DrawInstanced(context, 3, 1, 3, 16); + + ID3D11DeviceContext_DrawIndexedInstanced(context, 3, 2, 0, 0, 0); + ID3D11DeviceContext_DrawIndexedInstanced(context, 3, 1, 3, 9, 7); + + ID3D11DeviceContext_End(context, query); + + get_query_data(context, query, &data, sizeof(data)); + count = data.NumPrimitivesWritten; + ok(count == ARRAY_SIZE(expected_values), "Got unexpected value %u.\n", count); + + count = min(count, ARRAY_SIZE(used_values)); + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + for (j = 0; j < count; ++j) + { + if (!used_values[j] && compare_uvec4(get_readback_uvec4(&rb, j, 0), &expected_values[i])) + { + found_values[i] = TRUE; + used_values[j] = TRUE; + break; + } + } + } + + for (i = 0; i < count; ++i) + { + const struct uvec4 *v = get_readback_uvec4(&rb, i, 0); + ok(used_values[i], "Found unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", v->x, v->y, v->z, v->w); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + ok(found_values[i], "Failed to find value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + expected_values[i].x, expected_values[i].y, expected_values[i].z, expected_values[i].w); + } + + ID3D11Asynchronous_Release(query); + ID3D11Buffer_Release(so_buffer); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); + ID3D11GeometryShader_Release(gs); + ID3D11VertexShader_Release(vs); + ID3D11InputLayout_Release(input_layout); + release_test_context(&test_context); +} + static void test_fragment_coords(void) { struct d3d11_test_context test_context; @@ -29024,6 +29213,7 @@ START_TEST(d3d11) queue_test(test_clear_state); queue_test(test_il_append_aligned); queue_test(test_instance_id); + queue_test(test_vertex_id); queue_test(test_fragment_coords); queue_test(test_initial_texture_data); queue_test(test_update_subresource); -- 2.18.1

3 3

[PATCH 2/5] wined3d: Set base vertex index also for non-indexed draws.
by Józef Kucia 23 Nov '18

23 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 095e3e4d00ea..ca79b7117142 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -857,6 +857,8 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (op->parameters.indexed && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) base_vertex_idx = direct->base_vertex_idx; + else if (!op->parameters.indexed) + base_vertex_idx = direct->start_idx; } /* ARB_draw_indirect always supports a base vertex offset. */ -- 2.18.1

2 1

[PATCH 5/5] d3d11/tests: Get rid of unnecessary clear from test_so_statistics_query().
by Józef Kucia 23 Nov '18

23 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2c9e5f1e4557..d924a355a926 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5813,7 +5813,6 @@ static void test_so_statistics_query(void) unsigned int i; HRESULT hr; - static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const DWORD vs_code[] = { #if 0 @@ -5994,8 +5993,6 @@ static void test_so_statistics_query(void) ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); - query_desc.Query = D3D11_QUERY_SO_STATISTICS; query_desc.MiscFlags = 0; hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); -- 2.18.1

3 2

[PATCH 3/5] wined3d: Fix mapping of SV_VertexID to gl_VertexID.
by Józef Kucia 23 Nov '18

23 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Based on a patch by Andrew Wesie. In Direct3D, SV_VertexID generally starts from zero. In OpenGL, gl_VertexID starts from "first" parameter passed to glDrawArrays(), or from "baseVertex" parameter for indexed draw calls. The GL_ARB_shader_draw_parameters extension doesn't help us much because gl_BaseVertexARB is zero for non-indexed draw calls [1]. If gl_BaseVertexARB would be equal to "first" for non-indexed draw calls, we could simply use gl_VertexID - gl_BaseVertexARB. After this commit, SV_VertexID is still wrong for indirect draw calls because we cannot easily access the "first" field from struct DrawArraysIndirectCommand in a vertex shader. [1] - The ARB_shader_draw_parameters spec says that "In the case where the command has no <baseVertex> parameter, the value of <gl_BaseVertexARB> is zero." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 29 +++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ca79b7117142..c7c0c0bddb81 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -845,6 +845,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; + struct wined3d_device *device = cs->device; int base_vertex_idx, load_base_vertex_idx; struct wined3d_state *state = &cs->state; const struct wined3d_cs_draw *op = data; @@ -867,7 +868,13 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) else load_base_vertex_idx = 0; - state->base_vertex_index = base_vertex_idx; + if (state->base_vertex_index != base_vertex_idx) + { + state->base_vertex_index = base_vertex_idx; + for (i = 0; i < device->context_count; ++i) + device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_BASE_VERTEX_ID; + } + if (state->load_base_vertex_index != load_base_vertex_idx) { state->load_base_vertex_index = load_base_vertex_idx; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 545e1bff9f52..ad59e97e3fc5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -155,6 +155,7 @@ struct glsl_vs_program GLint uniform_i_locations[WINED3D_MAX_CONSTS_I]; GLint uniform_b_locations[WINED3D_MAX_CONSTS_B]; GLint pos_fixup_location; + GLint base_vertex_id_location; GLint modelview_matrix_location[MAX_VERTEX_BLENDS]; GLint projection_matrix_location; @@ -1775,22 +1776,21 @@ static void shader_glsl_load_color_key_constant(const struct glsl_ps_program *ps static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { - const struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; + const struct glsl_context_data *ctx_data = context->shader_backend_data; + struct glsl_shader_prog_link *prog = ctx_data->glsl_program; const struct wined3d_gl_info *gl_info = context->gl_info; - struct shader_glsl_priv *priv = shader_priv; float position_fixup[4 * WINED3D_MAX_VIEWPORTS]; + struct shader_glsl_priv *priv = shader_priv; + unsigned int constant_version; DWORD update_mask; - - struct glsl_shader_prog_link *prog = ctx_data->glsl_program; - UINT constant_version; int i; - if (!prog) { - /* No GLSL program set - nothing to do. */ + /* No GLSL program set - nothing to do. */ + if (!prog) return; - } + constant_version = prog->constant_version; update_mask = context->constant_update_mask & prog->constant_update_mask; @@ -1829,6 +1829,12 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context checkGLcall("glUniform4fv"); } + if (update_mask & WINED3D_SHADER_CONST_BASE_VERTEX_ID) + { + GL_EXTCALL(glUniform1i(prog->vs.base_vertex_id_location, state->base_vertex_index)); + checkGLcall("base vertex id"); + } + if (update_mask & WINED3D_SHADER_CONST_FFP_MODELVIEW) { struct wined3d_matrix mat; @@ -2359,8 +2365,8 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b if (e->sysval_semantic == WINED3D_SV_VERTEX_ID) { - shader_addline(buffer, "vec4 vs_in%u = vec4(intBitsToFloat(gl_VertexID), 0.0, 0.0, 0.0);\n", - index); + shader_addline(buffer, "uniform int base_vertex_id;\n"); + shader_addline(buffer, "vec4 vs_in%u = vec4(intBitsToFloat(gl_VertexID - base_vertex_id), 0.0, 0.0, 0.0);\n", index); return; } if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) @@ -10123,6 +10129,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * } vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocation(program_id, "pos_fixup")); + vs->base_vertex_id_location = GL_EXTCALL(glGetUniformLocation(program_id, "base_vertex_id")); for (i = 0; i < MAX_VERTEX_BLENDS; ++i) { @@ -10694,6 +10701,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->constant_update_mask |= WINED3D_SHADER_CONST_VS_B; if (entry->vs.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; + if (entry->vs.base_vertex_id_location != -1) + entry->constant_update_mask |= WINED3D_SHADER_CONST_BASE_VERTEX_ID; shader_glsl_load_program_resources(context, priv, program_id, vshader); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f908ff717324..4e80cc75acfa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -445,6 +445,7 @@ enum wined3d_shader_resource_type #define WINED3D_SHADER_CONST_FFP_LIGHTS 0x00080000 #define WINED3D_SHADER_CONST_FFP_PS 0x00100000 #define WINED3D_SHADER_CONST_FFP_COLOR_KEY 0x00200000 +#define WINED3D_SHADER_CONST_BASE_VERTEX_ID 0x00400000 enum wined3d_shader_register_type { -- 2.18.1

2 1

[PATCH 1/5] wined3d: Set base vertex index in CS state.
by Józef Kucia 23 Nov '18

23 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ffa4951c0ca7..095e3e4d00ea 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -845,17 +845,27 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; + int base_vertex_idx, load_base_vertex_idx; struct wined3d_state *state = &cs->state; const struct wined3d_cs_draw *op = data; - int load_base_vertex_idx; unsigned int i; + base_vertex_idx = 0; + if (!op->parameters.indirect) + { + const struct wined3d_direct_draw_parameters *direct = &op->parameters.u.direct; + + if (op->parameters.indexed && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + base_vertex_idx = direct->base_vertex_idx; + } + /* ARB_draw_indirect always supports a base vertex offset. */ if (!op->parameters.indirect && !gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) load_base_vertex_idx = op->parameters.u.direct.base_vertex_idx; else load_base_vertex_idx = 0; + state->base_vertex_index = base_vertex_idx; if (state->load_base_vertex_index != load_base_vertex_idx) { state->load_base_vertex_index = load_base_vertex_idx; -- 2.18.1

2 1

[PATCH 1/2] testbot: Log $LANG before running the tests.
by Francois Gouget 23 Nov '18

23 Nov '18

It is useful to know the exact locale the tests were run with, particularly since the TestBot may have modified it to add the codeset. In particular this helps diagnosis in case Wine does not recognize the locale (i.e. if WineTest still shows 0409). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineTest.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 4947a12a62..de9f0eda3f 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -86,6 +86,7 @@ sub SetupTest($$) my $BaseName = SetupWineEnvironment($Mission); InfoMsg "\nRunning $Test in the $BaseName Wine\n"; + InfoMsg "LANG=$ENV{LANG}\n"; return $BaseName; } -- 2.19.1

1 1

[PATCH] testbot/testagentd: Add --show-restarts to the usage message.
by Francois Gouget 23 Nov '18

23 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- It is already described with the other options. testbot/src/testagentd/testagentd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index b4a26fc581..b81f7fafd5 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1430,7 +1430,7 @@ int main(int argc, char** argv) } if (opt_usage) { - printf("Usage: %s [--debug] [--detach] [--help] PORT [SRCHOST]\n", name0); + printf("Usage: %s [--debug] [--detach] [--help] [--show-restarts] PORT [SRCHOST]\n", name0); printf("\n"); printf("Provides a simple way to send/receive files and to run scripts on this host.\n"); printf("\n"); -- 2.19.1

1 0

[PATCH] testbot/web: Fix the check for which log to show in full.
by Francois Gouget 23 Nov '18

23 Nov '18

The name of the current log has been decoded so it should not be compared to a uri_escape()'d log filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is not an issue until a locale modifier such as '@latin' ends up in the filename. testbot/web/JobDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index de2f9ccb40..469138f0bd 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -247,7 +247,7 @@ sub InitMoreInfo($) foreach my $Log (@{GetLogFileNames($TaskDir, 1)}) { push @{$More->{$Key}->{Logs}}, $Log; - $More->{$Key}->{Full} = $Log if (uri_escape($Log) eq $Value); + $More->{$Key}->{Full} = $Log if ($Log eq $Value); } $More->{$Key}->{Full} ||= ""; } -- 2.19.1

1 0

[PATCH] testbot: The locale modifier must come after the codeset.
by Francois Gouget 23 Nov '18

23 Nov '18

This fixes SetupWineEnvironment() so it adds the default '.UTF-8' in the right place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 4dda8d51fc..0f1ddb0f00 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -337,7 +337,7 @@ sub SetupWineEnvironment($) my $Lang = $Mission->{lang} || "en_US"; if ($Lang =~ /^[a-zA-Z0-9\(a)_.-]+$/) { - $Lang .= ".UTF-8" if ($Lang !~ /\./); + $Lang =~ s/((a)[a-z]*$|$)/.UTF-8$1/ if ($Lang !~ /\./); $ENV{LANG} = $Lang; } -- 2.19.1

1 0

[PATCH] testbot/web: Show the log filename as a tooltip on the JobDetails page.
by Francois Gouget 23 Nov '18

23 Nov '18

The log filename contains the abbreviated locale if it is not the default. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 469138f0bd..6c8c7ce40c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -304,8 +304,9 @@ sub GenerateMoreInfoLink($$$$;$) my ($self, $LinkKey, $Label, $Set, $Value) = @_; my ($Action, $Url) = $self->GetMoreInfoLink($LinkKey, $Label, $Set, $Value); + my $Title = ($Value =~ /^(.*)\.report$/) ? " title='$1'" : ""; - my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'>$Action $Label</a>"; + my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'$Title>$Action $Label</a>"; if ($Action eq "Hide") { $Html = "<span class='TaskMoreInfoSelected'>$Html</span>"; -- 2.19.1

1 0

[PATCH] testbot: Tweak the locale names.
by Francois Gouget 23 Nov '18

23 Nov '18

Omit the country name when the default is obvious and shorten some exceedingly long ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index e3c049b91b..47e21dab35 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -113,10 +113,23 @@ sub BuildEMailRecipient($$) sub LocaleName($) { my ($Locale) = @_; + $Locale ||= "en_US"; # default if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.|$)/) { - return (code2language($1) || $1) .":". (code2country($2) || $2); + my ($Lang, $Country) = ($1, $2); + my $Name = code2language($Lang) || $Lang; + $Name =~ s/ \(.*$//; + + if (uc($Lang) ne $Country) + { + my $CountryName = $Country eq "US" ? "USA" : + $Country eq "GB" ? "Great Britain" : + (code2country($Country) || $Country); + $CountryName =~ s/(?:, | \().*$//; + $Name .= ":$CountryName"; + } + return $Name; } return $Locale; } -- 2.19.1

1 1

[PATCH 4/4] server: Fix pipe server listen queue initialization.
by Jacek Caban 23 Nov '18

23 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 3/4] server: Remove no longer needed pipe_client struct.
by Jacek Caban 23 Nov '18

23 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 52 +++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 30 deletions(-)

1 0

[PATCH 2/4] server: Store message mode flag only in named_pipe object.
by Jacek Caban 23 Nov '18

23 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)

1 0

[PATCH 1/4] server: Properly handle disconnected pipe in set_named_pipe_info request.
by Jacek Caban 23 Nov '18

23 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 15 ++++++++++++++- server/named_pipe.c | 6 +++++- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[PATCH 2/2] msvcp90: Add time_get<wchar> implementation.
by Piotr Caban 23 Nov '18

23 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- It's a copy of time_get<char> implementation with simple char->wchar changes. The only function that was changed manually is time_get_wchar__Init. dlls/msvcp100/msvcp100.spec | 88 +-- dlls/msvcp110/msvcp110.spec | 168 ++--- dlls/msvcp120/msvcp120.spec | 168 ++--- dlls/msvcp120_app/msvcp120_app.spec | 168 ++--- dlls/msvcp140/msvcp140.spec | 172 ++--- dlls/msvcp70/msvcp70.spec | 76 +-- dlls/msvcp71/msvcp71.spec | 80 +-- dlls/msvcp80/msvcp80.spec | 84 +-- dlls/msvcp90/locale.c | 944 +++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 88 +-- 10 files changed, 1489 insertions(+), 547 deletions(-)

1 0

[PATCH 1/2] msvcp90: Add '_char' suffix to time_get<char> helper functions.
by Piotr Caban 23 Nov '18

23 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)

1 0

[PATCH 3/6] winhttp: Use the thread pool for asynchronous hostname resolution.
by Hans Leidekker 23 Nov '18

23 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index af1d19d212..a1ad0461d4 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -651,42 +651,44 @@ static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct soc return ERROR_SUCCESS; } -struct resolve_args +struct async_resolve { const WCHAR *hostname; INTERNET_PORT port; - struct sockaddr_storage *sa; + struct sockaddr_storage *addr; + DWORD result; + HANDLE done; }; -static DWORD CALLBACK resolve_proc( LPVOID arg ) +static void CALLBACK resolve_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct resolve_args *ra = arg; - return resolve_hostname( ra->hostname, ra->port, ra->sa ); + struct async_resolve *async = ctx; + async->result = resolve_hostname( async->hostname, async->port, async->addr ); + SetEvent( async->done ); } -BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *sa, int timeout ) +BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *addr, int timeout ) { DWORD ret; - if (timeout) + if (!timeout) ret = resolve_hostname( hostname, port, addr ); + else { - DWORD status; - HANDLE thread; - struct resolve_args ra; - - ra.hostname = hostname; - ra.port = port; - ra.sa = sa; - - thread = CreateThread( NULL, 0, resolve_proc, &ra, 0, NULL ); - if (!thread) return FALSE; + struct async_resolve async; - status = WaitForSingleObject( thread, timeout ); - if (status == WAIT_OBJECT_0) GetExitCodeThread( thread, &ret ); - else ret = ERROR_WINHTTP_TIMEOUT; - CloseHandle( thread ); + async.hostname = hostname; + async.port = port; + async.addr = addr; + if (!(async.done = CreateEventW( NULL, FALSE, FALSE, NULL ))) return FALSE; + if (!TrySubmitThreadpoolCallback( resolve_proc, &async, NULL )) + { + CloseHandle( async.done ); + return FALSE; + } + if (WaitForSingleObject( async.done, timeout ) != WAIT_OBJECT_0) ret = ERROR_WINHTTP_TIMEOUT; + else ret = async.result; + CloseHandle( async.done ); } - else ret = resolve_hostname( hostname, port, sa ); if (ret) { -- 2.11.0

2 1

[PATCH 6/6] winhttp: Use the thread pool for COM object requests.
by Hans Leidekker 23 Nov '18

23 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 52 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 766eddabee..8a958979ee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3067,9 +3067,10 @@ struct winhttp_request HINTERNET hrequest; VARIANT data; WCHAR *verb; - HANDLE thread; + HANDLE done; HANDLE wait; HANDLE cancel; + BOOL proc_running; char *buffer; DWORD offset; DWORD bytes_available; @@ -3103,15 +3104,16 @@ static void cancel_request( struct winhttp_request *request ) { if (request->state <= REQUEST_STATE_CANCELLED) return; - SetEvent( request->cancel ); - LeaveCriticalSection( &request->cs ); - WaitForSingleObject( request->thread, INFINITE ); - EnterCriticalSection( &request->cs ); + if (request->proc_running) + { + SetEvent( request->cancel ); + LeaveCriticalSection( &request->cs ); - request->state = REQUEST_STATE_CANCELLED; + WaitForSingleObject( request->done, INFINITE ); - CloseHandle( request->thread ); - request->thread = NULL; + EnterCriticalSection( &request->cs ); + } + request->state = REQUEST_STATE_CANCELLED; } /* critical section must be held */ @@ -3121,7 +3123,7 @@ static void free_request( struct winhttp_request *request ) WinHttpCloseHandle( request->hrequest ); WinHttpCloseHandle( request->hconnect ); WinHttpCloseHandle( request->hsession ); - CloseHandle( request->thread ); + CloseHandle( request->done ); CloseHandle( request->wait ); CloseHandle( request->cancel ); heap_free( request->proxy.lpszProxy ); @@ -3450,6 +3452,7 @@ static void initialize_request( struct winhttp_request *request ) { request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->done = CreateEventW( NULL, FALSE, FALSE, NULL ); request->connect_timeout = 60000; request->send_timeout = 30000; request->receive_timeout = 30000; @@ -3747,19 +3750,22 @@ static void wait_set_status_callback( struct winhttp_request *request, DWORD sta static DWORD wait_for_completion( struct winhttp_request *request ) { HANDLE handles[2] = { request->wait, request->cancel }; + DWORD ret; switch (WaitForMultipleObjects( 2, handles, FALSE, INFINITE )) { case WAIT_OBJECT_0: + ret = request->error; break; case WAIT_OBJECT_0 + 1: - request->error = ERROR_CANCELLED; + ret = request->error = ERROR_CANCELLED; + SetEvent( request->done ); break; default: - request->error = GetLastError(); + ret = request->error = GetLastError(); break; } - return request->error; + return ret; } static HRESULT request_receive( struct winhttp_request *request ) @@ -3917,27 +3923,21 @@ error: return HRESULT_FROM_WIN32( err ); } -static HRESULT request_send_and_receive( struct winhttp_request *request ) -{ - HRESULT hr = request_send( request ); - if (hr == S_OK) hr = request_receive( request ); - return hr; -} - -static DWORD CALLBACK send_and_receive_proc( void *arg ) +static void CALLBACK send_and_receive_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct winhttp_request *request = (struct winhttp_request *)arg; - return request_send_and_receive( request ); + struct winhttp_request *request = (struct winhttp_request *)ctx; + if (request_send( request ) == S_OK) request_receive( request ); + SetEvent( request->done ); } /* critical section must be held */ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) { - HANDLE thread = request->thread; + HANDLE done = request->done; DWORD err, ret; LeaveCriticalSection( &request->cs ); - while ((err = MsgWaitForMultipleObjects( 1, &thread, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) + while ((err = MsgWaitForMultipleObjects( 1, &done, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) { MSG msg; while (PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE )) @@ -3960,6 +3960,7 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) break; } EnterCriticalSection( &request->cs ); + if (!ret) request->proc_running = FALSE; return ret; } @@ -3989,11 +3990,12 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return hr; } - if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) + if (!TrySubmitThreadpoolCallback( send_and_receive_proc, request, NULL )) { LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( GetLastError() ); } + request->proc_running = TRUE; if (!request->async) { hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) ); -- 2.11.0

1 0

[PATCH 5/6] winhttp: Make sure the COM request object is properly initialized.
by Hans Leidekker 23 Nov '18

23 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0f9580734d..766eddabee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3049,7 +3049,6 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write enum request_state { - REQUEST_STATE_UNINITIALIZED, REQUEST_STATE_INITIALIZED, REQUEST_STATE_CANCELLED, REQUEST_STATE_OPEN, @@ -3113,10 +3112,6 @@ static void cancel_request( struct winhttp_request *request ) CloseHandle( request->thread ); request->thread = NULL; - CloseHandle( request->wait ); - request->wait = NULL; - CloseHandle( request->cancel ); - request->cancel = NULL; } /* critical section must be held */ @@ -3453,25 +3448,8 @@ done: static void initialize_request( struct winhttp_request *request ) { - request->hrequest = NULL; - request->hconnect = NULL; - request->hsession = NULL; - request->thread = NULL; - request->wait = NULL; - request->cancel = NULL; - request->buffer = NULL; - request->verb = NULL; - request->offset = 0; - request->bytes_available = 0; - request->bytes_read = 0; - request->error = ERROR_SUCCESS; - request->async = FALSE; - request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; - request->disable_feature = 0; - request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; - request->proxy.lpszProxy = NULL; - request->proxy.lpszProxyBypass = NULL; - request->resolve_timeout = 0; + request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); request->connect_timeout = 60000; request->send_timeout = 30000; request->receive_timeout = 30000; @@ -3495,8 +3473,17 @@ static void reset_request( struct winhttp_request *request ) request->bytes_available = 0; request->bytes_read = 0; request->error = ERROR_SUCCESS; + request->logon_policy = 0; + request->disable_feature = 0; request->async = FALSE; + request->connect_timeout = 60000; + request->send_timeout = 30000; + request->receive_timeout = 30000; request->url_codepage = CP_UTF8; + heap_free( request->proxy.lpszProxy ); + request->proxy.lpszProxy = NULL; + heap_free( request->proxy.lpszProxyBypass ); + request->proxy.lpszProxyBypass = NULL; VariantClear( &request->data ); request->state = REQUEST_STATE_INITIALIZED; } @@ -3533,8 +3520,7 @@ static HRESULT WINAPI winhttp_request_Open( if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( GetLastError() ); EnterCriticalSection( &request->cs ); - if (request->state < REQUEST_STATE_INITIALIZED) initialize_request( request ); - else reset_request( request ); + reset_request( request ); if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) goto error; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); @@ -4008,8 +3994,6 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( GetLastError() ); } - request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); if (!request->async) { hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) ); @@ -4613,15 +4597,12 @@ HRESULT WinHttpRequest_create( void **obj ) TRACE("%p\n", obj); - if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; + if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; - request->state = REQUEST_STATE_UNINITIALIZED; - request->proxy.lpszProxy = NULL; - request->proxy.lpszProxyBypass = NULL; - request->url_codepage = CP_UTF8; InitializeCriticalSection( &request->cs ); request->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": winhttp_request.cs"); + initialize_request( request ); *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj); -- 2.11.0

1 0

[PATCH 2/6] winhttp: Propagate errors from refill_buffer.
by Hans Leidekker 23 Nov '18

23 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38228 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9817287fe2..61af6ea977 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1949,6 +1949,7 @@ static BOOL end_of_read_data( struct request *request ) static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD *read, BOOL async ) { int count, bytes_read = 0; + BOOL ret = TRUE; if (end_of_read_data( request )) goto done; @@ -1956,7 +1957,7 @@ static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD { if (!(count = get_available_data( request ))) { - if (!refill_buffer( request, async )) goto done; + if (!(ret = refill_buffer( request, async ))) goto done; if (!(count = get_available_data( request ))) goto done; } count = min( count, size ); @@ -1968,15 +1969,25 @@ static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD request->content_read += count; if (end_of_read_data( request )) goto done; } - if (request->read_chunked && !request->read_chunked_size) refill_buffer( request, async ); + if (request->read_chunked && !request->read_chunked_size) ret = refill_buffer( request, async ); done: TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + if (async) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); + else + { + WINHTTP_ASYNC_RESULT result; + result.dwResult = API_READ_DATA; + result.dwError = GetLastError(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } - if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); - if (read) *read = bytes_read; + if (ret && read) *read = bytes_read; if (end_of_read_data( request )) finished_reading( request ); - return TRUE; + return ret; } /* read any content returned by the server so that the connection can be reused */ @@ -2781,7 +2792,7 @@ static BOOL receive_response( struct request *request, BOOL async ) } netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); - if (request->content_length) refill_buffer( request, FALSE ); + if (request->content_length) ret = refill_buffer( request, FALSE ); if (async) { @@ -2847,25 +2858,35 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) static BOOL query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD count = 0; + BOOL ret = TRUE; if (end_of_read_data( request )) goto done; count = get_available_data( request ); - if (!request->read_chunked && request->netconn) - count += netconn_query_data_available( request->netconn ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); if (!count) { - refill_buffer( request, async ); + if (!(ret = refill_buffer( request, async ))) goto done; count = get_available_data( request ); - if (!request->read_chunked && request->netconn) - count += netconn_query_data_available( request->netconn ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); } done: - if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); TRACE("%u bytes available\n", count); - if (available) *available = count; - return TRUE; + if (async) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); + else + { + WINHTTP_ASYNC_RESULT result; + result.dwResult = API_QUERY_DATA_AVAILABLE; + result.dwError = GetLastError(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + + if (ret && available) *available = count; + return ret; } static void task_query_data_available( struct task_header *task ) -- 2.11.0

1 0

[PATCH 1/6] winhttp: Use the thread pool for asynchronous tasks.
by Hans Leidekker 23 Nov '18

23 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 12 ++++++------ dlls/winhttp/session.c | 9 +++------ dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 27628c3292..9817287fe2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -191,9 +191,9 @@ static struct task_header *dequeue_task( struct request *request ) return task; } -static DWORD CALLBACK task_proc( LPVOID param ) +static void CALLBACK task_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct request *request = param; + struct request *request = ctx; HANDLE handles[2]; handles[0] = request->task_wait; @@ -221,21 +221,20 @@ static DWORD CALLBACK task_proc( LPVOID param ) request->task_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->task_cs ); request->hdr.vtbl->destroy( &request->hdr ); - return 0; + return; default: ERR("wait failed %u (%u)\n", err, GetLastError()); break; } } - return 0; } static BOOL queue_task( struct task_header *task ) { struct request *request = task->request; - if (!request->task_thread) + if (!request->task_wait) { if (!(request->task_wait = CreateEventW( NULL, FALSE, FALSE, NULL ))) return FALSE; if (!(request->task_cancel = CreateEventW( NULL, FALSE, FALSE, NULL ))) @@ -244,7 +243,7 @@ static BOOL queue_task( struct task_header *task ) request->task_wait = NULL; return FALSE; } - if (!(request->task_thread = CreateThread( NULL, 0, task_proc, request, 0, NULL ))) + if (!TrySubmitThreadpoolCallback( task_proc, request, NULL )) { CloseHandle( request->task_wait ); request->task_wait = NULL; @@ -252,6 +251,7 @@ static BOOL queue_task( struct task_header *task ) request->task_cancel = NULL; return FALSE; } + request->task_proc_running = TRUE; InitializeCriticalSection( &request->task_cs ); request->task_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": request.task_cs"); } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 2051d4282b..f8d98d0c86 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -601,14 +601,11 @@ static void request_destroy( struct object_header *hdr ) TRACE("%p\n", request); - if (request->task_thread) + if (request->task_proc_running) { - /* Signal to the task proc to quit. It will call - this again when it does. */ - HANDLE thread = request->task_thread; - request->task_thread = 0; + /* Signal to the task proc to quit. It will call this again when it does. */ + request->task_proc_running = FALSE; SetEvent( request->task_cancel ); - CloseHandle( thread ); return; } release_object( &request->connect->hdr ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2ee868c657..14cee4403b 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -204,7 +204,7 @@ struct request struct authinfo *proxy_authinfo; HANDLE task_wait; HANDLE task_cancel; - HANDLE task_thread; + BOOL task_proc_running; struct list task_queue; CRITICAL_SECTION task_cs; struct -- 2.11.0

1 0

[v6 PATCH 1/5] comctl32/tests: Confirm that emptying the listbox sends LB_RESETCONTENT to itself.
by Nikolay Sivov 23 Nov '18

23 Nov '18

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 91 +++++++++++++++++++++++++++-------- 1 file changed, 70 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 43da3caa42..362447e083 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -34,6 +34,7 @@ enum seq_index { + LB_SEQ_INDEX, PARENT_SEQ_INDEX, NUM_MSG_SEQUENCES }; @@ -90,9 +91,47 @@ static const char BAD_EXTENSION[] = "*.badtxt"; #define ID_LISTBOX 1 +static LRESULT WINAPI listbox_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + struct message msg = { 0 }; + LRESULT ret; + + switch (message) + { + case WM_SIZE: + case WM_GETTEXT: + case WM_PAINT: + case WM_ERASEBKGND: + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + case WM_NCCALCSIZE: + case WM_NCPAINT: + case WM_NCHITTEST: + case WM_DEVICECHANGE: + break; + + default: + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, LB_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + static HWND create_listbox(DWORD add_style, HWND parent) { INT_PTR ctl_id = 0; + WNDPROC oldproc; HWND handle; if (parent) @@ -107,6 +146,9 @@ static HWND create_listbox(DWORD add_style, HWND parent) SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[2]); SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[3]); + oldproc = (WNDPROC)SetWindowLongPtrA(handle, GWLP_WNDPROC, (LONG_PTR)listbox_wnd_proc); + SetWindowLongPtrA(handle, GWLP_USERDATA, (LONG_PTR)oldproc); + return handle; } @@ -167,9 +209,18 @@ static void keypress(HWND handle, WPARAM keycode, BYTE scancode, BOOL extended) static void run_test(DWORD style, const struct listbox_test test) { + static const struct message delete_seq[] = + { + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_RESETCONTENT, sent|wparam|lparam|defwinproc, 0, 0 }, + { 0 } + }; struct listbox_stat answer; + int i, res, count; RECT second_item; - int i, res; HWND hLB; hLB = create_listbox (style, 0); @@ -224,8 +275,17 @@ static void run_test(DWORD style, const struct listbox_test test) ok(res == LB_ERR, "Expected LB_ERR items, got %d\n", res); res = SendMessageA(hLB, LB_DELETESTRING, 4, 0); ok(res == LB_ERR, "Expected LB_ERR items, got %d\n", res); - res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); - ok(res == 4, "Expected 4 items, got %d\n", res); + count = SendMessageA(hLB, LB_GETCOUNT, 0, 0); + ok(count == 4, "Unexpected item count %d.\n", count); + + /* Emptying listbox sends a LB_RESETCONTENT to itself. */ + flush_sequence(sequences, LB_SEQ_INDEX); + for (i = count; i--;) + { + res = SendMessageA(hLB, LB_DELETESTRING, 0, 0); + ok(res == i, "Unexpected return value %d.\n", res); + } + ok_sequence(sequences, LB_SEQ_INDEX, delete_seq, "Emptying listbox", FALSE); DestroyWindow(hLB); } @@ -1815,34 +1875,23 @@ static void test_set_count( void ) DestroyWindow( parent ); } -static int lb_getlistboxinfo; - -static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - - if (message == LB_GETLISTBOXINFO) - lb_getlistboxinfo++; - - return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); -} - static void test_GetListBoxInfo(void) { + static const struct message getlistboxinfo_seq[] = + { + { LB_GETLISTBOXINFO, sent }, + { 0 } + }; HWND listbox, parent; - WNDPROC oldproc; DWORD ret; parent = create_parent(); listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); - oldproc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (LONG_PTR)listbox_subclass_proc); - SetWindowLongPtrA(listbox, GWLP_USERDATA, (LONG_PTR)oldproc); - - lb_getlistboxinfo = 0; + flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = GetListBoxInfo(listbox); ok(ret > 0, "got %d\n", ret); - ok(lb_getlistboxinfo == 1, "got %d\n", lb_getlistboxinfo); + ok_sequence(sequences, LB_SEQ_INDEX, getlistboxinfo_seq, "GetListBoxInfo()", FALSE); DestroyWindow(listbox); DestroyWindow(parent); -- 2.19.1

1 4

[PATCH 1/4] setupapi/tests: Remove workarounds in testDevRegKey().
by Zebediah Figura 23 Nov '18

23 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 204 ++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 117 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 7d485dd145..7461eb5841 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -36,7 +36,6 @@ static BOOL is_wow64; /* function pointers */ -static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoList)(GUID*,HWND); static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCreateDeviceInterfaceA)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); @@ -44,8 +43,6 @@ static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); -static HKEY (WINAPI *pSetupDiOpenDevRegKey)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); -static HKEY (WINAPI *pSetupDiCreateDevRegKeyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR); static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiCreateDeviceInfoW)(HDEVINFO, PCWSTR, GUID *, PCWSTR, HWND, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); @@ -71,7 +68,6 @@ static void init_function_pointers(void) pSetupDiCreateDeviceInfoA = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoA"); pSetupDiCreateDeviceInfoW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoW"); - pSetupDiCreateDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoList"); pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); pSetupDiCreateDeviceInterfaceA = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInterfaceA"); pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); @@ -79,8 +75,6 @@ static void init_function_pointers(void) pSetupDiEnumDeviceInterfaces = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInterfaces"); pSetupDiGetDeviceInterfaceDetailA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - pSetupDiOpenDevRegKey = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenDevRegKey"); - pSetupDiCreateDevRegKeyW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDevRegKeyW"); pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA"); pSetupDiGetClassDevsW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsW"); @@ -823,7 +817,7 @@ static void test_device_iface_detail(void) devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); } -static void testDevRegKey(void) +static void test_device_key(void) { static const WCHAR classKey[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -835,128 +829,104 @@ static void testDevRegKey(void) 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; + SP_DEVINFO_DATA device = {sizeof(device)}; BOOL ret; HDEVINFO set; HKEY key = NULL; + LONG res; SetLastError(0xdeadbeef); - key = pSetupDiCreateDevRegKeyW(NULL, NULL, 0, 0, 0, NULL, NULL); - ok(key == INVALID_HANDLE_VALUE, - "Expected INVALID_HANDLE_VALUE, got %p\n", key); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %08x\n", GetLastError()); + key = SetupDiCreateDevRegKeyW(NULL, NULL, 0, 0, 0, NULL, NULL); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); - set = pSetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); - if (set) - { - SP_DEVINFO_DATA devInfo = { sizeof(devInfo), { 0 } }; - LONG res; + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); + ok(res != ERROR_SUCCESS, "Key should not exist.\n"); + RegCloseKey(key); + + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key), "Key should exist.\n"); + RegCloseKey(key); + + SetLastError(0xdeadbeef); + key = SetupDiOpenDevRegKey(NULL, NULL, 0, 0, 0, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); - /* The device info key shouldn't be there */ - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); - ok(res != ERROR_SUCCESS, "Expected key to not exist\n"); + SetLastError(0xdeadbeef); + key = SetupDiOpenDevRegKey(set, NULL, 0, 0, 0, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + key = SetupDiOpenDevRegKey(set, &device, 0, 0, 0, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_FLAGS, "Got unexpected error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, 0, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_FLAGS, "Got unexpected error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_BOTH, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_FLAGS, "Got unexpected error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_DEVINFO_NOT_REGISTERED, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key); +todo_wine + ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + RegCloseKey(key); + + key = SetupDiCreateDevRegKeyW(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + ok(key != INVALID_HANDLE_VALUE || GetLastError() == ERROR_KEY_DOES_NOT_EXIST, /* Vista+ */ + "Failed to create device key, error %#x.\n", GetLastError()); + if (key != INVALID_HANDLE_VALUE) + { RegCloseKey(key); - /* Create the device information */ - ret = pSetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, - NULL, NULL, 0, &devInfo); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); - /* The device info key should have been created */ - ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key), - "Expected registry key to exist\n"); + + ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key), "Key should exist.\n"); RegCloseKey(key); + SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(NULL, NULL, 0, 0, 0, 0); - ok(!key || key == INVALID_HANDLE_VALUE, - "Expected INVALID_HANDLE_VALUE or a NULL key (NT4)\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(set, NULL, 0, 0, 0, 0); - ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(set, &devInfo, 0, 0, 0, 0); - ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, 0, 0); - ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, - DIREG_BOTH, 0); - ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, - DIREG_DRV, 0); - ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_DEVINFO_NOT_REGISTERED, - "Expected ERROR_DEVINFO_NOT_REGISTERED, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - ok(ret, "SetupDiRegisterDeviceInfo failed: %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, - DIREG_DRV, 0); - /* The software key isn't created by default */ - ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_KEY_DOES_NOT_EXIST, - "Expected ERROR_KEY_DOES_NOT_EXIST, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, - DIREG_DEV, 0); - todo_wine - ok(key == INVALID_HANDLE_VALUE && - GetLastError() == ERROR_KEY_DOES_NOT_EXIST, - "Expected ERROR_KEY_DOES_NOT_EXIST, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - /* The class key shouldn't be there */ - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key); - todo_wine - ok(res != ERROR_SUCCESS, "Expected key to not exist\n"); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); +todo_wine { + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA || GetLastError() == ERROR_ACCESS_DENIED, /* win2k3 */ + "Got unexpected error %#x.\n", GetLastError()); +} + + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ); + ok(key != INVALID_HANDLE_VALUE, "Failed to open device key, error %#x.\n", GetLastError()); RegCloseKey(key); - /* Create the device reg key */ - key = pSetupDiCreateDevRegKeyW(set, &devInfo, DICS_FLAG_GLOBAL, 0, - DIREG_DRV, NULL, NULL); - /* Vista and higher don't actually create the key */ - ok(key != INVALID_HANDLE_VALUE || GetLastError() == ERROR_KEY_DOES_NOT_EXIST, - "SetupDiCreateDevRegKey failed: %08x\n", GetLastError()); - if (key != INVALID_HANDLE_VALUE) - { - RegCloseKey(key); - /* The class key should have been created */ - ok(!RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key), - "Expected registry key to exist\n"); - RegCloseKey(key); - SetLastError(0xdeadbeef); - key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, - DIREG_DRV, 0); - todo_wine - ok(key == INVALID_HANDLE_VALUE && - (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == ERROR_ACCESS_DENIED), /* win2k3 */ - "Expected ERROR_INVALID_DATA or ERROR_ACCESS_DENIED, got %08x\n", GetLastError()); - key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, - DIREG_DRV, KEY_READ); - ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n", - GetLastError()); - RegCloseKey(key); - } + } - ret = pSetupDiRemoveDevice(set, &devInfo); - todo_wine ok(ret, "got %u\n", GetLastError()); - pSetupDiDestroyDeviceInfoList(set); + ret = SetupDiRemoveDevice(set, &device); +todo_wine + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList(set); - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); - } + /* remove once Wine is fixed */ + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); } static void testRegisterAndGetDetail(void) @@ -1557,7 +1527,7 @@ START_TEST(devinst) test_register_device_info(); test_device_iface(); test_device_iface_detail(); - testDevRegKey(); + test_device_key(); testRegisterAndGetDetail(); testDeviceRegistryPropertyA(); testDeviceRegistryPropertyW(); -- 2.14.1

1 3

[PATCH 6/6] kernelbase: Implement PathCchCanonicalize.
by Zhiyi Zhang 23 Nov '18

23 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 11 ++ dlls/kernelbase/tests/path.c | 105 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index c48fe7b49b..6896e4a8d4 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension @ stub PathCchAppend @ stub PathCchAppendEx -@ stub PathCchCanonicalize +@ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx @ stub PathCchCombine @ stub PathCchCombineEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 340f0e2105..752d489fba 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1034,7 +1034,7 @@ @ stdcall PathCchAddExtension(wstr long wstr) # @ stub PathCchAppend # @ stub PathCchAppendEx -# @ stub PathCchCanonicalize +@ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) # @ stub PathCchCombine # @ stub PathCchCombineEx diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index f04f30e5ba..cc15d1c097 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -389,6 +389,17 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens return S_OK; } +HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in) +{ + TRACE("%p %lu %s\n", out, size, wine_dbgstr_w(in)); + + /* Not X:\ and path > MAX_PATH - 4, return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) */ + if (strlenW(in) > MAX_PATH - 4 && !(isalphaW(in[0]) && in[1] == ':' && in[2] == '\\')) + return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + + return PathCchCanonicalizeEx(out, size, in, PATHCCH_NONE); +} + HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags) { WCHAR *buffer; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 74be5eb120..6f95e40c11 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -34,6 +34,7 @@ HRESULT (WINAPI *pPathAllocCanonicalize)(const WCHAR *path_in, DWORD flags, WCHA HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchCanonicalize)(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT (WINAPI *pPathCchCanonicalizeEx)(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); @@ -668,6 +669,108 @@ static void test_PathCchAddExtension(void) } } +static void test_PathCchCanonicalize(void) +{ + WCHAR path_inW[MAX_PATH], path_outW[MAX_PATH]; + CHAR path_outA[MAX_PATH]; + HRESULT hr; + INT i; + + if (!pPathCchCanonicalize) + { + win_skip("PathCchCanonicalize() is not available.\n"); + return; + } + + /* No NULL check for path pointers on Windows */ + if (0) + { + hr = pPathCchCanonicalize(NULL, ARRAY_SIZE(path_outW), path_inW); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + /* MSDN says NULL path_in result in a backslash added to path_out, but the fact is that it would crash */ + hr = pPathCchCanonicalize(path_outW, ARRAY_SIZE(path_outW), NULL); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + } + + hr = pPathCchCanonicalize(path_outW, 0, path_inW); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + /* Test path length */ + for (i = 0; i < MAX_PATH - 3; i++) path_inW[i] = 'a'; + path_inW[MAX_PATH - 3] = '\0'; + memset(path_outW, 0, sizeof(path_outW)); + hr = pPathCchCanonicalize(path_outW, ARRAY_SIZE(path_outW), path_inW); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), "expect hr %#x, got %#x %s\n", + HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), hr, wine_dbgstr_w(path_outW)); + ok(lstrlenW(path_outW) == 0, "got %d\n", lstrlenW(path_outW)); + + path_inW[0] = 'C'; + path_inW[1] = ':'; + path_inW[2] = '\\'; + hr = pPathCchCanonicalize(path_outW, ARRAY_SIZE(path_outW), path_inW); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + + path_inW[MAX_PATH - 4] = '\0'; + hr = pPathCchCanonicalize(path_outW, ARRAY_SIZE(path_outW), path_inW); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + + /* Insufficient buffer size handling */ + hr = pPathCchCanonicalize(path_outW, 1, path_inW); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "expect hr %#x, got %#x\n", STRSAFE_E_INSUFFICIENT_BUFFER, hr); + + for (i = 0; i < ARRAY_SIZE(alloccanonicalize_tests); i++) + { + const struct alloccanonicalize_test *t = alloccanonicalize_tests + i; + + /* Skip testing X: path input, this case is different compared to PathAllocCanonicalize */ + /* Skip test cases where a flag is used */ + if (!lstrcmpA("C:", t->path_in) || t->flags) continue; + + MultiByteToWideChar(CP_ACP, 0, t->path_in, -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalize(path_outW, ARRAY_SIZE(path_outW), path_inW); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path_in, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, t->path_out), "path \"%s\" expect output path \"%s\", got \"%s\"\n", t->path_in, + t->path_out, path_outA); + } + } + + /* X: path input */ + /* Fill a \ at the end of X: if there is enough space */ + MultiByteToWideChar(CP_ACP, 0, "C:", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalize(path_outW, ARRAY_SIZE(path_outW), path_inW); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", "C:", S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, "C:\\"), "path \"%s\" expect output path \"%s\", got \"%s\"\n", "C:", "C:\\", + path_outA); + } + + /* Don't fill a \ at the end of X: if there isn't enough space */ + MultiByteToWideChar(CP_ACP, 0, "C:", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalize(path_outW, 3, path_inW); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", "C:", S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, "C:"), "path \"%s\" expect output path \"%s\", got \"%s\"\n", "C:", "C:\\", path_outA); + } + + /* Don't fill a \ at the end of X: if there is character following X: */ + MultiByteToWideChar(CP_ACP, 0, "C:a", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalize(path_outW, ARRAY_SIZE(path_outW), path_inW); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", "C:a", S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, "C:a"), "path \"%s\" expect output path \"%s\", got \"%s\"\n", "C:a", "C:a", path_outA); + } +} + static void test_PathCchCanonicalizeEx(void) { WCHAR path_inW[PATHCCH_MAX_CCH + 1], path_outW[PATHCCH_MAX_CCH]; @@ -1836,6 +1939,7 @@ START_TEST(path) pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); + pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); @@ -1854,6 +1958,7 @@ START_TEST(path) test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); + test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); test_PathCchFindExtension(); test_PathCchIsRoot(); diff --git a/include/pathcch.h b/include/pathcch.h index fb92c3b1aa..708e00e146 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -30,6 +30,7 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); -- 2.19.1

1 0

[PATCH 5/6] kernelbase: Implement PathCchCanonicalizeEx.
by Zhiyi Zhang 23 Nov '18

23 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44999 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 39 +++++ dlls/kernelbase/tests/path.c | 143 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 185 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 9bce0ace95..c48fe7b49b 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -6,7 +6,7 @@ @ stub PathCchAppend @ stub PathCchAppendEx @ stub PathCchCanonicalize -@ stub PathCchCanonicalizeEx +@ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx @ stub PathCchCombine @ stub PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8273d5f1b1..340f0e2105 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1035,7 +1035,7 @@ # @ stub PathCchAppend # @ stub PathCchAppendEx # @ stub PathCchCanonicalize -# @ stub PathCchCanonicalizeEx +@ stdcall PathCchCanonicalizeEx(ptr long wstr long) # @ stub PathCchCombine # @ stub PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 659a17bd09..f04f30e5ba 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -389,6 +389,45 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens return S_OK; } +HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags) +{ + WCHAR *buffer; + SIZE_T length; + HRESULT hr; + + TRACE("%p %lu %s %#x\n", out, size, wine_dbgstr_w(in), flags); + + if (!size) return E_INVALIDARG; + + hr = PathAllocCanonicalize(in, flags, &buffer); + if (FAILED(hr)) return hr; + + length = strlenW(buffer); + if (size < length + 1) + { + /* No root and path > MAX_PATH - 4, return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) */ + if (length > MAX_PATH - 4 && !(in[0] == '\\' || (isalphaW(in[0]) && in[1] == ':' && in[2] == '\\'))) + hr = HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + else + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + + if (SUCCEEDED(hr)) + { + memcpy(out, buffer, (length + 1) * sizeof(WCHAR)); + + /* Fill a backslash at the end of X: */ + if (isalphaW(out[0]) && out[1] == ':' && !out[2] && size > 3) + { + out[2] = '\\'; + out[3] = 0; + } + } + + LocalFree(buffer); + return hr; +} + HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension) { const WCHAR *lastpoint = NULL; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 0a55369d99..74be5eb120 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -34,6 +34,7 @@ HRESULT (WINAPI *pPathAllocCanonicalize)(const WCHAR *path_in, DWORD flags, WCHA HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchCanonicalizeEx)(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL (WINAPI *pPathCchIsRoot)(const WCHAR *path); @@ -667,6 +668,146 @@ static void test_PathCchAddExtension(void) } } +static void test_PathCchCanonicalizeEx(void) +{ + WCHAR path_inW[PATHCCH_MAX_CCH + 1], path_outW[PATHCCH_MAX_CCH]; + CHAR path_outA[4096]; + BOOL skip_new_flags = TRUE; + HRESULT hr; + INT i; + + if (!pPathCchCanonicalizeEx) + { + win_skip("PathCchCanonicalizeEx() is not available.\n"); + return; + } + + /* No NULL check for path pointers on Windows */ + if (0) + { + hr = pPathCchCanonicalizeEx(NULL, ARRAY_SIZE(path_outW), path_inW, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + /* MSDN says NULL path_in result in a backslash added to path_out, but the fact is that it would crash */ + hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), NULL, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + } + + path_outW[0] = 0xff; + hr = pPathCchCanonicalizeEx(path_outW, 0, path_inW, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(path_outW[0] = 0xff, "expect path_outW unchanged\n"); + + /* Test path length */ + for (i = 0; i < ARRAY_SIZE(path_inW) - 1; i++) path_inW[i] = 'a'; + path_inW[PATHCCH_MAX_CCH] = '\0'; + hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), path_inW, PATHCCH_ALLOW_LONG_PATHS); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), "expect hr %#x, got %#x\n", + HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), hr); + + path_inW[PATHCCH_MAX_CCH - 1] = '\0'; + hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), path_inW, PATHCCH_ALLOW_LONG_PATHS); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + + hr = pPathCchCanonicalizeEx(path_outW, 1, path_inW, PATHCCH_ALLOW_LONG_PATHS); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), "expect hr %#x, got %#x\n", + HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), hr); + + /* No root and path > MAX_PATH - 4, return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) */ + path_inW[MAX_PATH - 3] = '\0'; + hr = pPathCchCanonicalizeEx(path_outW, 1, path_inW, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), "expect hr %#x, got %#x\n", + HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), hr); + + /* Has root and path > MAX_PATH - 4 */ + path_inW[0] = 'C'; + path_inW[1] = ':'; + path_inW[2] = '\\'; + hr = pPathCchCanonicalizeEx(path_outW, 1, path_inW, 0); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "expect hr %#x, got %#x\n", STRSAFE_E_INSUFFICIENT_BUFFER, hr); + + path_inW[0] = '\\'; + path_inW[1] = path_inW[2] = 'a'; + hr = pPathCchCanonicalizeEx(path_outW, 1, path_inW, 0); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "expect hr %#x, got %#x\n", STRSAFE_E_INSUFFICIENT_BUFFER, hr); + + path_inW[0] = path_inW[1] = '\\'; + path_inW[2] = 'a'; + hr = pPathCchCanonicalizeEx(path_outW, 1, path_inW, 0); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "expect hr %#x, got %#x\n", STRSAFE_E_INSUFFICIENT_BUFFER, hr); + + /* path <= MAX_PATH - 4 */ + path_inW[0] = path_inW[1] = path_inW[2] = 'a'; + path_inW[MAX_PATH - 4] = '\0'; + hr = pPathCchCanonicalizeEx(path_outW, 1, path_inW, 0); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "expect hr %#x, got %#x\n", STRSAFE_E_INSUFFICIENT_BUFFER, hr); + + /* Check if flags added after Windows 10 1709 are supported */ + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), path_inW, PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS); + if (hr == E_INVALIDARG) skip_new_flags = FALSE; + + for (i = 0; i < ARRAY_SIZE(alloccanonicalize_tests); i++) + { + const struct alloccanonicalize_test *t = alloccanonicalize_tests + i; + + /* Skip testing X: path input, this case is different compared to PathAllocCanonicalize */ + if (!lstrcmpA("C:", t->path_in)) continue; + + if (((PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS | PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS + | PATHCCH_DO_NOT_NORMALIZE_SEGMENTS | PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH + | PATHCCH_ENSURE_TRAILING_SLASH) + & t->flags) + && skip_new_flags) + { + win_skip("Skip testing new flags added after Windows 10 1709\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, t->path_in, -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), path_inW, t->flags); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path_in, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, t->path_out), "path \"%s\" expect output path \"%s\", got \"%s\"\n", t->path_in, + t->path_out, path_outA); + } + } + + /* X: path input */ + /* Fill a \ at the end of X: if there is enough space */ + MultiByteToWideChar(CP_ACP, 0, "C:", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), path_inW, 0); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", "C:", S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, "C:\\"), "path \"%s\" expect output path \"%s\", got \"%s\"\n", "C:", "C:\\", + path_outA); + } + + /* Don't fill a \ at the end of X: if there isn't enough space */ + MultiByteToWideChar(CP_ACP, 0, "C:", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalizeEx(path_outW, 3, path_inW, 0); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", "C:", S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, "C:"), "path \"%s\" expect output path \"%s\", got \"%s\"\n", "C:", "C:\\", path_outA); + } + + /* Don't fill a \ at the end of X: if there is character following X: */ + MultiByteToWideChar(CP_ACP, 0, "C:a", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathCchCanonicalizeEx(path_outW, ARRAY_SIZE(path_outW), path_inW, 0); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", "C:a", S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, "C:a"), "path \"%s\" expect output path \"%s\", got \"%s\"\n", "C:a", "C:a", path_outA); + } +} + struct findextension_test { const CHAR *path; @@ -1695,6 +1836,7 @@ START_TEST(path) pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); + pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); pPathCchRemoveBackslash = (void *)GetProcAddress(hmod, "PathCchRemoveBackslash"); @@ -1712,6 +1854,7 @@ START_TEST(path) test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); + test_PathCchCanonicalizeEx(); test_PathCchFindExtension(); test_PathCchIsRoot(); test_PathCchRemoveBackslash(); diff --git a/include/pathcch.h b/include/pathcch.h index b1d6be249d..fb92c3b1aa 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -30,6 +30,7 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL WINAPI PathCchIsRoot(const WCHAR *path); -- 2.19.1

1 0

[PATCH 4/6] kernelbase: Implement PathAllocCanonicalize.
by Zhiyi Zhang 23 Nov '18

23 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 182 +++++++++++ dlls/kernelbase/tests/path.c | 306 ++++++++++++++++++ include/pathcch.h | 2 + 5 files changed, 492 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 725f16448f..9bce0ace95 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub PathAllocCanonicalize +@ stdcall PathAllocCanonicalize(wstr long ptr) kernelbase.PathAllocCanonicalize @ stub PathAllocCombine @ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e7bb62d75c..8273d5f1b1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1023,7 +1023,7 @@ @ stdcall PathAddBackslashW(wstr) shlwapi.PathAddBackslashW @ stdcall PathAddExtensionA(str str) shlwapi.PathAddExtensionA @ stdcall PathAddExtensionW(wstr wstr) shlwapi.PathAddExtensionW -# @ stub PathAllocCanonicalize +@ stdcall PathAllocCanonicalize(wstr long ptr) # @ stub PathAllocCombine @ stdcall PathAppendA(str str) shlwapi.PathAppendA @ stdcall PathAppendW(wstr wstr) shlwapi.PathAppendW diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index c3fca8b9cf..659a17bd09 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -126,6 +126,188 @@ static const WCHAR *get_root_end(const WCHAR *path) return NULL; } +HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out) +{ + WCHAR *buffer, *dst; + const WCHAR *src; + const WCHAR *root_end; + SIZE_T buffer_size, length; + + TRACE("%s %#x %p\n", debugstr_w(path_in), flags, path_out); + + if (!path_in || !path_out + || ((flags & PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS) && (flags & PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS)) + || (flags & (PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS | PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS) + && !(flags & PATHCCH_ALLOW_LONG_PATHS)) + || ((flags & PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH) && (flags & PATHCCH_ALLOW_LONG_PATHS))) + { + if (path_out) *path_out = NULL; + return E_INVALIDARG; + } + + length = strlenW(path_in); + if ((length + 1 > MAX_PATH && !(flags & (PATHCCH_ALLOW_LONG_PATHS | PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH))) + || (length + 1 > PATHCCH_MAX_CCH)) + { + *path_out = NULL; + return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + } + + /* PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH implies PATHCCH_DO_NOT_NORMALIZE_SEGMENTS */ + if (flags & PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH) flags |= PATHCCH_DO_NOT_NORMALIZE_SEGMENTS; + + /* path length + possible \\?\ addition + possible \ addition + NUL */ + buffer_size = (length + 6) * sizeof(WCHAR); + buffer = LocalAlloc(LMEM_ZEROINIT, buffer_size); + if (!buffer) + { + *path_out = NULL; + return E_OUTOFMEMORY; + } + + src = path_in; + dst = buffer; + + root_end = get_root_end(path_in); + if (root_end) root_end = buffer + (root_end - path_in); + + /* Copy path root */ + if (root_end) + { + memcpy(dst, src, (root_end - buffer + 1) * sizeof(WCHAR)); + src += root_end - buffer + 1; + if(PathCchStripPrefix(dst, length + 6) == S_OK) + { + /* Fill in \ in X:\ if the \ is missing */ + if(isalphaW(dst[0]) && dst[1] == ':' && dst[2]!= '\\') + { + dst[2] = '\\'; + dst[3] = 0; + } + dst = buffer + strlenW(buffer); + root_end = dst; + } + else + dst += root_end - buffer + 1; + } + + while (*src) + { + if (src[0] == '.') + { + if (src[1] == '.') + { + /* Keep one . after * */ + if (dst > buffer && dst[-1] == '*') + { + *dst++ = *src++; + continue; + } + + /* Keep the . if one of the following is true: + * 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS + * 2. in form of a..b + */ + if (dst > buffer + && (((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS) && dst[-1] != '\\') + || (dst[-1] != '\\' && src[2] != '\\' && src[2]))) + { + *dst++ = *src++; + *dst++ = *src++; + continue; + } + + /* Remove the \ before .. if the \ is not part of root */ + if (dst > buffer && dst[-1] == '\\' && (!root_end || dst - 1 > root_end)) + { + *--dst = '\0'; + /* Remove characters until a \ is encountered */ + while (dst > buffer) + { + if (dst[-1] == '\\') + { + *--dst = 0; + break; + } + else + *--dst = 0; + } + } + /* Remove the extra \ after .. if the \ before .. wasn't deleted */ + else if (src[2] == '\\') + src++; + + src += 2; + } + else + { + /* Keep the . if one of the following is true: + * 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS + * 2. in form of a.b, which is used in domain names + * 3. *. + */ + if (dst > buffer + && ((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS && dst[-1] != '\\') + || (dst[-1] != '\\' && src[1] != '\\' && src[1]) || (dst[-1] == '*'))) + { + *dst++ = *src++; + continue; + } + + /* Remove the \ before . if the \ is not part of root */ + if (dst > buffer && dst[-1] == '\\' && (!root_end || dst - 1 > root_end)) dst--; + /* Remove the extra \ after . if the \ before . wasn't deleted */ + else if (src[1] == '\\') + src++; + + src++; + } + + /* If X:\ is not complete, then complete it */ + if (isalphaW(buffer[0]) && buffer[1] == ':' && buffer[2] != '\\') + { + root_end = buffer + 2; + dst = buffer + 3; + buffer[2] = '\\'; + /* If next character is \, use the \ to fill in */ + if (src[0] == '\\') src++; + } + } + /* Copy over */ + else + *dst++ = *src++; + } + /* End the path */ + *dst = 0; + + /* If result path is empty, fill in \ */ + if (!*buffer) + { + buffer[0] = '\\'; + buffer[1] = 0; + } + + /* Extend the path if needed */ + length = strlenW(buffer); + if (((length + 1 > MAX_PATH && isalphaW(buffer[0]) && buffer[1] == ':') + || (isalphaW(buffer[0]) && buffer[1] == ':' && flags & PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH)) + && !(flags & PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS)) + { + memmove(buffer + 4, buffer, (length + 1) * sizeof(WCHAR)); + buffer[0] = '\\'; + buffer[1] = '\\'; + buffer[2] = '?'; + buffer[3] = '\\'; + } + + /* Add a trailing backslash to the path if needed */ + if (flags & PATHCCH_ENSURE_TRAILING_SLASH) + PathCchAddBackslash(buffer, buffer_size); + + *path_out = buffer; + return S_OK; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 8981b3a08a..0a55369d99 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -30,6 +30,7 @@ #include "wine/test.h" +HRESULT (WINAPI *pPathAllocCanonicalize)(const WCHAR *path_in, DWORD flags, WCHAR **path_out); HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); @@ -46,6 +47,309 @@ HRESULT (WINAPI *pPathCchStripPrefix)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchStripToRoot)(WCHAR *path, SIZE_T size); BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); +struct alloccanonicalize_test +{ + const CHAR *path_in; + const CHAR *path_out; + DWORD flags; + HRESULT hr; +}; + +static const struct alloccanonicalize_test alloccanonicalize_tests[] = +{ + /* Malformed path */ + {"C:a", "C:a", 0, S_OK}, + {"\\\\?\\C:", "C:\\", 0, S_OK}, + {"\\\\?C:\\a", "\\\\?C:\\a", 0, S_OK}, + {"\\\\?UNC\\a", "\\\\?UNC\\a", 0, S_OK}, + {"\\\\?\\UNCa", "\\\\?\\UNCa", 0, S_OK}, + {"\\\\?C:a", "\\\\?C:a", 0, S_OK}, + + /* No . */ + {"", "\\", 0, S_OK}, + {"C:", "C:", 0, S_OK}, + {"C:\\", "C:\\", 0, S_OK}, + {"\\\\?\\C:\\a", "C:\\a", 0, S_OK}, + {"\\\\?\\UNC\\a", "\\\\a", 0, S_OK}, + + /* . */ + {".", "\\", 0, S_OK}, + {"..", "\\", 0, S_OK}, + {"...", "\\", 0, S_OK}, + {"*.", "*.", 0, S_OK}, + {"*..", "*.", 0, S_OK}, + {"*...", "*.", 0, S_OK}, + {"a.", "a", 0, S_OK}, + {"a.b", "a.b", 0, S_OK}, + {"a\\.", "a", 0, S_OK}, + {"a\\.\\b", "a\\b", 0, S_OK}, + {"C:.", "C:\\", 0, S_OK}, + {"C:\\.", "C:\\", 0, S_OK}, + {"C:\\.\\", "C:\\", 0, S_OK}, + {"C:\\a.", "C:\\a", 0, S_OK}, + {"C:\\a\\.", "C:\\a", 0, S_OK}, + {"C:\\a\\\\.", "C:\\a\\", 0, S_OK}, + {"C:\\a\\\\\\.", "C:\\a\\\\", 0, S_OK}, + {"\\.", "\\", 0, S_OK}, + {"\\\\.", "\\\\", 0, S_OK}, + {"\\\\.\\", "\\\\", 0, S_OK}, + {"\\\\\\.", "\\\\", 0, S_OK}, + {"\\\\.\\\\", "\\\\\\", 0, S_OK}, + {"\\\\\\\\.", "\\\\\\", 0, S_OK}, + {"\\?\\.", "\\?", 0, S_OK}, + {"\\\\?\\.", "\\\\?", 0, S_OK}, + {"\\192.168.1.1\\a", "\\192.168.1.1\\a", 0, S_OK}, + {"\\a.168.1.1\\a", "\\a.168.1.1\\a", 0, S_OK}, + {"\\\\192.168.1.1\\a", "\\\\192.168.1.1\\a", 0, S_OK}, + {"\\\\a.168.1.1\\b", "\\\\a.168.1.1\\b", 0, S_OK}, + {"\\\\?\\C:.", "C:\\", 0, S_OK}, + {"\\\\?\\C:\\.", "C:\\", 0, S_OK}, + {"\\\\?\\UNC\\.", "\\\\", 0, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\.", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 0, S_OK}, + + /* .. */ + {"a..", "a", 0, S_OK}, + {"a..b", "a..b", 0, S_OK}, + {"a\\..", "\\", 0, S_OK}, + {"a\\..\\", "\\", 0, S_OK}, + {"a\\..\\b", "\\b", 0, S_OK}, + {"C:..", "C:\\", 0, S_OK}, + {"C:\\..", "C:\\", 0, S_OK}, + {"C:\\\\..", "C:\\", 0, S_OK}, + {"C:\\..\\", "C:\\", 0, S_OK}, + {"C:\\a\\..", "C:\\", 0, S_OK}, + {"C:\\a\\\\..", "C:\\a", 0, S_OK}, + {"C:\\a\\\\\\..", "C:\\a\\", 0, S_OK}, + {"C:\\a\\..\\b", "C:\\b", 0, S_OK}, + {"C:\\a\\..\\\\b", "C:\\\\b", 0, S_OK}, + {"\\..", "\\", 0, S_OK}, + {"\\\\..", "\\\\", 0, S_OK}, + {"\\\\\\..", "\\", 0, S_OK}, + {"\\\\..\\", "\\\\", 0, S_OK}, + {"\\\\\\..", "\\", 0, S_OK}, + {"\\\\..\\\\", "\\\\\\", 0, S_OK}, + {"\\\\\\\\..", "\\\\", 0, S_OK}, + {"\\?\\..", "\\", 0, S_OK}, + {"\\a\\..", "\\", 0, S_OK}, + {"\\\\?\\..", "\\", 0, S_OK}, + {"\\\\a\\..", "\\", 0, S_OK}, + {"\\a\\..\\b", "\\b", 0, S_OK}, + {"\\a\\b\\..", "\\a", 0, S_OK}, + {"\\?\\UNC\\..", "\\?", 0, S_OK}, + {"\\?\\C:\\..", "\\?", 0, S_OK}, + {"\\\\?\\C:..", "C:\\", 0, S_OK}, + {"\\\\?\\C:\\..", "C:\\", 0, S_OK}, + {"\\\\?\\UNC\\..", "\\\\", 0, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}..", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", 0, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\..", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 0, S_OK}, + {"\\\\?\\UNC\\a\\b\\..", "\\\\a", 0, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\b\\..", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", 0, S_OK}, + + /* . and .. */ + {"C:\\a\\.\\b\\..\\", "C:\\a\\", 0, S_OK}, + {"\\a\\.\\b\\..\\", "\\a\\", 0, S_OK}, + {"\\?\\a\\.\\b\\..\\", "\\?\\a\\", 0, S_OK}, + {"\\\\.\\a\\.\\b\\..\\", "\\\\a\\", 0, S_OK}, + {"\\\\?\\a\\.\\b\\..\\", "\\\\?\\a\\", 0, S_OK}, + {"\\\\.\\..", "\\\\", 0, S_OK}, + + /* PATHCCH_ALLOW_LONG_PATHS */ + /* Input path with prefix \\?\ and length of MAXPATH + 1, HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) = 0x800700ce */ + {"\\\\?\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", NULL, 0, 0x800700ce}, + /* Input path with prefix C:\ and length of MAXPATH + 1 */ + {"C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", NULL, 0, 0x800700ce}, + {"C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "\\\\?\\C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", PATHCCH_ALLOW_LONG_PATHS, S_OK}, + /* Input path with prefix C: and length of MAXPATH + 1 */ + {"C:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "\\\\?\\C:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", PATHCCH_ALLOW_LONG_PATHS, S_OK}, + /* Input path with prefix C:\ and length of MAXPATH + 1 and with .. */ + {"C:\\..\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", PATHCCH_ALLOW_LONG_PATHS, S_OK}, + /* Input path with prefix \\?\ and length of MAXPATH + 1 */ + {"\\\\?\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "\\\\?\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", PATHCCH_ALLOW_LONG_PATHS, S_OK}, + /* Input path with prefix \ and length of MAXPATH + 1 */ + {"\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", PATHCCH_ALLOW_LONG_PATHS, S_OK}, + /* Input path with length of MAXPATH with PATHCCH_ALLOW_LONG_PATHS disabled*/ + {"C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 0, S_OK}, + /* Input path with length of MAXPATH */ + {"C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", PATHCCH_ALLOW_LONG_PATHS, S_OK}, + + /* Flags added after Windows 10 1709 */ + /* PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS */ + /* PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS without PATHCCH_ALLOW_LONG_PATHS */ + {"", NULL, PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS, E_INVALIDARG}, + /* Input path with prefix C:\ and length of MAXPATH + 1 and PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS */ + {"C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + PATHCCH_ALLOW_LONG_PATHS | PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS, S_OK}, + + /* PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS */ + /* PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS without PATHCCH_ALLOW_LONG_PATHS */ + {"", NULL, PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS, E_INVALIDARG}, + /* Both PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS and PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS */ + {"", "\\", PATHCCH_ALLOW_LONG_PATHS | PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS | PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS, + E_INVALIDARG}, + /* Input path with prefix C:\ and length of MAXPATH + 1 and PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS */ + {"C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "\\\\?\\C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + PATHCCH_ALLOW_LONG_PATHS | PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS, S_OK}, + /* Input path with prefix C:\ and length of MAXPATH and PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS */ + {"C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + PATHCCH_ALLOW_LONG_PATHS | PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS, S_OK}, + + /* PATHCCH_DO_NOT_NORMALIZE_SEGMENTS */ + /* No effect for spaces */ + {"C:\\a \\", "C:\\a \\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:\\a\\ ", "C:\\a\\ ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:\\a ", "C:\\a ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:\\a ", "C:\\a ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:\\a. ", "C:\\a. ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"\\a \\", "\\a \\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"\\a\\ ", "\\a\\ ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"\\\\a \\", "\\\\a \\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"\\\\a\\ ", "\\\\a\\ ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"\\\\?\\ ", "\\\\?\\ ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + /* Keep trailing dot */ + {"*..", "*..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {".", "\\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"..", "\\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:.", "C:.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:..", "C:..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:\\a\\.", "C:\\a", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:\\a\\..", "C:\\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:\\a.", "C:\\a.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:\\a..", "C:\\a..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + + /* PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH */ + {"C:\\a\\", "\\\\?\\C:\\a\\", PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH, S_OK}, + {"", NULL, PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH | PATHCCH_ALLOW_LONG_PATHS, E_INVALIDARG}, + {"\\a\\", "\\a\\", PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH, S_OK}, + {"\\\\?\\C:\\a\\", "\\\\?\\C:\\a\\", PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH, S_OK}, + /* Implication of PATHCCH_DO_NOT_NORMALIZE_SEGMENTS by PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH */ + {"\\a.", "\\a.", PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH, S_OK}, + + /* PATHCCH_ENSURE_TRAILING_SLASH */ + {"\\", "\\", PATHCCH_ENSURE_TRAILING_SLASH, S_OK}, + {"C:\\", "C:\\", PATHCCH_ENSURE_TRAILING_SLASH, S_OK}, + {"C:\\a\\.", "C:\\a\\", PATHCCH_ENSURE_TRAILING_SLASH, S_OK}, + {"C:\\a", "C:\\a\\", PATHCCH_ENSURE_TRAILING_SLASH, S_OK} +}; + +static void test_PathAllocCanonicalize(void) +{ + WCHAR path_inW[1024], path_maxW[PATHCCH_MAX_CCH + 1]; + WCHAR *path_outW; + CHAR path_outA[1024]; + BOOL skip_new_flags = TRUE; + HRESULT hr; + INT i; + + if (!pPathAllocCanonicalize) + { + win_skip("PathAllocCanonicalize() is not available.\n"); + return; + } + + /* No NULL check for path on Windows */ + if (0) + { + hr = pPathAllocCanonicalize(NULL, 0, &path_outW); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + } + + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathAllocCanonicalize(path_inW, 0, NULL); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + /* Test longest path */ + for (i = 0; i < ARRAY_SIZE(path_maxW) - 1; i++) path_maxW[i] = 'a'; + path_maxW[PATHCCH_MAX_CCH] = '\0'; + path_outW = (WCHAR *)0xdeadbeef; + hr = pPathAllocCanonicalize(path_maxW, PATHCCH_ALLOW_LONG_PATHS, &path_outW); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), "expect hr %#x, got %#x\n", + HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), hr); + ok(path_outW == NULL, "expect path_outW null, got %p\n", path_outW); + + path_maxW[PATHCCH_MAX_CCH - 1] = '\0'; + hr = pPathAllocCanonicalize(path_maxW, PATHCCH_ALLOW_LONG_PATHS, &path_outW); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + + /* Check if flags added after Windows 10 1709 are supported */ + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathAllocCanonicalize(path_inW, PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS, &path_outW); + if (hr == E_INVALIDARG) skip_new_flags = FALSE; + + for (i = 0; i < ARRAY_SIZE(alloccanonicalize_tests); i++) + { + const struct alloccanonicalize_test *t = alloccanonicalize_tests + i; + + if (((PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS | PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS + | PATHCCH_DO_NOT_NORMALIZE_SEGMENTS | PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH + | PATHCCH_ENSURE_TRAILING_SLASH) + & t->flags) + && skip_new_flags) + { + win_skip("Skip testing new flags added after Windows 10 1709\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, t->path_in, -1, path_inW, ARRAY_SIZE(path_inW)); + hr = pPathAllocCanonicalize(path_inW, t->flags, &path_outW); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path_in, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, path_outW, -1, path_outA, ARRAY_SIZE(path_outA), NULL, NULL); + ok(!lstrcmpA(path_outA, t->path_out), "path \"%s\" expect output path \"%s\", got \"%s\"\n", t->path_in, + t->path_out, path_outA); + LocalFree(path_outW); + } + } +} + static const struct { const char *path1; @@ -1386,6 +1690,7 @@ START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); + pPathAllocCanonicalize = (void *)GetProcAddress(hmod, "PathAllocCanonicalize"); pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); @@ -1402,6 +1707,7 @@ START_TEST(path) pPathCchStripToRoot = (void *)GetProcAddress(hmod, "PathCchStripToRoot"); pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); + test_PathAllocCanonicalize(); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); diff --git a/include/pathcch.h b/include/pathcch.h index 12a6fc5511..b1d6be249d 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -22,9 +22,11 @@ #define PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS 0x04 #define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 #define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 +#define PATHCCH_ENSURE_TRAILING_SLASH 0x20 #define PATHCCH_MAX_CCH 0x8000 +HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out); HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -- 2.19.1

1 0

[PATCH 3/6] kernelbase: Implement PathCchRemoveFileSpec.
by Zhiyi Zhang 23 Nov '18

23 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 37 +++++ dlls/kernelbase/tests/path.c | 126 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 166 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index fcc3d7ffad..725f16448f 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -14,7 +14,7 @@ @ stdcall PathCchRemoveBackslash(wstr long) kernelbase.PathCchRemoveBackslash @ stdcall PathCchRemoveBackslashEx(wstr long ptr ptr) kernelbase.PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension -@ stub PathCchRemoveFileSpec +@ stdcall PathCchRemoveFileSpec(wstr long) kernelbase.PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension @ stdcall PathCchSkipRoot(wstr ptr) kernelbase.PathCchSkipRoot @ stdcall PathCchStripPrefix(wstr long) kernelbase.PathCchStripPrefix diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 252f47c5c7..e7bb62d75c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1043,7 +1043,7 @@ @ stdcall PathCchRemoveBackslash(wstr long) @ stdcall PathCchRemoveBackslashEx(wstr long ptr ptr) @ stdcall PathCchRemoveExtension(wstr long) -# @ stub PathCchRemoveFileSpec +@ stdcall PathCchRemoveFileSpec(wstr long) @ stdcall PathCchRenameExtension(wstr long wstr) @ stdcall PathCchSkipRoot(wstr ptr) @ stdcall PathCchStripPrefix(wstr long) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b28abc437c..c3fca8b9cf 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -346,6 +346,43 @@ HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) return next == extension ? S_FALSE : S_OK; } +HRESULT WINAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size) +{ + const WCHAR *root_end = NULL; + SIZE_T length; + WCHAR *last; + + TRACE("%s %lu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + if (PathCchIsRoot(path)) return S_FALSE; + + PathCchSkipRoot(path, &root_end); + + /* The backslash at the end of UNC and \\* are not considered part of root in this case */ + if (root_end && root_end > path && root_end[-1] == '\\' + && (is_prefixed_unc(path) || (path[0] == '\\' && path[1] == '\\' && path[2] != '?'))) + root_end--; + + length = strlenW(path); + last = path + length - 1; + while (last >= path && (!root_end || last >= root_end)) + { + if (last - path >= size) return E_INVALIDARG; + + if (*last == '\\') + { + *last-- = 0; + break; + } + + *last-- = 0; + } + + return last != path + length - 1 ? S_OK : S_FALSE; +} + HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) { HRESULT hr; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index dc76b9b5c7..8981b3a08a 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -39,6 +39,7 @@ BOOL (WINAPI *pPathCchIsRoot)(const WCHAR *path); HRESULT (WINAPI *pPathCchRemoveBackslash)(WCHAR *path, SIZE_T path_size); HRESULT (WINAPI *pPathCchRemoveBackslashEx)(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); +HRESULT (WINAPI *pPathCchRemoveFileSpec)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT (WINAPI *pPathCchSkipRoot)(const WCHAR *path, const WCHAR **root_end); HRESULT (WINAPI *pPathCchStripPrefix)(WCHAR *path, SIZE_T size); @@ -787,6 +788,129 @@ static void test_PathCchRemoveExtension(void) } } +struct removefilespec_test +{ + const CHAR *path; + const CHAR *expected; + HRESULT hr; + SIZE_T size; +}; + +static const struct removefilespec_test removefilespec_tests[] = +{ + {"", "", S_FALSE}, + {"a", "", S_OK}, + {"a\\", "a", S_OK}, + {"a\\b", "a", S_OK}, + + {"\\", "\\", S_FALSE}, + {"\\a", "\\", S_OK}, + {"\\a\\", "\\a", S_OK}, + {"\\a\\b", "\\a", S_OK}, + + {"\\\\", "\\\\", S_FALSE}, + {"\\\\a", "\\\\a", S_FALSE}, + {"\\\\a\\", "\\\\a", S_OK}, + {"\\\\a\\b", "\\\\a\\b", S_FALSE}, + {"\\\\a\\b\\", "\\\\a\\b", S_OK}, + {"\\\\a\\b\\c", "\\\\a\\b", S_OK}, + + {"C:", "C:", S_FALSE}, + {"C:a", "C:", S_OK}, + {"C:a\\", "C:a", S_OK}, + {"C:a\\b", "C:a", S_OK}, + + {"C:\\", "C:\\", S_FALSE}, + {"C:\\a", "C:\\", S_OK}, + {"C:\\a\\", "C:\\a", S_OK}, + {"C:\\a\\b", "C:\\a", S_OK}, + + {"\\\\?\\", "\\\\?", S_OK}, + {"\\\\?\\a", "\\\\?", S_OK}, + {"\\\\?\\a\\", "\\\\?\\a", S_OK}, + {"\\\\?\\a\\b", "\\\\?\\a", S_OK}, + + {"\\\\?\\C:", "\\\\?\\C:", S_FALSE}, + {"\\\\?\\C:a", "\\\\?\\C:", S_OK}, + {"\\\\?\\C:a\\", "\\\\?\\C:a", S_OK}, + {"\\\\?\\C:a\\b", "\\\\?\\C:a", S_OK}, + + {"\\\\?\\C:\\", "\\\\?\\C:\\", S_FALSE}, + {"\\\\?\\C:\\a", "\\\\?\\C:\\", S_OK}, + {"\\\\?\\C:\\a\\", "\\\\?\\C:\\a", S_OK}, + {"\\\\?\\C:\\a\\b", "\\\\?\\C:\\a", S_OK}, + + {"\\\\?\\UNC\\", "\\\\?\\UNC\\", S_FALSE}, + {"\\\\?\\UNC\\a", "\\\\?\\UNC\\a", S_FALSE}, + {"\\\\?\\UNC\\a\\", "\\\\?\\UNC\\a", S_OK}, + {"\\\\?\\UNC\\a\\b", "\\\\?\\UNC\\a\\b", S_FALSE}, + {"\\\\?\\UNC\\a\\b\\", "\\\\?\\UNC\\a\\b", S_OK}, + {"\\\\?\\UNC\\a\\b\\c", "\\\\?\\UNC\\a\\b", S_OK}, + + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a\\b", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", S_OK}, + + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\b", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", S_OK}, + + /* Size tests */ + {"C:\\a", NULL, E_INVALIDARG, PATHCCH_MAX_CCH + 1}, + {"C:\\a", "C:\\", S_OK, PATHCCH_MAX_CCH}, + /* Size < original path length + 1, read beyond size */ + {"C:\\a", "C:\\", S_OK, ARRAY_SIZE("C:\\a") - 1}, + /* Size < result path length + 1 */ + {"C:\\a", NULL, E_INVALIDARG, ARRAY_SIZE("C:\\") - 1} +}; + +static void test_PathCchRemoveFileSpec(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH] = {0}; + CHAR pathA[PATHCCH_MAX_CCH]; + SIZE_T size; + HRESULT hr; + INT i; + + if (!pPathCchRemoveFileSpec) + { + win_skip("PathCchRemoveFileSpec() is not available.\n"); + return; + } + + /* Null arguments */ + hr = pPathCchRemoveFileSpec(NULL, ARRAY_SIZE(pathW)); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRemoveFileSpec(pathW, 0); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(removefilespec_tests); i++) + { + const struct removefilespec_test *t = removefilespec_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + size = t->size ? t->size : ARRAY_SIZE(pathW); + hr = pPathCchRemoveFileSpec(pathW, size); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s expect stripped path %s, got %s\n", t->path, t->expected, pathA); + } + } +} + struct renameextension_test { const CHAR *path; @@ -1271,6 +1395,7 @@ START_TEST(path) pPathCchRemoveBackslash = (void *)GetProcAddress(hmod, "PathCchRemoveBackslash"); pPathCchRemoveBackslashEx = (void *)GetProcAddress(hmod, "PathCchRemoveBackslashEx"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); + pPathCchRemoveFileSpec = (void *)GetProcAddress(hmod, "PathCchRemoveFileSpec"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); pPathCchSkipRoot = (void *)GetProcAddress(hmod, "PathCchSkipRoot"); pPathCchStripPrefix = (void *)GetProcAddress(hmod, "PathCchStripPrefix"); @@ -1286,6 +1411,7 @@ START_TEST(path) test_PathCchRemoveBackslash(); test_PathCchRemoveBackslashEx(); test_PathCchRemoveExtension(); + test_PathCchRemoveFileSpec(); test_PathCchRenameExtension(); test_PathCchSkipRoot(); test_PathCchStripPrefix(); diff --git a/include/pathcch.h b/include/pathcch.h index f4c8377059..12a6fc5511 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -34,6 +34,7 @@ BOOL WINAPI PathCchIsRoot(const WCHAR *path); HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size); HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); +HRESULT WINAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); -- 2.19.1

1 0

[PATCH 2/6] kernelbase: Implement PathCchRemoveBackslash.
by Zhiyi Zhang 23 Nov '18

23 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 10 ++++ dlls/kernelbase/tests/path.c | 49 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 3caaf80acb..fcc3d7ffad 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -11,7 +11,7 @@ @ stub PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stdcall PathCchIsRoot(wstr) kernelbase.PathCchIsRoot -@ stub PathCchRemoveBackslash +@ stdcall PathCchRemoveBackslash(wstr long) kernelbase.PathCchRemoveBackslash @ stdcall PathCchRemoveBackslashEx(wstr long ptr ptr) kernelbase.PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a08fd2c046..252f47c5c7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1040,7 +1040,7 @@ # @ stub PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) @ stdcall PathCchIsRoot(wstr) -# @ stub PathCchRemoveBackslash +@ stdcall PathCchRemoveBackslash(wstr long) @ stdcall PathCchRemoveBackslashEx(wstr long ptr ptr) @ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 05fcc2b265..b28abc437c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -278,6 +278,16 @@ BOOL WINAPI PathCchIsRoot(const WCHAR *path) return FALSE; } +HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size) +{ + WCHAR *path_end; + SIZE_T free_size; + + TRACE("%s %lu\n", debugstr_w(path), path_size); + + return PathCchRemoveBackslashEx(path, path_size, &path_end, &free_size); +} + HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size) { const WCHAR *root_end; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 0050e1a643..dc76b9b5c7 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -36,6 +36,7 @@ HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *ex HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL (WINAPI *pPathCchIsRoot)(const WCHAR *path); +HRESULT (WINAPI *pPathCchRemoveBackslash)(WCHAR *path, SIZE_T path_size); HRESULT (WINAPI *pPathCchRemoveBackslashEx)(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); @@ -593,6 +594,52 @@ static const struct removebackslashex_test removebackslashex_tests [] = "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", 50, 2, S_OK} }; +static void test_PathCchRemoveBackslash(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH]; + CHAR pathA[PATHCCH_MAX_CCH]; + HRESULT hr; + SIZE_T path_size; + INT i; + + if (!pPathCchRemoveBackslash) + { + win_skip("PathCchRemoveBackslash() is not available.\n"); + return; + } + + /* No NULL check for path on Windows */ + if (0) + { + hr = pPathCchRemoveBackslash(NULL, PATHCCH_MAX_CCH); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + } + + MultiByteToWideChar(CP_ACP, 0, "C:\\a\\", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveBackslash(pathW, 0); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRemoveBackslash(pathW, PATHCCH_MAX_CCH + 1); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + + hr = pPathCchRemoveBackslash(pathW, PATHCCH_MAX_CCH); + ok(hr == S_FALSE, "expect hr %#x, got %#x\n", S_FALSE, hr); + + for (i = 0; i < ARRAY_SIZE(removebackslashex_tests); i++) + { + const struct removebackslashex_test *t = removebackslashex_tests + i; + path_size = MultiByteToWideChar(CP_ACP, 0, t->path_in, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveBackslash(pathW, path_size); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path_in, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->path_out), "path %s expect output path %s, got %s\n", t->path_in, t->path_out, + pathA); + } + } +} + static void test_PathCchRemoveBackslashEx(void) { WCHAR pathW[PATHCCH_MAX_CCH]; @@ -1221,6 +1268,7 @@ START_TEST(path) pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); + pPathCchRemoveBackslash = (void *)GetProcAddress(hmod, "PathCchRemoveBackslash"); pPathCchRemoveBackslashEx = (void *)GetProcAddress(hmod, "PathCchRemoveBackslashEx"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); @@ -1235,6 +1283,7 @@ START_TEST(path) test_PathCchAddExtension(); test_PathCchFindExtension(); test_PathCchIsRoot(); + test_PathCchRemoveBackslash(); test_PathCchRemoveBackslashEx(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); diff --git a/include/pathcch.h b/include/pathcch.h index f7de815d16..f4c8377059 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,6 +31,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL WINAPI PathCchIsRoot(const WCHAR *path); +HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size); HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -- 2.19.1

1 0

[PATCH 1/6] kernelbase: Implement PathCchRemoveBackslashEx.
by Zhiyi Zhang 23 Nov '18

23 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 39 ++++++ dlls/kernelbase/tests/path.c | 116 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 158 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 61eb22031e..3caaf80acb 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -12,7 +12,7 @@ @ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stdcall PathCchIsRoot(wstr) kernelbase.PathCchIsRoot @ stub PathCchRemoveBackslash -@ stub PathCchRemoveBackslashEx +@ stdcall PathCchRemoveBackslashEx(wstr long ptr ptr) kernelbase.PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ffb5a95721..a08fd2c046 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1041,7 +1041,7 @@ @ stdcall PathCchFindExtension(wstr long ptr) @ stdcall PathCchIsRoot(wstr) # @ stub PathCchRemoveBackslash -# @ stub PathCchRemoveBackslashEx +@ stdcall PathCchRemoveBackslashEx(wstr long ptr ptr) @ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 75faf0b79c..05fcc2b265 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -278,6 +278,45 @@ BOOL WINAPI PathCchIsRoot(const WCHAR *path) return FALSE; } +HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size) +{ + const WCHAR *root_end; + SIZE_T path_length; + + TRACE("%s %lu %p %p\n", debugstr_w(path), path_size, path_end, free_size); + + if (!path_size || !path_end || !free_size) + { + if (path_end) *path_end = NULL; + if (free_size) *free_size = 0; + return E_INVALIDARG; + } + + path_length = strnlenW(path, path_size); + if (path_length == path_size && !path[path_length]) return E_INVALIDARG; + + root_end = get_root_end(path); + if (path_length > 0 && path[path_length - 1] == '\\') + { + *path_end = path + path_length - 1; + *free_size = path_size - path_length + 1; + /* If the last character is beyond end of root */ + if (!root_end || path + path_length - 1 > root_end) + { + path[path_length - 1] = 0; + return S_OK; + } + else + return S_FALSE; + } + else + { + *path_end = path + path_length; + *free_size = path_size - path_length; + return S_FALSE; + } +} + HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) { const WCHAR *extension; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 2edd49b0af..0050e1a643 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -36,6 +36,7 @@ HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *ex HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL (WINAPI *pPathCchIsRoot)(const WCHAR *path); +HRESULT (WINAPI *pPathCchRemoveBackslashEx)(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT (WINAPI *pPathCchSkipRoot)(const WCHAR *path, const WCHAR **root_end); @@ -544,6 +545,119 @@ static void test_PathCchIsRoot(void) } } +struct removebackslashex_test +{ + const CHAR *path_in; + const CHAR *path_out; + int end_offset; + SIZE_T free_size; + HRESULT hr; +}; + +static const struct removebackslashex_test removebackslashex_tests [] = +{ + {"", "", 0, 1, S_FALSE}, + {"C", "C", 1, 1, S_FALSE}, + {"C\\", "C", 1, 2, S_OK}, + {"C:", "C:", 2, 1, S_FALSE}, + {"C:\\", "C:\\", 2, 2, S_FALSE}, + {"C:\\\\", "C:\\", 3, 2, S_OK}, + {"C:\\a\\", "C:\\a", 4, 2, S_OK}, + {"C:\\a\\\\", "C:\\a\\", 5, 2, S_OK}, + {"\\", "\\", 0, 2, S_FALSE}, + {"\\\\", "\\\\", 1, 2, S_FALSE}, + {"\\?\\", "\\?", 2, 2, S_OK}, + {"\\?\\\\", "\\?\\", 3, 2, S_OK}, + {"\\a\\", "\\a", 2, 2, S_OK}, + {"\\a\\\\", "\\a\\", 3, 2, S_OK}, + {"\\\\a\\", "\\\\a", 3, 2, S_OK}, + {"\\\\a\\b\\", "\\\\a\\b", 5, 2, S_OK}, + {"\\\\a\\\\", "\\\\a\\", 4, 2, S_OK}, + {"\\\\?\\", "\\\\?", 3, 2, S_OK}, + {"\\\\?\\\\", "\\\\?\\", 4, 2, S_OK}, + {"\\\\?\\C:", "\\\\?\\C:", 6, 1, S_FALSE}, + {"\\\\?\\C:\\", "\\\\?\\C:\\", 6, 2, S_FALSE}, + {"\\?\\UNC\\", "\\?\\UNC", 6, 2, S_OK}, + {"\\\\?\\UNC", "\\\\?\\UNC", 7, 1, S_FALSE}, + {"\\\\?\\UNC\\", "\\\\?\\UNC\\", 7, 2, S_FALSE}, + {"\\\\?\\UNC\\a", "\\\\?\\UNC\\a", 9, 1, S_FALSE}, + {"\\\\?\\UNC\\a\\", "\\\\?\\UNC\\a", 9, 2, S_OK}, + {"\\\\?\\UNC\\a\\b\\", "\\\\?\\UNC\\a\\b", 11, 2, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", 48, 1, S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 48, 2, S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", 50, 1, S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", 50, 2, S_OK} +}; + +static void test_PathCchRemoveBackslashEx(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH]; + CHAR pathA[PATHCCH_MAX_CCH]; + WCHAR *path_end; + SIZE_T path_size, free_size; + HRESULT hr; + INT i; + + if (!pPathCchRemoveBackslashEx) + { + win_skip("PathCchRemoveBackslashEx() is not available.\n"); + return; + } + + /* No NULL check for path on Windows */ + if (0) + { + hr = pPathCchRemoveBackslashEx(NULL, 0, &path_end, &path_size); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + } + + path_size = MultiByteToWideChar(CP_ACP, 0, "C:\\a\\", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveBackslashEx(pathW, 0, &path_end, &path_size); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + free_size = 0xdeadbeef; + hr = pPathCchRemoveBackslashEx(pathW, path_size, NULL, &free_size); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(free_size == 0, "expect %d, got %lu\n", 0, free_size); + + path_end = (WCHAR *)0xdeadbeef; + hr = pPathCchRemoveBackslashEx(pathW, path_size, &path_end, NULL); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(path_end == NULL, "expect null, got %p\n", path_end); + + hr = pPathCchRemoveBackslashEx(pathW, PATHCCH_MAX_CCH + 1, &path_end, &free_size); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + + hr = pPathCchRemoveBackslashEx(pathW, PATHCCH_MAX_CCH, &path_end, &free_size); + ok(hr == S_FALSE, "expect hr %#x, got %#x\n", S_FALSE, hr); + + /* Size < original path length + 1, don't read beyond size */ + MultiByteToWideChar(CP_ACP, 0, "C:\\a", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveBackslashEx(pathW, ARRAY_SIZE("C:\\a") - 1, &path_end, &free_size); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(removebackslashex_tests); i++) + { + const struct removebackslashex_test *t = removebackslashex_tests + i; + path_size = MultiByteToWideChar(CP_ACP, 0, t->path_in, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveBackslashEx(pathW, path_size, &path_end, &free_size); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path_in, t->hr, hr); + if (SUCCEEDED(hr)) + { + ok(path_end - pathW == t->end_offset, "path %s expect end offset %d, got %d\n", t->path_in, t->end_offset, + path_end - pathW); + ok(free_size == t->free_size, "path %s expect free size %lu, got %lu\n", t->path_in, t->free_size, free_size); + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->path_out), "path %s expect output path %s, got %s\n", t->path_in, t->path_out, + pathA); + } + } +} + struct removeextension_test { const CHAR *path; @@ -1107,6 +1221,7 @@ START_TEST(path) pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); + pPathCchRemoveBackslashEx = (void *)GetProcAddress(hmod, "PathCchRemoveBackslashEx"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); pPathCchSkipRoot = (void *)GetProcAddress(hmod, "PathCchSkipRoot"); @@ -1120,6 +1235,7 @@ START_TEST(path) test_PathCchAddExtension(); test_PathCchFindExtension(); test_PathCchIsRoot(); + test_PathCchRemoveBackslashEx(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); test_PathCchSkipRoot(); diff --git a/include/pathcch.h b/include/pathcch.h index 443ccd3a4f..f7de815d16 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,6 +31,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL WINAPI PathCchIsRoot(const WCHAR *path); +HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); -- 2.19.1

1 0

[PATCH 7/7] winhttp: Return an error from WinHttpReceiveResponse if there's no connection.
by Hans Leidekker 22 Nov '18

22 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46175 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 6 ++++++ dlls/winhttp/tests/winhttp.c | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 54173f1ff4..27628c3292 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2736,6 +2736,12 @@ static BOOL receive_response( struct request *request, BOOL async ) BOOL ret; DWORD size, query, status; + if (!request->netconn) + { + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + return FALSE; + } + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); for (;;) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4779cfd1a7..3f9125154f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2086,6 +2086,11 @@ static void test_resolve_timeout(void) ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + ret = WinHttpReceiveResponse( req, NULL ); + ok( !ret && (GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || + GetLastError() == ERROR_WINHTTP_OPERATION_CANCELLED /* < win7 */), + "got %u\n", GetLastError() ); + WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); -- 2.11.0

2 1

[PATCH 6/7] winhttp/tests: Get rid of workarounds for Windows 2000.
by Hans Leidekker 22 Nov '18

22 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 70d0b4c747..4779cfd1a7 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1198,11 +1198,6 @@ static void test_request_parameter_defaults(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - if (!ret && GetLastError() == ERROR_WINHTTP_INVALID_SERVER_RESPONSE) /* win2k */ - { - win_skip("invalid response\n"); - goto done; - } ok(ret, "failed to receive response %u\n", GetLastError()); status = 0xdeadbeef; @@ -4420,14 +4415,12 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) WCHAR *url; DWORD error; -if (0) /* crashes on some win2k systems */ -{ SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); -} + url = NULL; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( 0, &url ); @@ -4435,14 +4428,12 @@ if (0) /* crashes on some win2k systems */ ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); -if (0) /* crashes on some win2k systems */ -{ SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); -} + url = (WCHAR *)0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url ); -- 2.11.0

1 0

[PATCH 5/7] winhttp: Get rid of get/set_last_error.
by Hans Leidekker 22 Nov '18

22 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 8 +-- dlls/winhttp/request.c | 146 +++++++++++++++++++-------------------- dlls/winhttp/session.c | 152 +++++++++++++++++++---------------------- dlls/winhttp/url.c | 24 +++---- dlls/winhttp/winhttp_private.h | 2 - 5 files changed, 159 insertions(+), 173 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 004933ff81..af1d19d212 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -225,7 +225,7 @@ struct netconn *netconn_create( struct hostdata *host, const struct sockaddr_sto FD_ZERO( &set ); FD_SET( conn->socket, &set ); if ((res = select( conn->socket + 1, NULL, &set, NULL, &timeval )) > 0) ret = TRUE; - else if (!res) set_last_error( ERROR_WINHTTP_TIMEOUT ); + else if (!res) SetLastError( ERROR_WINHTTP_TIMEOUT ); } } @@ -233,7 +233,7 @@ struct netconn *netconn_create( struct hostdata *host, const struct sockaddr_sto if (!ret) { - WARN("unable to connect to host (%u)\n", get_last_error()); + WARN("unable to connect to host (%u)\n", GetLastError()); closesocket( conn->socket ); heap_free( conn ); return NULL; @@ -378,7 +378,7 @@ BOOL netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD securi heap_free(conn->ssl_buf); conn->ssl_buf = NULL; DeleteSecurityContext(&ctx); - set_last_error(res ? res : ERROR_WINHTTP_SECURE_CHANNEL_ERROR); + SetLastError(res ? res : ERROR_WINHTTP_SECURE_CHANNEL_ERROR); return FALSE; } @@ -690,7 +690,7 @@ BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_stora if (ret) { - set_last_error( ret ); + SetLastError( ret ); return FALSE; } return TRUE; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0f37f38422..54173f1ff4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -420,7 +420,7 @@ static BOOL process_header( struct request *request, const WCHAR *field, const W } else if (!(flags & WINHTTP_ADDREQ_FLAG_ADD)) { - set_last_error( ERROR_WINHTTP_HEADER_NOT_FOUND ); + SetLastError( ERROR_WINHTTP_HEADER_NOT_FOUND ); return FALSE; } @@ -520,25 +520,25 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD if (!headers || !len) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } ret = add_request_headers( request, headers, len, flags ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -652,7 +652,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na for (len = 0; *p; p++) if (*p != '\r') len++; if (!buffer || len * sizeof(WCHAR) > *buflen) - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); else { for (p = headers, q = buffer; *p; p++, q++) @@ -686,7 +686,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na if (!buffer || len + sizeof(WCHAR) > *buflen) { len += sizeof(WCHAR); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); } else { @@ -703,7 +703,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na if (!buffer || len + sizeof(WCHAR) > *buflen) { len += sizeof(WCHAR); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); } else { @@ -719,7 +719,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na if (!buffer || len + sizeof(WCHAR) > *buflen) { len += sizeof(WCHAR); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); } else { @@ -747,14 +747,14 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na } if (!header || (request_only && !header->is_request)) { - set_last_error( ERROR_WINHTTP_HEADER_NOT_FOUND ); + SetLastError( ERROR_WINHTTP_HEADER_NOT_FOUND ); return FALSE; } if (level & WINHTTP_QUERY_FLAG_NUMBER) { if (!buffer || sizeof(int) > *buflen) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); } else { @@ -770,7 +770,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na SYSTEMTIME *st = buffer; if (!buffer || sizeof(SYSTEMTIME) > *buflen) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); } else if ((ret = WinHttpTimeToSystemTime( header->value, st ))) { @@ -786,7 +786,7 @@ static BOOL query_headers( struct request *request, DWORD level, const WCHAR *na if (!buffer || len + sizeof(WCHAR) > *buflen) { len += sizeof(WCHAR); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); } else { @@ -812,20 +812,20 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } ret = query_headers( request, level, name, buffer, buflen, index ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -882,7 +882,7 @@ static BOOL query_auth_schemes( struct request *request, DWORD level, DWORD *sup size = 0; query_headers( request, level, NULL, NULL, &size, &index ); - if (get_last_error() != ERROR_INSUFFICIENT_BUFFER) break; + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) break; if (!(buffer = heap_alloc( size ))) return FALSE; if (!query_headers( request, level, NULL, buffer, &size, &index )) @@ -920,19 +920,19 @@ BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDW if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } if (!supported || !first || !target) { release_object( &request->hdr ); - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -947,10 +947,10 @@ BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDW *target = WINHTTP_AUTH_TARGET_PROXY; ret = TRUE; } - else set_last_error( ERROR_INVALID_OPERATION ); + else SetLastError( ERROR_INVALID_OPERATION ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -2255,7 +2255,7 @@ end: { WINHTTP_ASYNC_RESULT result; result.dwResult = API_SEND_REQUEST; - result.dwError = get_last_error(); + result.dwError = GetLastError(); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } @@ -2283,13 +2283,13 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -2316,7 +2316,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade ret = send_request( request, headers, headers_len, optional, optional_len, total_len, context, FALSE ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -2327,7 +2327,7 @@ static BOOL set_credentials( struct request *request, DWORD target, DWORD scheme if (scheme == SCHEME_INVALID || ((scheme == SCHEME_BASIC || scheme == SCHEME_DIGEST) && (!username || !password))) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } switch (target) @@ -2374,20 +2374,20 @@ BOOL WINAPI WinHttpSetCredentials( HINTERNET hrequest, DWORD target, DWORD schem if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } ret = set_credentials( request, target, scheme, username, password ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -2612,7 +2612,7 @@ static WCHAR *get_redirect_url( struct request *request, DWORD *len ) WCHAR *ret; query_headers( request, WINHTTP_QUERY_LOCATION, NULL, NULL, &size, NULL ); - if (get_last_error() != ERROR_INSUFFICIENT_BUFFER) return FALSE; + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; if (!(ret = heap_alloc( size ))) return NULL; *len = size / sizeof(WCHAR) - 1; if (query_headers( request, WINHTTP_QUERY_LOCATION, NULL, ret, &size, NULL )) return ret; @@ -2741,7 +2741,7 @@ static BOOL receive_response( struct request *request, BOOL async ) { if (!(ret = read_reply( request ))) { - set_last_error( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ); + SetLastError( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ); break; } size = sizeof(DWORD); @@ -2784,7 +2784,7 @@ static BOOL receive_response( struct request *request, BOOL async ) { WINHTTP_ASYNC_RESULT result; result.dwResult = API_RECEIVE_RESPONSE; - result.dwError = get_last_error(); + result.dwError = GetLastError(); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } @@ -2809,13 +2809,13 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -2834,7 +2834,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) ret = receive_response( request, FALSE ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -2880,13 +2880,13 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -2906,7 +2906,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) ret = query_data_available( request, available, FALSE ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -2928,13 +2928,13 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -2956,7 +2956,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L ret = read_data( request, buffer, to_read, read, FALSE ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -2974,7 +2974,7 @@ static BOOL write_data( struct request *request, const void *buffer, DWORD to_wr { WINHTTP_ASYNC_RESULT result; result.dwResult = API_WRITE_DATA; - result.dwError = get_last_error(); + result.dwError = GetLastError(); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } } @@ -3000,13 +3000,13 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write if (!(request = (struct request *)grab_object( hrequest ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) { release_object( &request->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -3028,7 +3028,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write ret = write_data( request, buffer, to_write, written, FALSE ); release_object( &request->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -3429,7 +3429,7 @@ static HRESULT WINAPI winhttp_request_SetCredentials( } if (!WinHttpSetCredentials( request->hrequest, target, scheme, username, password, NULL )) { - err = get_last_error(); + err = GetLastError(); } done: LeaveCriticalSection( &request->cs ); @@ -3515,7 +3515,7 @@ static HRESULT WINAPI winhttp_request_Open( uc.dwHostNameLength = ~0u; uc.dwUrlPathLength = ~0u; uc.dwExtraInfoLength = ~0u; - if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( get_last_error() ); + if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( GetLastError() ); EnterCriticalSection( &request->cs ); if (request->state < REQUEST_STATE_INITIALIZED) initialize_request( request ); @@ -3538,20 +3538,20 @@ static HRESULT WINAPI winhttp_request_Open( if (!(request->hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, WINHTTP_FLAG_ASYNC ))) { - err = get_last_error(); + err = GetLastError(); goto error; } if (!(request->hconnect = WinHttpConnect( request->hsession, hostname, uc.nPort, 0 ))) { WinHttpCloseHandle( request->hsession ); request->hsession = NULL; - err = get_last_error(); + err = GetLastError(); goto error; } } else if (!(request->hconnect = WinHttpConnect( request->hsession, hostname, uc.nPort, 0 ))) { - err = get_last_error(); + err = GetLastError(); goto error; } @@ -3562,7 +3562,7 @@ static HRESULT WINAPI winhttp_request_Open( } if (!(request->hrequest = WinHttpOpenRequest( request->hconnect, method, path, NULL, NULL, acceptW, flags ))) { - err = get_last_error(); + err = GetLastError(); goto error; } WinHttpSetOption( request->hrequest, WINHTTP_OPTION_CONTEXT_VALUE, &request, sizeof(request) ); @@ -3621,7 +3621,7 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( if (!WinHttpAddRequestHeaders( request->hrequest, str, len, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE )) { - err = get_last_error(); + err = GetLastError(); } heap_free( str ); @@ -3654,7 +3654,7 @@ static HRESULT WINAPI winhttp_request_GetResponseHeader( size = 0; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CUSTOM, header, NULL, &size, NULL )) { - err = get_last_error(); + err = GetLastError(); if (err != ERROR_INSUFFICIENT_BUFFER) goto done; } if (!(*value = SysAllocStringLen( NULL, size / sizeof(WCHAR) ))) @@ -3665,7 +3665,7 @@ static HRESULT WINAPI winhttp_request_GetResponseHeader( err = ERROR_SUCCESS; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CUSTOM, header, *value, &size, NULL )) { - err = get_last_error(); + err = GetLastError(); SysFreeString( *value ); } done: @@ -3693,7 +3693,7 @@ static HRESULT WINAPI winhttp_request_GetAllResponseHeaders( size = 0; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL )) { - err = get_last_error(); + err = GetLastError(); if (err != ERROR_INSUFFICIENT_BUFFER) goto done; } if (!(*headers = SysAllocStringLen( NULL, size / sizeof(WCHAR) ))) @@ -3704,7 +3704,7 @@ static HRESULT WINAPI winhttp_request_GetAllResponseHeaders( err = ERROR_SUCCESS; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, *headers, &size, NULL )) { - err = get_last_error(); + err = GetLastError(); SysFreeString( *headers ); } done: @@ -3755,7 +3755,7 @@ static DWORD wait_for_completion( struct winhttp_request *request ) request->error = ERROR_CANCELLED; break; default: - request->error = get_last_error(); + request->error = GetLastError(); break; } return request->error; @@ -3768,7 +3768,7 @@ static HRESULT request_receive( struct winhttp_request *request ) wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE ); if (!WinHttpReceiveResponse( request->hrequest, NULL )) { - return HRESULT_FROM_WIN32( get_last_error() ); + return HRESULT_FROM_WIN32( GetLastError() ); } if ((err = wait_for_completion( request ))) return HRESULT_FROM_WIN32( err ); if (!strcmpW( request->verb, headW )) @@ -3784,7 +3784,7 @@ static HRESULT request_receive( struct winhttp_request *request ) wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE ); if (!WinHttpQueryDataAvailable( request->hrequest, &request->bytes_available )) { - err = get_last_error(); + err = GetLastError(); goto error; } if ((err = wait_for_completion( request ))) goto error; @@ -3805,7 +3805,7 @@ static HRESULT request_receive( struct winhttp_request *request ) if (!WinHttpReadData( request->hrequest, request->buffer + request->offset, request->bytes_available, &request->bytes_read )) { - err = get_last_error(); + err = GetLastError(); goto error; } if ((err = wait_for_completion( request ))) goto error; @@ -3824,19 +3824,19 @@ error: static DWORD request_set_parameters( struct winhttp_request *request ) { if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_PROXY, &request->proxy, - sizeof(request->proxy) )) return get_last_error(); + sizeof(request->proxy) )) return GetLastError(); if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, - sizeof(request->logon_policy) )) return get_last_error(); + sizeof(request->logon_policy) )) return GetLastError(); if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &request->disable_feature, - sizeof(request->disable_feature) )) return get_last_error(); + sizeof(request->disable_feature) )) return GetLastError(); if (!WinHttpSetTimeouts( request->hrequest, request->resolve_timeout, request->connect_timeout, request->send_timeout, - request->receive_timeout )) return get_last_error(); + request->receive_timeout )) return GetLastError(); return ERROR_SUCCESS; } @@ -3901,7 +3901,7 @@ static HRESULT request_send( struct winhttp_request *request ) wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); if (!WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 )) { - err = get_last_error(); + err = GetLastError(); goto error; } if ((err = wait_for_completion( request ))) goto error; @@ -3955,7 +3955,7 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) break; case WAIT_FAILED: default: - ret = get_last_error(); + ret = GetLastError(); break; } EnterCriticalSection( &request->cs ); @@ -3991,7 +3991,7 @@ static HRESULT WINAPI winhttp_request_Send( if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) { LeaveCriticalSection( &request->cs ); - return HRESULT_FROM_WIN32( get_last_error() ); + return HRESULT_FROM_WIN32( GetLastError() ); } request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -4023,7 +4023,7 @@ static HRESULT WINAPI winhttp_request_get_Status( flags = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; if (!WinHttpQueryHeaders( request->hrequest, flags, NULL, &status_code, &len, &index )) { - err = get_last_error(); + err = GetLastError(); goto done; } *status = status_code; @@ -4052,7 +4052,7 @@ static HRESULT WINAPI winhttp_request_get_StatusText( } if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_STATUS_TEXT, NULL, NULL, &len, &index )) { - err = get_last_error(); + err = GetLastError(); if (err != ERROR_INSUFFICIENT_BUFFER) goto done; } if (!(*status = SysAllocStringLen( NULL, len / sizeof(WCHAR) ))) @@ -4064,7 +4064,7 @@ static HRESULT WINAPI winhttp_request_get_StatusText( err = ERROR_SUCCESS; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_STATUS_TEXT, NULL, *status, &len, &index )) { - err = get_last_error(); + err = GetLastError(); SysFreeString( *status ); } done: @@ -4081,12 +4081,12 @@ static DWORD request_get_codepage( struct winhttp_request *request, UINT *codepa *codepage = CP_ACP; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CONTENT_TYPE, NULL, NULL, &size, NULL ) && - get_last_error() == ERROR_INSUFFICIENT_BUFFER) + GetLastError() == ERROR_INSUFFICIENT_BUFFER) { if (!(buffer = heap_alloc( size ))) return ERROR_OUTOFMEMORY; if (!WinHttpQueryHeaders( request->hrequest, WINHTTP_QUERY_CONTENT_TYPE, NULL, buffer, &size, NULL )) { - return get_last_error(); + return GetLastError(); } if ((p = strstrW( buffer, charsetW ))) { diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8b3f9f51b2..2051d4282b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -52,18 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); #define DEFAULT_RECEIVE_TIMEOUT 30000 #define DEFAULT_RECEIVE_RESPONSE_TIMEOUT ~0u -void set_last_error( DWORD error ) -{ - /* FIXME */ - SetLastError( error ); -} - -DWORD get_last_error( void ) -{ - /* FIXME */ - return GetLastError(); -} - void send_callback( struct object_header *hdr, DWORD status, void *info, DWORD buflen ) { if (hdr->callback && (hdr->notify_mask & status)) @@ -117,7 +105,7 @@ static BOOL session_query_option( struct object_header *hdr, DWORD option, void if (!buffer || *buflen < sizeof(DWORD)) { *buflen = sizeof(DWORD); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -152,7 +140,7 @@ static BOOL session_query_option( struct object_header *hdr, DWORD option, void default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } } @@ -176,7 +164,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b if (buflen != sizeof(policy)) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -189,7 +177,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b { if (buflen != sizeof(session->secure_protocols)) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } EnterCriticalSection( &session->cs ); @@ -199,7 +187,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b return TRUE; } case WINHTTP_OPTION_DISABLE_FEATURE: - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; case WINHTTP_OPTION_RESOLVE_TIMEOUT: @@ -241,7 +229,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_WINHTTP_INVALID_OPTION ); + SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } } @@ -313,7 +301,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST end: release_object( &session->hdr ); TRACE("returning %p\n", handle); - if (handle) set_last_error( ERROR_SUCCESS ); + if (handle) SetLastError( ERROR_SUCCESS ); return handle; } @@ -346,7 +334,7 @@ static BOOL connect_query_option( struct object_header *hdr, DWORD option, void if (!buffer || *buflen < sizeof(HINTERNET)) { *buflen = sizeof(HINTERNET); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -381,7 +369,7 @@ static BOOL connect_query_option( struct object_header *hdr, DWORD option, void default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } } @@ -553,18 +541,18 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO if (!server) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } if (!(session = (struct session *)grab_object( hsession ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return NULL; } if (session->hdr.type != WINHTTP_HANDLE_TYPE_SESSION) { release_object( &session->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return NULL; } if (!(connect = heap_alloc_zero( sizeof(struct connect) ))) @@ -599,7 +587,7 @@ end: release_object( &connect->hdr ); release_object( &session->hdr ); TRACE("returning %p\n", hconnect); - if (hconnect) set_last_error( ERROR_SUCCESS ); + if (hconnect) SetLastError( ERROR_SUCCESS ); return hconnect; } @@ -718,7 +706,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void if (!buffer || *buflen < sizeof(flags)) { *buflen = sizeof(flags); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -746,7 +734,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void if (!buffer || *buflen < sizeof(cert)) { *buflen = sizeof(cert); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -766,7 +754,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void if (!buffer || *buflen < sizeof(*ci)) { *buflen = sizeof(*ci); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } if (!cert) return FALSE; @@ -792,7 +780,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void if (!buffer || *buflen < sizeof(DWORD)) { *buflen = sizeof(DWORD); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -810,12 +798,12 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void if (!buffer || *buflen < sizeof(*info)) { *buflen = sizeof(*info); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } if (!request->netconn) { - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); return FALSE; } if (getsockname( request->netconn->socket, &local, &len )) return FALSE; @@ -867,7 +855,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } } @@ -881,7 +869,7 @@ static WCHAR *buffer_to_str( WCHAR *buffer, DWORD buflen ) ret[buflen] = 0; return ret; } - set_last_error( ERROR_OUTOFMEMORY ); + SetLastError( ERROR_OUTOFMEMORY ); return NULL; } @@ -904,7 +892,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b if (buflen != sizeof(DWORD)) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -919,7 +907,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b if (buflen != sizeof(DWORD)) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -934,7 +922,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b if (buflen != sizeof(DWORD)) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -949,7 +937,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b if (buflen < sizeof(DWORD)) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } flags = *(DWORD *)buffer; @@ -959,7 +947,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE))) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } request->security_flags = flags; @@ -1045,7 +1033,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_WINHTTP_INVALID_OPTION ); + SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } } @@ -1125,13 +1113,13 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!(connect = (struct connect *)grab_object( hconnect ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return NULL; } if (connect->hdr.type != WINHTTP_HANDLE_TYPE_CONNECT) { release_object( &connect->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return NULL; } if (!(request = heap_alloc_zero( sizeof(struct request) ))) @@ -1177,7 +1165,7 @@ end: release_object( &request->hdr ); release_object( &connect->hdr ); TRACE("returning %p\n", hrequest); - if (hrequest) set_last_error( ERROR_SUCCESS ); + if (hrequest) SetLastError( ERROR_SUCCESS ); return hrequest; } @@ -1192,12 +1180,12 @@ BOOL WINAPI WinHttpCloseHandle( HINTERNET handle ) if (!(hdr = grab_object( handle ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } release_object( hdr ); free_handle( handle ); - set_last_error( ERROR_SUCCESS ); + SetLastError( ERROR_SUCCESS ); return TRUE; } @@ -1207,7 +1195,7 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, if (!buflen) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -1218,7 +1206,7 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, if (!buffer || *buflen < sizeof(DWORD_PTR)) { *buflen = sizeof(DWORD_PTR); - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -1231,7 +1219,7 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, else { FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } break; @@ -1251,14 +1239,14 @@ BOOL WINAPI WinHttpQueryOption( HINTERNET handle, DWORD option, LPVOID buffer, L if (!(hdr = grab_object( handle ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } ret = query_option( hdr, option, buffer, buflen ); release_object( hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -1268,7 +1256,7 @@ static BOOL set_option( struct object_header *hdr, DWORD option, void *buffer, D if (!buffer && buflen) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -1278,7 +1266,7 @@ static BOOL set_option( struct object_header *hdr, DWORD option, void *buffer, D { if (buflen != sizeof(DWORD_PTR)) { - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -1290,7 +1278,7 @@ static BOOL set_option( struct object_header *hdr, DWORD option, void *buffer, D else { FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } break; @@ -1310,14 +1298,14 @@ BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, LPVOID buffer, DWO if (!(hdr = grab_object( handle ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } ret = set_option( hdr, option, buffer, buflen ); release_object( hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -1421,7 +1409,7 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) if (!flags || !url) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } if (get_system_proxy_autoconfig_url( system_url, sizeof(system_url) )) @@ -1430,7 +1418,7 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) if (!(urlW = strdupAW( system_url ))) return FALSE; *url = urlW; - set_last_error( ERROR_SUCCESS ); + SetLastError( ERROR_SUCCESS ); return TRUE; } if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) @@ -1484,10 +1472,10 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } if (!ret) { - set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); + SetLastError( ERROR_WINHTTP_AUTODETECTION_FAILED ); *url = NULL; } - else set_last_error( ERROR_SUCCESS ); + else SetLastError( ERROR_SUCCESS ); return ret; } @@ -1646,7 +1634,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) info->lpszProxy = NULL; info->lpszProxyBypass = NULL; } - set_last_error( ERROR_SUCCESS ); + SetLastError( ERROR_SUCCESS ); return TRUE; } @@ -1666,7 +1654,7 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY if (!config) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } memset( config, 0, sizeof(*config) ); @@ -1729,7 +1717,7 @@ done: GlobalFree( config->lpszProxyBypass ); config->lpszProxyBypass = NULL; } - else set_last_error( ERROR_SUCCESS ); + else SetLastError( ERROR_SUCCESS ); return ret; } @@ -1823,7 +1811,7 @@ done: WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); heap_free( hostname ); - if (!buffer) set_last_error( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); + if (!buffer) SetLastError( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); return buffer; } @@ -1895,13 +1883,13 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO if (!(session = (struct session *)grab_object( hsession ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } if (session->hdr.type != WINHTTP_HANDLE_TYPE_SESSION) { release_object( &session->hdr ); - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } if (!url || !options || !info || @@ -1911,7 +1899,7 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL))) { release_object( &session->hdr ); - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } if (options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT && @@ -1930,7 +1918,7 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO done: GlobalFree( detected_pac_url ); release_object( &session->hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -1948,7 +1936,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) if (!info) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } switch (info->dwAccessType) @@ -1958,14 +1946,14 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) case WINHTTP_ACCESS_TYPE_NAMED_PROXY: if (!info->lpszProxy) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } /* Only ASCII characters are allowed */ for (src = info->lpszProxy; *src; src++) if (*src > 0x7f) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } if (info->lpszProxyBypass) @@ -1973,13 +1961,13 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) for (src = info->lpszProxyBypass; *src; src++) if (*src > 0x7f) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } } break; default: - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -2038,7 +2026,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } RegCloseKey( key ); } - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -2055,7 +2043,7 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT if (!(hdr = grab_object( handle ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return WINHTTP_INVALID_STATUS_CALLBACK; } ret = hdr->callback; @@ -2063,7 +2051,7 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT hdr->notify_mask = flags; release_object( hdr ); - set_last_error( ERROR_SUCCESS ); + SetLastError( ERROR_SUCCESS ); return ret; } @@ -2079,13 +2067,13 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int if (resolve < -1 || connect < -1 || send < -1 || receive < -1) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } if (!(hdr = grab_object( handle ))) { - set_last_error( ERROR_INVALID_HANDLE ); + SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } @@ -2128,11 +2116,11 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int break; } default: - set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); ret = FALSE; } release_object( hdr ); - if (ret) set_last_error( ERROR_SUCCESS ); + if (ret) SetLastError( ERROR_SUCCESS ); return ret; } @@ -2157,7 +2145,7 @@ BOOL WINAPI WinHttpTimeFromSystemTime( const SYSTEMTIME *time, LPWSTR string ) if (!time || !string) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -2170,7 +2158,7 @@ BOOL WINAPI WinHttpTimeFromSystemTime( const SYSTEMTIME *time, LPWSTR string ) time->wMinute, time->wSecond ); - set_last_error( ERROR_SUCCESS ); + SetLastError( ERROR_SUCCESS ); return TRUE; } @@ -2187,7 +2175,7 @@ BOOL WINAPI WinHttpTimeToSystemTime( LPCWSTR string, SYSTEMTIME *time ) if (!string || !time) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -2198,7 +2186,7 @@ BOOL WINAPI WinHttpTimeToSystemTime( LPCWSTR string, SYSTEMTIME *time ) * a SYSTEMTIME structure. */ - set_last_error( ERROR_SUCCESS ); + SetLastError( ERROR_SUCCESS ); while (*s && !isalphaW( *s )) s++; if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index f66e5105ab..e6aeac3df2 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -181,7 +181,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (!url || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } if (!len) len = strlenW( url ); @@ -190,7 +190,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN { if ((err = escape_url( url, &len, &url_escaped ))) { - set_last_error( err ); + SetLastError( err ); return FALSE; } url = url_escaped; @@ -199,14 +199,14 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN { if (!(url_decoded = decode_url( url, &len ))) { - set_last_error( ERROR_OUTOFMEMORY ); + SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } url = url_decoded; } if (!(p = strchrW( url, ':' ))) { - set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); return FALSE; } if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) scheme = INTERNET_SCHEME_HTTP; @@ -307,7 +307,7 @@ exit: } heap_free( url_decoded ); heap_free( url_escaped ); - set_last_error( err ); + SetLastError( err ); return !err; } @@ -372,7 +372,7 @@ static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len ) { if (uc->lpszPassword) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } } @@ -412,7 +412,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -421,12 +421,12 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (*required < len) { *required = len + 1; - set_last_error( ERROR_INSUFFICIENT_BUFFER ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } if (!url) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -497,7 +497,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW { if (!escape_string( uc->lpszUrlPath, len, url, &len_escaped )) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } url += len_escaped; @@ -515,7 +515,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW { if (!escape_string( uc->lpszExtraInfo, len, url, &len_escaped )) { - set_last_error( ERROR_INVALID_PARAMETER ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } url += len_escaped; @@ -527,6 +527,6 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW } } *url = 0; - set_last_error( ERROR_SUCCESS ); + SetLastError( ERROR_SUCCESS ); return TRUE; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 99cde44c88..2ee868c657 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -265,8 +265,6 @@ void release_object( struct object_header * ) DECLSPEC_HIDDEN; HINTERNET alloc_handle( struct object_header * ) DECLSPEC_HIDDEN; BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; -void set_last_error( DWORD ) DECLSPEC_HIDDEN; -DWORD get_last_error( void ) DECLSPEC_HIDDEN; void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( struct request * ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 4/7] winhttp: Get rid of request_t.
by Hans Leidekker 22 Nov '18

22 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/cookie.c | 4 +- dlls/winhttp/handle.c | 2 +- dlls/winhttp/request.c | 128 +++++++++++++++++++++-------------------- dlls/winhttp/session.c | 14 ++--- dlls/winhttp/winhttp_private.h | 24 ++++---- 5 files changed, 87 insertions(+), 85 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 143091bcbc..40c11c6f71 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -260,7 +260,7 @@ static struct attr *parse_attr( const WCHAR *str, int *used ) return attr; } -BOOL set_cookies( request_t *request, const WCHAR *cookies ) +BOOL set_cookies( struct request *request, const WCHAR *cookies ) { static const WCHAR pathW[] = {'p','a','t','h',0}; static const WCHAR domainW[] = {'d','o','m','a','i','n',0}; @@ -321,7 +321,7 @@ end: return ret; } -BOOL add_cookie_headers( request_t *request ) +BOOL add_cookie_headers( struct request *request ) { struct list *domain_cursor; struct session *session = request->connect->session; diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index b76d8fe8d1..6711cd9172 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -75,7 +75,7 @@ void release_object( struct object_header *hdr ) TRACE("object %p refcount = %d\n", hdr, refs); if (!refs) { - if (hdr->type == WINHTTP_HANDLE_TYPE_REQUEST) close_connection( (request_t *)hdr ); + if (hdr->type == WINHTTP_HANDLE_TYPE_REQUEST) close_connection( (struct request *)hdr ); send_callback( hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, &hdr->handle, sizeof(HINTERNET) ); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f5fe769dfb..0f37f38422 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -177,7 +177,7 @@ static const WCHAR *attribute_table[] = NULL /* WINHTTP_QUERY_PASSPORT_CONFIG = 78 */ }; -static struct task_header *dequeue_task( request_t *request ) +static struct task_header *dequeue_task( struct request *request ) { struct task_header *task; @@ -193,7 +193,7 @@ static struct task_header *dequeue_task( request_t *request ) static DWORD CALLBACK task_proc( LPVOID param ) { - request_t *request = param; + struct request *request = param; HANDLE handles[2]; handles[0] = request->task_wait; @@ -233,7 +233,7 @@ static DWORD CALLBACK task_proc( LPVOID param ) static BOOL queue_task( struct task_header *task ) { - request_t *request = task->request; + struct request *request = task->request; if (!request->task_thread) { @@ -344,7 +344,7 @@ static struct header *parse_header( const WCHAR *string ) return header; } -static int get_header_index( request_t *request, LPCWSTR field, int requested_index, BOOL request_only ) +static int get_header_index( struct request *request, const WCHAR *field, int requested_index, BOOL request_only ) { int index; @@ -364,7 +364,7 @@ static int get_header_index( request_t *request, LPCWSTR field, int requested_in return index; } -static BOOL insert_header( request_t *request, struct header *header ) +static BOOL insert_header( struct request *request, struct header *header ) { DWORD count = request->num_headers + 1; struct header *hdrs; @@ -383,7 +383,7 @@ static BOOL insert_header( request_t *request, struct header *header ) return TRUE; } -static BOOL delete_header( request_t *request, DWORD index ) +static BOOL delete_header( struct request *request, DWORD index ) { if (!request->num_headers) return FALSE; if (index >= request->num_headers) return FALSE; @@ -398,7 +398,8 @@ static BOOL delete_header( request_t *request, DWORD index ) return TRUE; } -static BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) +static BOOL process_header( struct request *request, const WCHAR *field, const WCHAR *value, DWORD flags, + BOOL request_only ) { int index; struct header hdr; @@ -463,7 +464,7 @@ static BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DW return TRUE; } -BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD flags ) +BOOL add_request_headers( struct request *request, const WCHAR *headers, DWORD len, DWORD flags ) { BOOL ret = FALSE; WCHAR *buffer, *p, *q; @@ -513,7 +514,7 @@ BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD len, DWORD flags ) { BOOL ret; - request_t *request; + struct request *request; TRACE("%p, %s, %u, 0x%08x\n", hrequest, debugstr_wn(headers, len), len, flags); @@ -522,7 +523,7 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -541,7 +542,7 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD return ret; } -static WCHAR *build_absolute_request_path( request_t *request, const WCHAR **path ) +static WCHAR *build_absolute_request_path( struct request *request, const WCHAR **path ) { static const WCHAR http[] = {'h','t','t','p',0}; static const WCHAR https[] = {'h','t','t','p','s',0}; @@ -571,7 +572,7 @@ static WCHAR *build_absolute_request_path( request_t *request, const WCHAR **pat return ret; } -static WCHAR *build_request_string( request_t *request ) +static WCHAR *build_request_string( struct request *request ) { static const WCHAR spaceW[] = {' ',0}, crlfW[] = {'\r','\n',0}, colonW[] = {':',' ',0}; static const WCHAR twocrlfW[] = {'\r','\n','\r','\n',0}; @@ -619,7 +620,8 @@ static WCHAR *build_request_string( request_t *request ) #define QUERY_MODIFIER_MASK (WINHTTP_QUERY_FLAG_REQUEST_HEADERS | WINHTTP_QUERY_FLAG_SYSTEMTIME | WINHTTP_QUERY_FLAG_NUMBER) -static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID buffer, LPDWORD buflen, LPDWORD index ) +static BOOL query_headers( struct request *request, DWORD level, const WCHAR *name, void *buffer, DWORD *buflen, + DWORD *index ) { struct header *header = NULL; BOOL request_only, ret = FALSE; @@ -804,11 +806,11 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, LPVOID buffer, LPDWORD buflen, LPDWORD index ) { BOOL ret; - request_t *request; + struct request *request; TRACE("%p, 0x%08x, %s, %p, %p, %p\n", hrequest, level, debugstr_w(name), buffer, buflen, index); - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -868,7 +870,7 @@ static DWORD auth_scheme_from_header( WCHAR *header ) return 0; } -static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD supported, LPDWORD first ) +static BOOL query_auth_schemes( struct request *request, DWORD level, DWORD *supported, DWORD *first ) { DWORD index = 0, supported_schemes = 0, first_scheme = 0; BOOL ret = FALSE; @@ -912,11 +914,11 @@ static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD support BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDWORD first, LPDWORD target ) { BOOL ret = FALSE; - request_t *request; + struct request *request; TRACE("%p, %p, %p, %p\n", hrequest, supported, first, target); - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -1096,7 +1098,7 @@ void destroy_authinfo( struct authinfo *authinfo ) heap_free( authinfo ); } -static BOOL get_authvalue( request_t *request, DWORD level, DWORD scheme, WCHAR *buffer, DWORD len ) +static BOOL get_authvalue( struct request *request, DWORD level, DWORD scheme, WCHAR *buffer, DWORD len ) { DWORD size, index = 0; for (;;) @@ -1108,7 +1110,7 @@ static BOOL get_authvalue( request_t *request, DWORD level, DWORD scheme, WCHAR return TRUE; } -static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_flag ) +static BOOL do_authorization( struct request *request, DWORD target, DWORD scheme_flag ) { struct authinfo *authinfo, **auth_ptr; enum auth_scheme scheme = scheme_from_flag( scheme_flag ); @@ -1337,7 +1339,7 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla return ret; } -static WCHAR *build_proxy_connect_string( request_t *request ) +static WCHAR *build_proxy_connect_string( struct request *request ) { static const WCHAR fmtW[] = {'%','s',':','%','u',0}; static const WCHAR connectW[] = {'C','O','N','N','E','C','T', 0}; @@ -1385,9 +1387,9 @@ static WCHAR *build_proxy_connect_string( request_t *request ) return ret; } -static BOOL read_reply( request_t *request ); +static BOOL read_reply( struct request *request ); -static BOOL secure_proxy_connect( request_t *request ) +static BOOL secure_proxy_connect( struct request *request ) { WCHAR *str; char *strA; @@ -1566,7 +1568,7 @@ static BOOL ensure_cred_handle( struct session *session ) return TRUE; } -static BOOL open_connection( request_t *request ) +static BOOL open_connection( struct request *request ) { BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; struct hostdata *host = NULL, *iter; @@ -1735,7 +1737,7 @@ done: return TRUE; } -void close_connection( request_t *request ) +void close_connection( struct request *request ) { if (!request->netconn) return; @@ -1745,7 +1747,7 @@ void close_connection( request_t *request ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); } -static BOOL add_host_header( request_t *request, DWORD modifier ) +static BOOL add_host_header( struct request *request, DWORD modifier ) { BOOL ret; DWORD len; @@ -1768,7 +1770,7 @@ static BOOL add_host_header( request_t *request, DWORD modifier ) return ret; } -static void clear_response_headers( request_t *request ) +static void clear_response_headers( struct request *request ) { unsigned int i; @@ -1783,14 +1785,14 @@ static void clear_response_headers( request_t *request ) } /* remove some amount of data from the read buffer */ -static void remove_data( request_t *request, int count ) +static void remove_data( struct request *request, int count ) { if (!(request->read_size -= count)) request->read_pos = 0; else request->read_pos += count; } /* read some more data into the read buffer */ -static BOOL read_more_data( request_t *request, int maxlen, BOOL notify ) +static BOOL read_more_data( struct request *request, int maxlen, BOOL notify ) { int len; BOOL ret; @@ -1817,7 +1819,7 @@ static BOOL read_more_data( request_t *request, int maxlen, BOOL notify ) } /* discard data contents until we reach end of line */ -static BOOL discard_eol( request_t *request, BOOL notify ) +static BOOL discard_eol( struct request *request, BOOL notify ) { do { @@ -1834,7 +1836,7 @@ static BOOL discard_eol( request_t *request, BOOL notify ) } /* read the size of the next chunk */ -static BOOL start_next_chunk( request_t *request, BOOL notify ) +static BOOL start_next_chunk( struct request *request, BOOL notify ) { DWORD chunk_size = 0; @@ -1877,7 +1879,7 @@ static BOOL start_next_chunk( request_t *request, BOOL notify ) } } -static BOOL refill_buffer( request_t *request, BOOL notify ) +static BOOL refill_buffer( struct request *request, BOOL notify ) { int len = sizeof(request->read_buf); @@ -1901,7 +1903,7 @@ static BOOL refill_buffer( request_t *request, BOOL notify ) return TRUE; } -static void finished_reading( request_t *request ) +static void finished_reading( struct request *request ) { static const WCHAR closeW[] = {'c','l','o','s','e',0}; @@ -1929,14 +1931,14 @@ static void finished_reading( request_t *request ) } /* return the size of data available to be read immediately */ -static DWORD get_available_data( request_t *request ) +static DWORD get_available_data( struct request *request ) { if (request->read_chunked) return min( request->read_chunked_size, request->read_size ); return request->read_size; } /* check if we have reached the end of the data to read */ -static BOOL end_of_read_data( request_t *request ) +static BOOL end_of_read_data( struct request *request ) { if (!request->content_length) return TRUE; if (request->read_chunked) return request->read_chunked_eof; @@ -1944,7 +1946,7 @@ static BOOL end_of_read_data( request_t *request ) return (request->content_length == request->content_read); } -static BOOL read_data( request_t *request, void *buffer, DWORD size, DWORD *read, BOOL async ) +static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD *read, BOOL async ) { int count, bytes_read = 0; @@ -1978,7 +1980,7 @@ done: } /* read any content returned by the server so that the connection can be reused */ -static void drain_content( request_t *request ) +static void drain_content( struct request *request ) { DWORD size, bytes_read, bytes_total = 0, bytes_left = request->content_length - request->content_read; char buffer[2048]; @@ -2074,7 +2076,7 @@ static DWORD str_to_wire( const WCHAR *src, int src_len, char *dst, enum escape_ return len; } -static char *build_wire_path( request_t *request, DWORD *ret_len ) +static char *build_wire_path( struct request *request, DWORD *ret_len ) { WCHAR *full_path; const WCHAR *start, *path, *query = NULL; @@ -2118,7 +2120,7 @@ static char *build_wire_path( request_t *request, DWORD *ret_len ) return ret; } -static char *build_wire_request( request_t *request, DWORD *len ) +static char *build_wire_request( struct request *request, DWORD *len ) { char *path, *ptr, *ret; DWORD i, len_path; @@ -2167,7 +2169,7 @@ static char *build_wire_request( request_t *request, DWORD *len ) return ret; } -static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len, LPVOID optional, +static BOOL send_request( struct request *request, const WCHAR *headers, DWORD headers_len, void *optional, DWORD optional_len, DWORD total_len, DWORD_PTR context, BOOL async ) { static const WCHAR keep_alive[] = {'K','e','e','p','-','A','l','i','v','e',0}; @@ -2274,12 +2276,12 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade LPVOID optional, DWORD optional_len, DWORD total_len, DWORD_PTR context ) { BOOL ret; - request_t *request; + struct request *request; TRACE("%p, %s, %u, %u, %u, %lx\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional_len, total_len, context); - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -2318,7 +2320,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade return ret; } -static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme_flag, const WCHAR *username, +static BOOL set_credentials( struct request *request, DWORD target, DWORD scheme_flag, const WCHAR *username, const WCHAR *password ) { enum auth_scheme scheme = scheme_from_flag( scheme_flag ); @@ -2366,11 +2368,11 @@ BOOL WINAPI WinHttpSetCredentials( HINTERNET hrequest, DWORD target, DWORD schem LPCWSTR password, LPVOID params ) { BOOL ret; - request_t *request; + struct request *request; TRACE("%p, %x, 0x%08x, %s, %p, %p\n", hrequest, target, scheme, debugstr_w(username), password, params); - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -2389,7 +2391,7 @@ BOOL WINAPI WinHttpSetCredentials( HINTERNET hrequest, DWORD target, DWORD schem return ret; } -static BOOL handle_authorization( request_t *request, DWORD status ) +static BOOL handle_authorization( struct request *request, DWORD status ) { DWORD i, schemes, first, level, target; @@ -2423,7 +2425,7 @@ static BOOL handle_authorization( request_t *request, DWORD status ) } /* set the request content length based on the headers */ -static DWORD set_content_length( request_t *request, DWORD status ) +static DWORD set_content_length( struct request *request, DWORD status ) { WCHAR encoding[20]; DWORD buflen = sizeof(request->content_length); @@ -2450,7 +2452,7 @@ static DWORD set_content_length( request_t *request, DWORD status ) return request->content_length; } -static BOOL read_line( request_t *request, char *buffer, DWORD *len ) +static BOOL read_line( struct request *request, char *buffer, DWORD *len ) { int count, bytes_read, pos = 0; @@ -2491,7 +2493,7 @@ static BOOL read_line( request_t *request, char *buffer, DWORD *len ) #define MAX_REPLY_LEN 1460 #define INITIAL_HEADER_BUFFER_LEN 512 -static BOOL read_reply( request_t *request ) +static BOOL read_reply( struct request *request ) { static const WCHAR crlf[] = {'\r','\n',0}; @@ -2590,7 +2592,7 @@ static BOOL read_reply( request_t *request ) return TRUE; } -static void record_cookies( request_t *request ) +static void record_cookies( struct request *request ) { unsigned int i; @@ -2604,7 +2606,7 @@ static void record_cookies( request_t *request ) } } -static WCHAR *get_redirect_url( request_t *request, DWORD *len ) +static WCHAR *get_redirect_url( struct request *request, DWORD *len ) { DWORD size; WCHAR *ret; @@ -2618,7 +2620,7 @@ static WCHAR *get_redirect_url( request_t *request, DWORD *len ) return NULL; } -static BOOL handle_redirect( request_t *request, DWORD status ) +static BOOL handle_redirect( struct request *request, DWORD status ) { BOOL ret = FALSE; DWORD len, len_loc; @@ -2729,7 +2731,7 @@ end: return ret; } -static BOOL receive_response( request_t *request, BOOL async ) +static BOOL receive_response( struct request *request, BOOL async ) { BOOL ret; DWORD size, query, status; @@ -2801,11 +2803,11 @@ static void task_receive_response( struct task_header *task ) BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) { BOOL ret; - request_t *request; + struct request *request; TRACE("%p, %p\n", hrequest, reserved); - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -2836,7 +2838,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return ret; } -static BOOL query_data_available( request_t *request, DWORD *available, BOOL async ) +static BOOL query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD count = 0; @@ -2872,11 +2874,11 @@ static void task_query_data_available( struct task_header *task ) BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { BOOL ret; - request_t *request; + struct request *request; TRACE("%p, %p\n", hrequest, available); - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -2920,11 +2922,11 @@ static void task_read_data( struct task_header *task ) BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, LPDWORD read ) { BOOL ret; - request_t *request; + struct request *request; TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read); - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -2958,7 +2960,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L return ret; } -static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDWORD written, BOOL async ) +static BOOL write_data( struct request *request, const void *buffer, DWORD to_write, DWORD *written, BOOL async ) { BOOL ret; int num_bytes; @@ -2992,11 +2994,11 @@ static void task_write_data( struct task_header *task ) BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write, LPDWORD written ) { BOOL ret; - request_t *request; + struct request *request; TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_write, written); - if (!(request = (request_t *)grab_object( hrequest ))) + if (!(request = (struct request *)grab_object( hrequest ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 84a27b7430..8b3f9f51b2 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -608,7 +608,7 @@ end: */ static void request_destroy( struct object_header *hdr ) { - request_t *request = (request_t *)hdr; + struct request *request = (struct request *)hdr; unsigned int i, j; TRACE("%p\n", request); @@ -706,7 +706,7 @@ static BOOL copy_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_s static BOOL request_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { - request_t *request = (request_t *)hdr; + struct request *request = (struct request *)hdr; switch (option) { @@ -887,7 +887,7 @@ static WCHAR *buffer_to_str( WCHAR *buffer, DWORD buflen ) static BOOL request_set_option( struct object_header *hdr, DWORD option, void *buffer, DWORD buflen ) { - request_t *request = (request_t *)hdr; + struct request *request = (struct request *)hdr; switch (option) { @@ -1057,7 +1057,7 @@ static const struct object_vtbl request_vtbl = request_set_option }; -static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) +static BOOL store_accept_types( struct request *request, const WCHAR **accept_types ) { const WCHAR **types = accept_types; DWORD i; @@ -1109,7 +1109,7 @@ static WCHAR *get_request_path( const WCHAR *object ) HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR object, LPCWSTR version, LPCWSTR referrer, LPCWSTR *types, DWORD flags ) { - request_t *request; + struct request *request; struct connect *connect; HINTERNET hrequest = NULL; @@ -1134,7 +1134,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return NULL; } - if (!(request = heap_alloc_zero( sizeof(request_t) ))) + if (!(request = heap_alloc_zero( sizeof(struct request) ))) { release_object( &connect->hdr ); return NULL; @@ -2093,7 +2093,7 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int { case WINHTTP_HANDLE_TYPE_REQUEST: { - request_t *request = (request_t *)hdr; + struct request *request = (struct request *)hdr; request->connect_timeout = connect; if (resolve < 0) resolve = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 8bd7d0b0bf..99cde44c88 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -168,14 +168,14 @@ struct authinfo BOOL finished; /* finished authenticating */ }; -typedef struct +struct request { struct object_header hdr; struct connect *connect; - LPWSTR verb; - LPWSTR path; - LPWSTR version; - LPWSTR raw_headers; + WCHAR *verb; + WCHAR *path; + WCHAR *version; + WCHAR *raw_headers; void *optional; DWORD optional_len; struct netconn *netconn; @@ -187,7 +187,7 @@ typedef struct int send_timeout; int receive_timeout; int receive_response_timeout; - LPWSTR status_text; + WCHAR *status_text; DWORD content_length; /* total number of bytes to be read */ DWORD content_read; /* bytes read so far */ BOOL read_chunked; /* are we reading in chunked mode? */ @@ -212,12 +212,12 @@ typedef struct WCHAR *username; WCHAR *password; } creds[TARGET_MAX][SCHEME_MAX]; -} request_t; +}; struct task_header { struct list entry; - request_t *request; + struct request *request; void (*proc)( struct task_header * ); }; @@ -268,7 +268,7 @@ BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; void set_last_error( DWORD ) DECLSPEC_HIDDEN; DWORD get_last_error( void ) DECLSPEC_HIDDEN; void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; -void close_connection( request_t * ) DECLSPEC_HIDDEN; +void close_connection( struct request * ) DECLSPEC_HIDDEN; void netconn_close( struct netconn * ) DECLSPEC_HIDDEN; struct netconn *netconn_create( struct hostdata *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; @@ -283,9 +283,9 @@ BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN; const void *netconn_get_certificate( struct netconn * ) DECLSPEC_HIDDEN; int netconn_get_cipher_strength( struct netconn * ) DECLSPEC_HIDDEN; -BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; -BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; -BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; +BOOL set_cookies( struct request *, const WCHAR * ) DECLSPEC_HIDDEN; +BOOL add_cookie_headers( struct request * ) DECLSPEC_HIDDEN; +BOOL add_request_headers( struct request *, const WCHAR *, DWORD, DWORD ) DECLSPEC_HIDDEN; void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 3/7] winhttp: Get rid of netconn_t.
by Hans Leidekker 22 Nov '18

22 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 28 ++++++++++++++-------------- dlls/winhttp/request.c | 10 +++++----- dlls/winhttp/winhttp_private.h | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 1db3916650..004933ff81 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -173,15 +173,15 @@ static void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } -static void set_blocking( netconn_t *conn, BOOL blocking ) +static void set_blocking( struct netconn *conn, BOOL blocking ) { ULONG state = !blocking; ioctlsocket( conn->socket, FIONBIO, &state ); } -netconn_t *netconn_create( struct hostdata *host, const struct sockaddr_storage *sockaddr, int timeout ) +struct netconn *netconn_create( struct hostdata *host, const struct sockaddr_storage *sockaddr, int timeout ) { - netconn_t *conn; + struct netconn *conn; unsigned int addr_len; BOOL ret = FALSE; @@ -241,7 +241,7 @@ netconn_t *netconn_create( struct hostdata *host, const struct sockaddr_storage return conn; } -void netconn_close( netconn_t *conn ) +void netconn_close( struct netconn *conn ) { if (conn->secure) { @@ -255,7 +255,7 @@ void netconn_close( netconn_t *conn ) heap_free(conn); } -BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, +BOOL netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, BOOL check_revocation) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; @@ -389,7 +389,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl return TRUE; } -static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) +static BOOL send_ssl_chunk(struct netconn *conn, const void *msg, size_t size) { SecBuffer bufs[4] = { {conn->ssl_sizes.cbHeader, SECBUFFER_STREAM_HEADER, conn->ssl_buf}, @@ -415,7 +415,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return TRUE; } -BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) +BOOL netconn_send( struct netconn *conn, const void *msg, size_t len, int *sent ) { if (conn->secure) { @@ -439,7 +439,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return ((*sent = sock_send( conn->socket, msg, len, 0 )) != -1); } -static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) +static BOOL read_ssl_chunk(struct netconn *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) { const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; SecBuffer bufs[4]; @@ -530,7 +530,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * return TRUE; } -BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd ) +BOOL netconn_recv( struct netconn *conn, void *buf, size_t len, int flags, int *recvd ) { *recvd = 0; if (!len) return TRUE; @@ -582,12 +582,12 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd return ((*recvd = sock_recv( conn->socket, buf, len, flags )) != -1); } -ULONG netconn_query_data_available( netconn_t *conn ) +ULONG netconn_query_data_available( struct netconn *conn ) { return conn->secure ? conn->peek_len : 0; } -DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) +DWORD netconn_set_timeout( struct netconn *netconn, BOOL send, int value ) { int opt = send ? SO_SNDTIMEO : SO_RCVTIMEO; if (setsockopt( netconn->socket, SOL_SOCKET, opt, (void *)&value, sizeof(value) ) == -1) @@ -599,7 +599,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) return ERROR_SUCCESS; } -BOOL netconn_is_alive( netconn_t *netconn ) +BOOL netconn_is_alive( struct netconn *netconn ) { int len; char b; @@ -696,7 +696,7 @@ BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_stora return TRUE; } -const void *netconn_get_certificate( netconn_t *conn ) +const void *netconn_get_certificate( struct netconn *conn ) { const CERT_CONTEXT *ret; SECURITY_STATUS res; @@ -706,7 +706,7 @@ const void *netconn_get_certificate( netconn_t *conn ) return res == SEC_E_OK ? ret : NULL; } -int netconn_get_cipher_strength( netconn_t *conn ) +int netconn_get_cipher_strength( struct netconn *conn ) { SecPkgContext_ConnectionInfo conn_info; SECURITY_STATUS res; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3e499ce8ed..f5fe769dfb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1458,7 +1458,7 @@ static BOOL connection_collector_running; static DWORD WINAPI connection_collector(void *arg) { unsigned int remaining_connections; - netconn_t *netconn, *next_netconn; + struct netconn *netconn, *next_netconn; struct hostdata *host, *next_host; ULONGLONG now; @@ -1473,7 +1473,7 @@ static DWORD WINAPI connection_collector(void *arg) LIST_FOR_EACH_ENTRY_SAFE(host, next_host, &connection_pool, struct hostdata, entry) { - LIST_FOR_EACH_ENTRY_SAFE(netconn, next_netconn, &host->connections, netconn_t, entry) + LIST_FOR_EACH_ENTRY_SAFE(netconn, next_netconn, &host->connections, struct netconn, entry) { if (netconn->keep_until < now) { @@ -1496,7 +1496,7 @@ static DWORD WINAPI connection_collector(void *arg) FreeLibraryAndExitThread( winhttp_instance, 0 ); } -static void cache_connection( netconn_t *netconn ) +static void cache_connection( struct netconn *netconn ) { TRACE( "caching connection %p\n", netconn ); @@ -1570,7 +1570,7 @@ static BOOL open_connection( request_t *request ) { BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; struct hostdata *host = NULL, *iter; - netconn_t *netconn = NULL; + struct netconn *netconn = NULL; struct connect *connect; WCHAR *addressW = NULL; INTERNET_PORT port; @@ -1622,7 +1622,7 @@ static BOOL open_connection( request_t *request ) EnterCriticalSection( &connection_pool_cs ); if (!list_empty( &host->connections )) { - netconn = LIST_ENTRY( list_head( &host->connections ), netconn_t, entry ); + netconn = LIST_ENTRY( list_head( &host->connections ), struct netconn, entry ); list_remove( &netconn->entry ); } LeaveCriticalSection( &connection_pool_cs ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 78b1d15b1d..8bd7d0b0bf 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -111,7 +111,7 @@ struct connect BOOL resolved; }; -typedef struct +struct netconn { struct list entry; int socket; @@ -127,7 +127,7 @@ typedef struct char *peek_msg; char *peek_msg_mem; size_t peek_len; -} netconn_t; +}; struct header { @@ -178,7 +178,7 @@ typedef struct LPWSTR raw_headers; void *optional; DWORD optional_len; - netconn_t *netconn; + struct netconn *netconn; DWORD security_flags; BOOL check_revocation; const CERT_CONTEXT *server_cert; @@ -270,18 +270,18 @@ DWORD get_last_error( void ) DECLSPEC_HIDDEN; void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( request_t * ) DECLSPEC_HIDDEN; -void netconn_close( netconn_t * ) DECLSPEC_HIDDEN; -netconn_t *netconn_create( struct hostdata *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; +void netconn_close( struct netconn * ) DECLSPEC_HIDDEN; +struct netconn *netconn_create( struct hostdata *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; -ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; -BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; +ULONG netconn_query_data_available( struct netconn * ) DECLSPEC_HIDDEN; +BOOL netconn_recv( struct netconn *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; -BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; -DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; -BOOL netconn_is_alive( netconn_t * ) DECLSPEC_HIDDEN; -const void *netconn_get_certificate( netconn_t * ) DECLSPEC_HIDDEN; -int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; +BOOL netconn_send( struct netconn *, const void *, size_t, int * ) DECLSPEC_HIDDEN; +DWORD netconn_set_timeout( struct netconn *, BOOL, int ) DECLSPEC_HIDDEN; +BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN; +const void *netconn_get_certificate( struct netconn * ) DECLSPEC_HIDDEN; +int netconn_get_cipher_strength( struct netconn * ) DECLSPEC_HIDDEN; BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/7] winhttp: Get rid of connect_t.
by Hans Leidekker 22 Nov '18

22 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 8 ++++---- dlls/winhttp/session.c | 18 +++++++++--------- dlls/winhttp/winhttp_private.h | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8add6c973a..3e499ce8ed 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1571,7 +1571,7 @@ static BOOL open_connection( request_t *request ) BOOL is_secure = request->hdr.flags & WINHTTP_FLAG_SECURE; struct hostdata *host = NULL, *iter; netconn_t *netconn = NULL; - connect_t *connect; + struct connect *connect; WCHAR *addressW = NULL; INTERNET_PORT port; DWORD len; @@ -1751,7 +1751,7 @@ static BOOL add_host_header( request_t *request, DWORD modifier ) DWORD len; WCHAR *host; static const WCHAR fmt[] = {'%','s',':','%','u',0}; - connect_t *connect = request->connect; + struct connect *connect = request->connect; INTERNET_PORT port; port = connect->hostport ? connect->hostport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); @@ -2175,7 +2175,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len static const WCHAR length_fmt[] = {'%','l','d',0}; BOOL ret = FALSE; - connect_t *connect = request->connect; + struct connect *connect = request->connect; struct session *session = connect->session; char *wire_req; int bytes_sent; @@ -2623,7 +2623,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) BOOL ret = FALSE; DWORD len, len_loc; URL_COMPONENTS uc; - connect_t *connect = request->connect; + struct connect *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location; int index; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 76074d3032..84a27b7430 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -322,7 +322,7 @@ end: */ static void connect_destroy( struct object_header *hdr ) { - connect_t *connect = (connect_t *)hdr; + struct connect *connect = (struct connect *)hdr; TRACE("%p\n", connect); @@ -337,7 +337,7 @@ static void connect_destroy( struct object_header *hdr ) static BOOL connect_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { - connect_t *connect = (connect_t *)hdr; + struct connect *connect = (struct connect *)hdr; switch (option) { @@ -478,7 +478,7 @@ static BOOL should_bypass_proxy(struct session *session, LPCWSTR server) return ret; } -BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) +BOOL set_server_for_hostname( struct connect *connect, const WCHAR *server, INTERNET_PORT port ) { struct session *session = connect->session; BOOL ret = TRUE; @@ -545,7 +545,7 @@ end: */ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PORT port, DWORD reserved ) { - connect_t *connect; + struct connect *connect; struct session *session; HINTERNET hconnect = NULL; @@ -567,7 +567,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return NULL; } - if (!(connect = heap_alloc_zero( sizeof(connect_t) ))) + if (!(connect = heap_alloc_zero( sizeof(struct connect) ))) { release_object( &session->hdr ); return NULL; @@ -987,7 +987,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b case WINHTTP_OPTION_USERNAME: { - connect_t *connect = request->connect; + struct connect *connect = request->connect; heap_free( connect->username ); if (!(connect->username = buffer_to_str( buffer, buflen ))) return FALSE; @@ -995,7 +995,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } case WINHTTP_OPTION_PASSWORD: { - connect_t *connect = request->connect; + struct connect *connect = request->connect; heap_free( connect->password ); if (!(connect->password = buffer_to_str( buffer, buflen ))) return FALSE; @@ -1110,7 +1110,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o LPCWSTR referrer, LPCWSTR *types, DWORD flags ) { request_t *request; - connect_t *connect; + struct connect *connect; HINTERNET hrequest = NULL; TRACE("%p, %s, %s, %s, %s, %p, 0x%08x\n", hconnect, debugstr_w(verb), debugstr_w(object), @@ -1123,7 +1123,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o for (iter = types; *iter; iter++) TRACE(" %s\n", debugstr_w(*iter)); } - if (!(connect = (connect_t *)grab_object( hconnect ))) + if (!(connect = (struct connect *)grab_object( hconnect ))) { set_last_error( ERROR_INVALID_HANDLE ); return NULL; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9e838eea40..78b1d15b1d 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -97,19 +97,19 @@ struct session DWORD secure_protocols; }; -typedef struct +struct connect { struct object_header hdr; struct session *session; - LPWSTR hostname; /* final destination of the request */ - LPWSTR servername; /* name of the server we directly connect to */ - LPWSTR username; - LPWSTR password; + WCHAR *hostname; /* final destination of the request */ + WCHAR *servername; /* name of the server we directly connect to */ + WCHAR *username; + WCHAR *password; INTERNET_PORT hostport; INTERNET_PORT serverport; struct sockaddr_storage sockaddr; BOOL resolved; -} connect_t; +}; typedef struct { @@ -171,7 +171,7 @@ struct authinfo typedef struct { struct object_header hdr; - connect_t *connect; + struct connect *connect; LPWSTR verb; LPWSTR path; LPWSTR version; @@ -287,7 +287,7 @@ BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; -BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; +BOOL set_server_for_hostname( struct connect *, const WCHAR *, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; void release_host( struct hostdata *host ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/7] winhttp: Get rid of session_t.
by Hans Leidekker 22 Nov '18

22 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/cookie.c | 10 +++++----- dlls/winhttp/request.c | 4 ++-- dlls/winhttp/session.c | 28 ++++++++++++++-------------- dlls/winhttp/winhttp_private.h | 18 +++++++++--------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 88365f5949..143091bcbc 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -45,7 +45,7 @@ struct domain struct list cookies; }; -static struct domain *add_domain( session_t *session, WCHAR *name ) +static struct domain *add_domain( struct session *session, WCHAR *name ) { struct domain *domain; @@ -117,7 +117,7 @@ static void delete_domain( struct domain *domain ) heap_free( domain ); } -void destroy_cookies( session_t *session ) +void destroy_cookies( struct session *session ) { struct list *item, *next; struct domain *domain; @@ -129,7 +129,7 @@ void destroy_cookies( session_t *session ) } } -static BOOL add_cookie( session_t *session, struct cookie *cookie, WCHAR *domain_name, WCHAR *path ) +static BOOL add_cookie( struct session *session, struct cookie *cookie, WCHAR *domain_name, WCHAR *path ) { struct domain *domain = NULL; struct cookie *old_cookie; @@ -268,7 +268,7 @@ BOOL set_cookies( request_t *request, const WCHAR *cookies ) WCHAR *buffer, *p; WCHAR *cookie_domain = NULL, *cookie_path = NULL; struct attr *attr, *domain = NULL, *path = NULL; - session_t *session = request->connect->session; + struct session *session = request->connect->session; struct cookie *cookie; int len, used; @@ -324,7 +324,7 @@ end: BOOL add_cookie_headers( request_t *request ) { struct list *domain_cursor; - session_t *session = request->connect->session; + struct session *session = request->connect->session; EnterCriticalSection( &session->cs ); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7f3ef4c50d..8add6c973a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1538,7 +1538,7 @@ static DWORD map_secure_protocols( DWORD mask ) return ret; } -static BOOL ensure_cred_handle( session_t *session ) +static BOOL ensure_cred_handle( struct session *session ) { SECURITY_STATUS status = SEC_E_OK; @@ -2176,7 +2176,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len BOOL ret = FALSE; connect_t *connect = request->connect; - session_t *session = connect->session; + struct session *session = connect->session; char *wire_req; int bytes_sent; DWORD len, i, flags; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 88043462af..76074d3032 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -88,7 +88,7 @@ BOOL WINAPI WinHttpCheckPlatform( void ) */ static void session_destroy( struct object_header *hdr ) { - session_t *session = (session_t *)hdr; + struct session *session = (struct session *)hdr; TRACE("%p\n", session); @@ -108,7 +108,7 @@ static void session_destroy( struct object_header *hdr ) static BOOL session_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { - session_t *session = (session_t *)hdr; + struct session *session = (struct session *)hdr; switch (option) { @@ -159,7 +159,7 @@ static BOOL session_query_option( struct object_header *hdr, DWORD option, void static BOOL session_set_option( struct object_header *hdr, DWORD option, void *buffer, DWORD buflen ) { - session_t *session = (session_t *)hdr; + struct session *session = (struct session *)hdr; switch (option) { @@ -258,12 +258,12 @@ static const struct object_vtbl session_vtbl = */ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWSTR bypass, DWORD flags ) { - session_t *session; + struct session *session; HINTERNET handle = NULL; TRACE("%s, %u, %s, %s, 0x%08x\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags); - if (!(session = heap_alloc_zero( sizeof(session_t) ))) return NULL; + if (!(session = heap_alloc_zero( sizeof(struct session) ))) return NULL; session->hdr.type = WINHTTP_HANDLE_TYPE_SESSION; session->hdr.vtbl = &session_vtbl; @@ -447,7 +447,7 @@ static BOOL domain_matches(LPCWSTR server, LPCWSTR domain) /* Matches INTERNET_MAX_HOST_NAME_LENGTH in wininet.h, also RFC 1035 */ #define MAX_HOST_NAME_LENGTH 256 -static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) +static BOOL should_bypass_proxy(struct session *session, LPCWSTR server) { LPCWSTR ptr; BOOL ret = FALSE; @@ -480,7 +480,7 @@ static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) { - session_t *session = connect->session; + struct session *session = connect->session; BOOL ret = TRUE; if (session->proxy_server && !should_bypass_proxy(session, server)) @@ -546,7 +546,7 @@ end: HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PORT port, DWORD reserved ) { connect_t *connect; - session_t *session; + struct session *session; HINTERNET hconnect = NULL; TRACE("%p, %s, %u, %x\n", hsession, debugstr_w(server), port, reserved); @@ -556,7 +556,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO set_last_error( ERROR_INVALID_PARAMETER ); return NULL; } - if (!(session = (session_t *)grab_object( hsession ))) + if (!(session = (struct session *)grab_object( hsession ))) { set_last_error( ERROR_INVALID_HANDLE ); return NULL; @@ -1003,7 +1003,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } case WINHTTP_OPTION_PROXY_USERNAME: { - session_t *session = request->connect->session; + struct session *session = request->connect->session; heap_free( session->proxy_username ); if (!(session->proxy_username = buffer_to_str( buffer, buflen ))) return FALSE; @@ -1011,7 +1011,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } case WINHTTP_OPTION_PROXY_PASSWORD: { - session_t *session = request->connect->session; + struct session *session = request->connect->session; heap_free( session->proxy_password ); if (!(session->proxy_password = buffer_to_str( buffer, buflen ))) return FALSE; @@ -1886,14 +1886,14 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO { WCHAR *detected_pac_url = NULL; const WCHAR *pac_url; - session_t *session; + struct session *session; char *script; DWORD size; BOOL ret = FALSE; TRACE("%p, %s, %p, %p\n", hsession, debugstr_w(url), options, info); - if (!(session = (session_t *)grab_object( hsession ))) + if (!(session = (struct session *)grab_object( hsession ))) { set_last_error( ERROR_INVALID_HANDLE ); return FALSE; @@ -2114,7 +2114,7 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int } case WINHTTP_HANDLE_TYPE_SESSION: { - session_t *session = (session_t *)hdr; + struct session *session = (struct session *)hdr; session->connect_timeout = connect; if (resolve < 0) resolve = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 999f3d7484..9e838eea40 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -75,32 +75,32 @@ struct hostdata struct list connections; }; -typedef struct +struct session { struct object_header hdr; CRITICAL_SECTION cs; - LPWSTR agent; + WCHAR *agent; DWORD access; int resolve_timeout; int connect_timeout; int send_timeout; int receive_timeout; int receive_response_timeout; - LPWSTR proxy_server; - LPWSTR proxy_bypass; - LPWSTR proxy_username; - LPWSTR proxy_password; + WCHAR *proxy_server; + WCHAR *proxy_bypass; + WCHAR *proxy_username; + WCHAR *proxy_password; struct list cookie_cache; HANDLE unload_event; CredHandle cred_handle; BOOL cred_handle_initialized; DWORD secure_protocols; -} session_t; +}; typedef struct { struct object_header hdr; - session_t *session; + struct session *session; LPWSTR hostname; /* final destination of the request */ LPWSTR servername; /* name of the server we directly connect to */ LPWSTR username; @@ -286,7 +286,7 @@ int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN; BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; -void destroy_cookies( session_t * ) DECLSPEC_HIDDEN; +void destroy_cookies( struct session * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH v4] mfplat: Improve CreateObjectFromByteStream stub in IMFSourceResolver.
by Sven Baars 22 Nov '18

22 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v4: Rebased on top of Alistair's commit. I also used his naming convention while at it. dlls/mfplat/main.c | 187 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 78 +++++++++++++++- include/mfidl.idl | 36 +++++++ 3 files changed, 299 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 46a697538c..62461bb5f7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1315,6 +1315,174 @@ HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) return S_OK; } +typedef struct _mfsource +{ + IMFMediaSource IMFMediaSource_iface; + LONG ref; +} mfsource; + +static inline mfsource *impl_from_IMFMediaSource(IMFMediaSource *iface) +{ + return CONTAINING_RECORD(iface, mfsource, IMFMediaSource_iface); +} + +static HRESULT WINAPI mfsource_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSource) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &This->IMFMediaSource_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfsource_AddRef(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsource_Release(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfsource_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p)\n", This, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", This, characteristics); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", This, descriptor); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, + const GUID *time_format, const PROPVARIANT *start_position) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p, %p): stub\n", This, descriptor, time_format, start_position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_Stop(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_Pause(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_Shutdown(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", This); + + return S_OK; +} + +static const IMFMediaSourceVtbl mfsourcevtbl = +{ + mfsource_QueryInterface, + mfsource_AddRef, + mfsource_Release, + mfsource_GetEvent, + mfsource_BeginGetEvent, + mfsource_EndGetEvent, + mfsource_QueueEvent, + mfsource_GetCharacteristics, + mfsource_CreatePresentationDescriptor, + mfsource_Start, + mfsource_Stop, + mfsource_Pause, + mfsource_Shutdown, +}; + typedef struct _mfsourceresolver { IMFSourceResolver IMFSourceResolver_iface; @@ -1388,6 +1556,25 @@ static HRESULT WINAPI mfsourceresolver_CreateObjectFromByteStream(IMFSourceResol FIXME("(%p)->(%p, %s, %#x, %p, %p, %p): stub\n", This, stream, debugstr_w(url), flags, props, obj_type, object); + if (!stream || !obj_type || !object) + return E_POINTER; + + if (flags & MF_RESOLUTION_MEDIASOURCE) + { + mfsource *new_object; + + new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + if (!new_object) + return E_OUTOFMEMORY; + + new_object->IMFMediaSource_iface.lpVtbl = &mfsourcevtbl; + new_object->ref = 1; + + *object = (IUnknown *)&new_object->IMFMediaSource_iface; + *obj_type = MF_OBJECT_MEDIASOURCE; + return S_OK; + } + return E_NOTIMPL; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 48a8d0d361..d0f7ea4c98 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -42,6 +42,8 @@ static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(MF_BYTESTREAM_CONTENT_TYPE, 0xfc358289,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a); + DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x87,0x47,0x75,0x6f); @@ -200,7 +202,14 @@ if(0) static void test_source_resolver(void) { IMFSourceResolver *resolver, *resolver2; + IMFByteStream *bytestream; + IMFAttributes *attributes; + IMFMediaSource *mediasource; + MF_OBJECT_TYPE obj_type; HRESULT hr; + WCHAR *filename; + + static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; if (!pMFCreateSourceResolver) { @@ -208,6 +217,9 @@ static void test_source_resolver(void) return; } + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pMFCreateSourceResolver(NULL); ok(hr == E_POINTER, "got %#x\n", hr); @@ -218,8 +230,70 @@ static void test_source_resolver(void) ok(hr == S_OK, "got %#x\n", hr); ok(resolver != resolver2, "Expected new instance\n"); - IMFSourceResolver_Release(resolver); IMFSourceResolver_Release(resolver2); + + filename = load_resource(mp4file); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, NULL, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&mediasource); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + NULL, (IUnknown **)&mediasource); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&mediasource); + todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + if (hr == S_OK) IMFMediaSource_Release(mediasource); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_BYTESTREAM, NULL, + &obj_type, (IUnknown **)&mediasource); + todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + + IMFByteStream_Release(bytestream); + + /* We have to create a new bytestream here, because all following + * calls to CreateObjectFromByteStream will fail. */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, file_type); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + IMFAttributes_Release(attributes); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&mediasource); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mediasource != NULL, "got %p\n", mediasource); + ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); + + IMFMediaSource_Release(mediasource); + IMFByteStream_Release(bytestream); + + IMFSourceResolver_Release(resolver); + + MFShutdown(); + + DeleteFileW(filename); } static void init_functions(void) @@ -619,7 +693,6 @@ START_TEST(mfplat) init_functions(); test_register(); - test_source_resolver(); test_MFCreateMediaType(); test_MFCreateMediaEvent(); test_MFCreateAttributes(); @@ -627,6 +700,7 @@ START_TEST(mfplat) test_MFCreateFile(); test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); + test_source_resolver(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 170588bb5f..2373e418be 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -313,3 +313,39 @@ cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") + +[ + object, + uuid(279a808d-aec7-40c8-9c6b-a6b492c78a66), +] +interface IMFMediaSource : IMFMediaEventGenerator +{ + HRESULT GetCharacteristics( + [out] DWORD *characteristics ); + + [local] + HRESULT CreatePresentationDescriptor( + [out] IMFPresentationDescriptor **descriptor ); + [call_as(CreatePresentationDescriptor)] + HRESULT RemoteCreatePresentationDescriptor( + [out] DWORD *count, + [out, size_is(,*count)] BYTE **data, + [out] IMFPresentationDescriptor **descriptor ); + + HRESULT Start( + [in] IMFPresentationDescriptor *descriptor, + [in, unique] const GUID *time_format, + [in, unique] const PROPVARIANT *start_position ); + + HRESULT Stop(); + HRESULT Pause(); + HRESULT Shutdown(); +} + +cpp_quote("#define MF_RESOLUTION_MEDIASOURCE 0x00000001") +cpp_quote("#define MF_RESOLUTION_BYTESTREAM 0x00000002") +cpp_quote("#define MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE 0x00000010") +cpp_quote("#define MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL 0x00000020") +cpp_quote("#define MF_RESOLUTION_READ 0x00010000") +cpp_quote("#define MF_RESOLUTION_WRITE 0x00020000") +cpp_quote("#define MF_RESOLUTION_DISABLE_LOCAL_PLUGINS 0x00000040") -- 2.17.1

1 0

Questions about Staging patch for Mac preloader
by Ken Thomases 22 Nov '18

22 Nov '18

Hi, I'm looking into getting the Mac preloader patches <https://github.com/wine-staging/wine-staging/tree/master/patches/loader-OSX…> upstreamed. The patches are mostly good as-is, but I have some things I'd like clarified, if possible. * There's a configure check for "-Wl,--export-dynamic". As near as I can tell, the Mac linker doesn't and has never supported that option. The check seems to have been copied from the Linux and Android checks, but is apparently useless on macOS. What was the intent? Is there a chance that the patch is failing to ensure something necessary and it only works by luck? There is a similarly-named option, "-export_dynamic" (only one leading dash, underscore instead of internal dash), in recent versions of the Mac linker but I'm not sure that it would achieve the intended purpose, since I'm not sure what that purpose is. * There's a comment in the code: /* there is no way to translate the dlopen handle to the mach header :-( */ and it uses a function find_executable() to search for the executable. I believe it should be possible to use dladdr(wine_main_preload_info, …) to find it. The dli_fbase field of the Dl_info struct is documented in the man page as pointing to the Mach header. Then, dyld exports __dyld_get_image_slide(const struct mach_header*) via _dyld_func_lookup(). So, the question is, was this considered and rejected? Or just not considered? If it was rejected, why? Thanks, Ken

2 1

[PATCH] slc: Add SLGetLicensingStatusInformation stub.
by Andrey Gusev 22 Nov '18

22 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46172 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/slc/slc.c | 8 ++++++++ dlls/slc/slc.spec | 2 +- include/slerror.h | 1 + include/slpublic.h | 22 ++++++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index 7b7a6c6f77..ffecaa07bf 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -31,6 +31,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(slc); +HRESULT WINAPI SLGetLicensingStatusInformation(HSLC handle, const SLID *app, const SLID *product, + LPCWSTR name, UINT *count, SL_LICENSING_STATUS **status) +{ + FIXME("(%p %p %p %s %p %p) stub\n", handle, app, product, debugstr_w(name), count, status ); + + return SL_E_RIGHT_NOT_CONSUMED; +} + HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val, LPBYTE *size) { FIXME("(%s %p %p %p) stub\n", debugstr_w(name), type, val, size ); diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index e4289d3ae1..57e55728c1 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -16,7 +16,7 @@ @ stub SLGetLicense @ stub SLGetLicenseFileId @ stub SLGetLicenseInformation -@ stub SLGetLicensingStatusInformation +@ stdcall SLGetLicensingStatusInformation(ptr ptr ptr wstr ptr ptr) @ stub SLGetPKeyId @ stub SLGetPKeyInformation @ stub SLGetPolicyInformation diff --git a/include/slerror.h b/include/slerror.h index 8b45d99901..4980a96e73 100644 --- a/include/slerror.h +++ b/include/slerror.h @@ -19,6 +19,7 @@ #ifndef __WINE_SLERROR_H #define __WINE_SLERROR_H +#define SL_E_RIGHT_NOT_CONSUMED 0xC004F002 #define SL_E_VALUE_NOT_FOUND 0xC004F012 #define SL_E_RIGHT_NOT_GRANTED 0xC004F013 #define SL_E_DATATYPE_MISMATCHED 0xC004F01E diff --git a/include/slpublic.h b/include/slpublic.h index dc02f3ce08..97fa8c798c 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -29,6 +29,8 @@ extern "C" { #define SLCAPI DECLSPEC_IMPORT #endif +typedef GUID SLID; + typedef PVOID HSLC; typedef enum _tagSLDATATYPE @@ -41,6 +43,26 @@ typedef enum _tagSLDATATYPE SL_DATA_SUM = 100, } SLDATATYPE; +typedef enum _tagSLLICENSINGSTATUS +{ + SL_LICENSING_STATUS_UNLICENSED, + SL_LICENSING_STATUS_LICENSED, + SL_LICENSING_STATUS_IN_GRACE_PERIOD, + SL_LICENSING_STATUS_NOTIFICATION, + SL_LICENSING_STATUS_LAST +} SLLICENSINGSTATUS; + +typedef struct _tagSL_LICENSING_STATUS +{ + SLID SkuId; + SLLICENSINGSTATUS eStatus; + DWORD dwGraceTime; + DWORD dwTotalGraceDays; + HRESULT hrReason; + UINT64 qwValidityExpiration; +} SL_LICENSING_STATUS; + +SLCAPI HRESULT WINAPI SLGetLicensingStatusInformation(HSLC, const SLID*, const SLID*, LPCWSTR, UINT*, SL_LICENSING_STATUS**); SLCAPI HRESULT WINAPI SLGetWindowsInformation(LPCWSTR, SLDATATYPE*, UINT*, LPBYTE*); SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR, LPDWORD); SLCAPI HRESULT WINAPI SLOpen(HSLC*); -- 2.17.2

1 0

[PATCH v5 1/8] comctl32/tests: Confirm that emptying the listbox sends a LB_RESETCONTENT to itself
by Gabriel Ivăncescu 22 Nov '18

22 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/tests/listbox.c | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 43da3ca..9158e36 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -34,6 +34,7 @@ enum seq_index { + LB_SEQ_INDEX, PARENT_SEQ_INDEX, NUM_MSG_SEQUENCES }; @@ -110,6 +111,43 @@ static HWND create_listbox(DWORD add_style, HWND parent) return handle; } +static WNDPROC lb_test_subclass_proc_prev; +static LRESULT WINAPI lb_test_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + struct message msg = { 0 }; + LRESULT ret; + + switch (message) + { + case WM_SIZE: + case WM_GETTEXT: + case WM_PAINT: + case WM_ERASEBKGND: + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + case WM_NCCALCSIZE: + case WM_NCPAINT: + case WM_NCHITTEST: + case WM_DEVICECHANGE: + break; + + default: + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, LB_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(lb_test_subclass_proc_prev, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + struct listbox_prop { DWORD add_style; @@ -167,6 +205,15 @@ static void keypress(HWND handle, WPARAM keycode, BYTE scancode, BOOL extended) static void run_test(DWORD style, const struct listbox_test test) { + static const struct message delete_seq[] = + { + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_RESETCONTENT, sent|wparam|lparam|defwinproc, 0, 0 }, + { 0 } + }; struct listbox_stat answer; RECT second_item; int i, res; @@ -227,6 +274,17 @@ static void run_test(DWORD style, const struct listbox_test test) res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); ok(res == 4, "Expected 4 items, got %d\n", res); + /* Confirm that emptying the listbox sends a LB_RESETCONTENT to itself */ + lb_test_subclass_proc_prev = (WNDPROC)SetWindowLongPtrW(hLB, GWLP_WNDPROC, (LONG_PTR)lb_test_subclass_proc); + + flush_sequence(sequences, LB_SEQ_INDEX); + for (i = 4; i--;) + { + res = SendMessageA(hLB, LB_DELETESTRING, 0, 0); + ok(res == i, "Expected %d items, got %d\n", i, res); + } + ok_sequence(sequences, LB_SEQ_INDEX, delete_seq, "Emptying listbox", FALSE); + DestroyWindow(hLB); } @@ -1763,6 +1821,12 @@ static void test_listbox_dlgdir(void) static void test_set_count( void ) { + static const struct message setcount0_seq[] = + { + { LB_SETCOUNT, sent|wparam|lparam, 0, 0 }, + { LB_RESETCONTENT, sent|wparam|lparam|defwinproc, 0, 0 }, + { 0 } + }; static const DWORD styles[] = { LBS_OWNERDRAWFIXED, @@ -1798,6 +1862,14 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + /* Confirm that emptying the listbox sends a LB_RESETCONTENT to itself */ + lb_test_subclass_proc_prev = (WNDPROC)SetWindowLongPtrW(listbox, GWLP_WNDPROC, (LONG_PTR)lb_test_subclass_proc); + + flush_sequence(sequences, LB_SEQ_INDEX); + ret = SendMessageA(listbox, LB_SETCOUNT, 0, 0); + ok(ret == 0, "got %d\n", ret); + ok_sequence(sequences, LB_SEQ_INDEX, setcount0_seq, "LB_SETCOUNT 0", FALSE); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i) -- 2.19.1

3 11

[PATCH 5/5] d3d9: Disallow creating managed 3D textures on d3d9ex devices.
by Henri Verbeet 22 Nov '18

22 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 7 +++---- dlls/d3d9/texture.c | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2a3adc7b53b..538729672b5 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4459,10 +4459,9 @@ static void test_resource_access(void) hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED - ? D3D_OK : D3DERR_INVALIDCALL), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 84a1bd85e78..456e41e82e2 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1451,6 +1451,12 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev struct wined3d_resource_desc desc; HRESULT hr; + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + /* In d3d9, 3D textures can't be used as rendertarget or depth/stencil buffer. */ if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) return D3DERR_INVALIDCALL; -- 2.11.0

2 1

[PATCH 4/5] d3d9: Disallow creating managed index buffers on d3d9ex devices.
by Henri Verbeet 22 Nov '18

22 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 6 ++++++ dlls/d3d9/tests/d3d9ex.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 557ec91bf9b..219ee43df0f 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -585,6 +585,12 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de if (pool == D3DPOOL_SCRATCH) return D3DERR_INVALIDCALL; + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + /* In d3d9, buffers can't be used as rendertarget or depth/stencil buffer. */ if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) return D3DERR_INVALIDCALL; diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 759790ceadc..2a3adc7b53b 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4500,10 +4500,9 @@ static void test_resource_access(void) hr = IDirect3DDevice9Ex_CreateIndexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL); - todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED - || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED + || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; -- 2.11.0

2 1

[PATCH] shcore: Implement method wrapper functions.
by Nikolay Sivov 22 Nov '18

22 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- First part for https://bugs.winehq.org/show_bug.cgi?id=44793. dlls/shcore/main.c | 160 ++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 18 ++--- 2 files changed, 169 insertions(+), 9 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 07918bcac7..aa513ee09d 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -19,10 +19,14 @@ #include "config.h" #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "initguid.h" +#include "ocidl.h" #include "shellscalingapi.h" #include "wine/debug.h" @@ -61,3 +65,159 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x if (GetDpiForMonitorInternal( monitor, type, x, y )) return S_OK; return HRESULT_FROM_WIN32( GetLastError() ); } + +HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) +{ + ULONG read; + HRESULT hr; + + TRACE("(%p, %p, %u)\n", stream, dest, size); + + hr = IStream_Read(stream, dest, size, &read); + if (SUCCEEDED(hr) && read != size) + hr = E_FAIL; + return hr; +} + +HRESULT WINAPI IStream_Reset(IStream *stream) +{ + static const LARGE_INTEGER zero; + + TRACE("(%p)\n", stream); + + return IStream_Seek(stream, zero, 0, NULL); +} + +HRESULT WINAPI IStream_Size(IStream *stream, ULARGE_INTEGER *size) +{ + STATSTG statstg; + HRESULT hr; + + TRACE("(%p, %p)\n", stream, size); + + memset(&statstg, 0, sizeof(statstg)); + + hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr) && size) + *size = statstg.cbSize; + return hr; +} + +HRESULT WINAPI _IStream_Write(IStream *stream, const void *src, ULONG size) +{ + ULONG written; + HRESULT hr; + + TRACE("(%p, %p, %u)\n", stream, src, size); + + hr = IStream_Write(stream, src, size, &written); + if (SUCCEEDED(hr) && written != size) + hr = E_FAIL; + + return hr; +} + +void WINAPI IUnknown_AtomicRelease(IUnknown **obj) +{ + TRACE("(%p)\n", obj); + + if (!obj || !*obj) + return; + + IUnknown_Release(*obj); + *obj = NULL; +} + +HRESULT WINAPI IUnknown_GetSite(IUnknown *unk, REFIID iid, void **site) +{ + IObjectWithSite *obj = NULL; + HRESULT hr = E_INVALIDARG; + + TRACE("(%p, %s, %p)\n", unk, debugstr_guid(iid), site); + + if (unk && iid && site) + { + hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&obj); + if (SUCCEEDED(hr) && obj) + { + hr = IObjectWithSite_GetSite(obj, iid, site); + IObjectWithSite_Release(obj); + } + } + + return hr; +} + +HRESULT WINAPI IUnknown_QueryService(IUnknown *obj, REFGUID sid, REFIID iid, void **out) +{ + IServiceProvider *provider = NULL; + HRESULT hr; + + if (!out) + return E_FAIL; + + *out = NULL; + + if (!obj) + return E_FAIL; + + hr = IUnknown_QueryInterface(obj, &IID_IServiceProvider, (void **)&provider); + if (hr == S_OK && provider) + { + TRACE("Using provider %p.\n", provider); + + hr = IServiceProvider_QueryService(provider, sid, iid, out); + + TRACE("Provider %p returned %p.\n", provider, *out); + + IServiceProvider_Release(provider); + } + + return hr; +} + +void WINAPI IUnknown_Set(IUnknown **dest, IUnknown *src) +{ + TRACE("(%p, %p)\n", dest, src); + + IUnknown_AtomicRelease(dest); + + if (src) + { + IUnknown_AddRef(src); + *dest = src; + } +} + +HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site) +{ + IInternetSecurityManager *sec_manager; + IObjectWithSite *objwithsite; + HRESULT hr; + + if (!obj) + return E_FAIL; + + hr = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void **)&objwithsite); + TRACE("ObjectWithSite %p, hr %#x.\n", objwithsite, hr); + if (SUCCEEDED(hr)) + { + hr = IObjectWithSite_SetSite(objwithsite, site); + TRACE("SetSite() hr %#x.\n", hr); + IObjectWithSite_Release(objwithsite); + } + else + { + hr = IUnknown_QueryInterface(obj, &IID_IInternetSecurityManager, (void **)&sec_manager); + TRACE("InternetSecurityManager %p, hr %#x.\n", sec_manager, hr); + if (FAILED(hr)) + return hr; + + hr = IInternetSecurityManager_SetSecuritySite(sec_manager, (IInternetSecurityMgrSite *)site); + TRACE("SetSecuritySite() hr %#x.\n", hr); + IInternetSecurityManager_Release(sec_manager); + } + + return hr; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index a9a6f31717..0b20781635 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -14,17 +14,17 @@ @ stub GetScaleFactorForDevice @ stub GetScaleFactorForMonitor @ stub IStream_Copy -@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read +@ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr -@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset -@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size -@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write +@ stdcall IStream_Reset(ptr) +@ stdcall IStream_Size(ptr ptr) +@ stdcall IStream_Write(ptr ptr long) _IStream_Write @ stub IStream_WriteStr -@ stdcall IUnknown_AtomicRelease(long) shlwapi.IUnknown_AtomicRelease -@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite -@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService -@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set -@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite +@ stdcall IUnknown_AtomicRelease(long) +@ stdcall IUnknown_GetSite(ptr ptr ptr) +@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) +@ stdcall IUnknown_Set(ptr ptr) +@ stdcall IUnknown_SetSite(ptr ptr) @ stdcall IsOS(long) shlwapi.IsOS @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications -- 2.19.1

1 0

[PATCH 3/5] d3d9: Disallow creating managed vertex buffers on d3d9ex devices.
by Henri Verbeet 22 Nov '18

22 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 6 ++++++ dlls/d3d9/tests/d3d9ex.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 4b0b39293cb..557ec91bf9b 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -283,6 +283,12 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * return D3DERR_INVALIDCALL; } + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + /* In d3d9, buffers can't be used as rendertarget or depth/stencil buffer. */ if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) return D3DERR_INVALIDCALL; diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0c463940845..759790ceadc 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4533,10 +4533,9 @@ static void test_resource_access(void) hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb, NULL); - todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED - || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED + || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; -- 2.11.0

2 1

[PATCH 2/5] d3d9/tests: Add a d3d9ex resource access test.
by Henri Verbeet 22 Nov '18

22 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 460 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 460 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index bd2687f8fd8..0c463940845 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4107,6 +4107,465 @@ static void test_frame_latency(void) DestroyWindow(window); } +static void test_resource_access(void) +{ + IDirect3DSurface9 *backbuffer, *depth_stencil; + D3DFORMAT colour_format, depth_format, format; + BOOL depth_2d, depth_cube, depth_plain; + struct device_desc device_desc; + D3DSURFACE_DESC surface_desc; + IDirect3DDevice9Ex *device; + unsigned int i, j; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + enum surface_type + { + SURFACE_2D, + SURFACE_CUBE, + SURFACE_RT, + SURFACE_RT_EX, + SURFACE_DS, + SURFACE_DS_EX, + SURFACE_PLAIN, + SURFACE_PLAIN_EX, + }; + + enum resource_format + { + FORMAT_COLOUR, + FORMAT_ATI2, + FORMAT_DEPTH, + }; + + static const struct + { + D3DPOOL pool; + enum resource_format format; + DWORD usage; + BOOL valid; + } + tests[] = + { + /* 0 */ + {D3DPOOL_DEFAULT, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, 0, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, TRUE}, + /* 7 */ + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_ATI2, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC | D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC | D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_COLOUR, D3DUSAGE_DYNAMIC | D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_DEFAULT, FORMAT_DEPTH, D3DUSAGE_DYNAMIC | D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 14 */ + {D3DPOOL_MANAGED, FORMAT_COLOUR, 0, FALSE}, + {D3DPOOL_MANAGED, FORMAT_ATI2, 0, FALSE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_MANAGED, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_MANAGED, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_MANAGED, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 21 */ + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_SYSTEMMEM, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_SYSTEMMEM, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + /* 28 */ + {D3DPOOL_SCRATCH, FORMAT_COLOUR, 0, TRUE}, + {D3DPOOL_SCRATCH, FORMAT_ATI2, 0, TRUE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, 0, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_COLOUR, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, D3DUSAGE_RENDERTARGET, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_COLOUR, D3DUSAGE_DEPTHSTENCIL, FALSE}, + {D3DPOOL_SCRATCH, FORMAT_DEPTH, D3DUSAGE_DEPTHSTENCIL, FALSE}, + }; + static const struct + { + const char *name; + enum surface_type type; + } + surface_types[] = + { + {"2D", SURFACE_2D}, + {"CUBE", SURFACE_CUBE}, + {"RT", SURFACE_RT}, + {"RT_EX", SURFACE_RT_EX}, + {"DS", SURFACE_DS}, + {"DS_EX", SURFACE_DS_EX}, + {"PLAIN", SURFACE_PLAIN}, + {"PLAIN_EX", SURFACE_PLAIN_EX}, + }; + + window = create_window(); + device_desc.device_window = window; + device_desc.width = 16; + device_desc.height = 16; + device_desc.flags = 0; + if (!(device = create_device(window, &device_desc))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice9Ex_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_GetDesc(backbuffer, &surface_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + colour_format = surface_desc.Format; + + hr = IDirect3DDevice9Ex_GetDepthStencilSurface(device, &depth_stencil); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_GetDesc(depth_stencil, &surface_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + depth_format = surface_desc.Format; + + depth_2d = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, depth_format)); + depth_cube = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_CUBETEXTURE, depth_format)); + depth_plain = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, depth_format)); + + hr = IDirect3DDevice9Ex_SetFVF(device, D3DFVF_XYZRHW); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(surface_types); ++i) + { + for (j = 0; j < ARRAY_SIZE(tests); ++j) + { + IDirect3DCubeTexture9 *texture_cube; + IDirect3DBaseTexture9 *texture; + IDirect3DTexture9 *texture_2d; + IDirect3DSurface9 *surface; + HRESULT expected_hr; + D3DLOCKED_RECT lr; + + if (tests[j].format == FORMAT_ATI2) + format = MAKEFOURCC('A','T','I','2'); + else if (tests[j].format == FORMAT_DEPTH) + format = depth_format; + else + format = colour_format; + + if (tests[j].format == FORMAT_ATI2 && FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, format))) + { + skip("ATI2N texture not supported.\n"); + continue; + } + + switch (surface_types[i].type) + { + case SURFACE_2D: + hr = IDirect3DDevice9Ex_CreateTexture(device, 16, 16, 1, + tests[j].usage, format, tests[j].pool, &texture_2d, NULL); + todo_wine_if(!tests[j].valid && !tests[j].usage && (tests[j].format == FORMAT_DEPTH + || tests[j].pool == D3DPOOL_MANAGED)) + ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DTexture9_GetSurfaceLevel(texture_2d, 0, &surface); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DTexture9_Release(texture_2d); + break; + + case SURFACE_CUBE: + hr = IDirect3DDevice9Ex_CreateCubeTexture(device, 16, 1, + tests[j].usage, format, tests[j].pool, &texture_cube, NULL); + todo_wine_if(!tests[j].valid && !tests[j].usage && (tests[j].format == FORMAT_DEPTH + || tests[j].pool == D3DPOOL_MANAGED)) + ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DCubeTexture9_GetCubeMapSurface(texture_cube, + D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DCubeTexture9_Release(texture_cube); + break; + + case SURFACE_RT: + hr = IDirect3DDevice9Ex_CreateRenderTarget(device, 16, 16, format, + D3DMULTISAMPLE_NONE, 0, tests[j].usage & D3DUSAGE_DYNAMIC, &surface, NULL); + ok(hr == (tests[j].format == FORMAT_COLOUR ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_RT_EX: + hr = IDirect3DDevice9Ex_CreateRenderTargetEx(device, 16, 16, format, D3DMULTISAMPLE_NONE, + 0, tests[j].pool != D3DPOOL_DEFAULT, &surface, NULL, tests[j].usage); + todo_wine + ok(hr == (tests[j].format == FORMAT_COLOUR && !tests[j].usage ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_DS: + hr = IDirect3DDevice9Ex_CreateDepthStencilSurface(device, 16, 16, format, + D3DMULTISAMPLE_NONE, 0, tests[j].usage & D3DUSAGE_DYNAMIC, &surface, NULL); + ok(hr == (tests[j].format == FORMAT_DEPTH ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_DS_EX: + hr = IDirect3DDevice9Ex_CreateDepthStencilSurfaceEx(device, 16, 16, format, D3DMULTISAMPLE_NONE, + 0, tests[j].pool != D3DPOOL_DEFAULT, &surface, NULL, tests[j].usage); + ok(hr == (tests[j].format == FORMAT_DEPTH && !tests[j].usage ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_PLAIN: + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, + 16, 16, format, tests[j].pool, &surface, NULL); + todo_wine_if(tests[j].format == FORMAT_ATI2 && tests[j].pool != D3DPOOL_MANAGED + && tests[j].pool != D3DPOOL_SCRATCH) + ok(hr == (tests[j].pool != D3DPOOL_MANAGED && (tests[j].format != FORMAT_DEPTH || depth_plain) + && (tests[j].format != FORMAT_ATI2 || tests[j].pool == D3DPOOL_SCRATCH) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + case SURFACE_PLAIN_EX: + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, + 16, 16, format, tests[j].pool, &surface, NULL, tests[j].usage); + todo_wine + ok(hr == (!tests[j].usage && tests[j].pool != D3DPOOL_MANAGED + && (tests[j].format != FORMAT_DEPTH || depth_plain) + && (tests[j].format != FORMAT_ATI2 || tests[j].pool == D3DPOOL_SCRATCH) + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (FAILED(hr)) + continue; + break; + + default: + ok(0, "Invalid surface type %#x.\n", surface_types[i].type); + continue; + } + + hr = IDirect3DSurface9_GetDesc(surface, &surface_desc); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + if (surface_types[i].type == SURFACE_RT || surface_types[i].type == SURFACE_RT_EX) + { + ok(surface_desc.Usage == D3DUSAGE_RENDERTARGET, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == D3DPOOL_DEFAULT, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else if (surface_types[i].type == SURFACE_DS || surface_types[i].type == SURFACE_DS_EX) + { + ok(surface_desc.Usage == D3DUSAGE_DEPTHSTENCIL, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == D3DPOOL_DEFAULT, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else if (surface_types[i].type == SURFACE_PLAIN || surface_types[i].type == SURFACE_PLAIN_EX) + { + ok(!surface_desc.Usage, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == tests[j].pool, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + else + { + ok(surface_desc.Usage == tests[j].usage, "Test %s %u: Got unexpected usage %#x.\n", + surface_types[i].name, j, surface_desc.Usage); + ok(surface_desc.Pool == tests[j].pool, "Test %s %u: Got unexpected pool %#x.\n", + surface_types[i].name, j, surface_desc.Pool); + } + + hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); + if (surface_desc.Pool != D3DPOOL_DEFAULT || surface_desc.Usage & D3DUSAGE_DYNAMIC + || (surface_types[i].type == SURFACE_RT && tests[j].usage & D3DUSAGE_DYNAMIC) + || (surface_types[i].type == SURFACE_RT_EX && tests[j].pool != D3DPOOL_DEFAULT) + || surface_types[i].type == SURFACE_PLAIN || surface_types[i].type == SURFACE_PLAIN_EX + || tests[j].format == FORMAT_ATI2) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DSurface9_UnlockRect(surface); + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type == SURFACE_2D) + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture))) + { + hr = IDirect3DDevice9Ex_SetTexture(device, 0, texture); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice9Ex_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + IDirect3DBaseTexture9_Release(texture); + } + + hr = IDirect3DDevice9Ex_SetRenderTarget(device, 0, surface); + ok(hr == (surface_desc.Usage & D3DUSAGE_RENDERTARGET ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice9Ex_SetRenderTarget(device, 0, backbuffer); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + hr = IDirect3DDevice9Ex_SetDepthStencilSurface(device, surface); + ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + hr = IDirect3DDevice9Ex_SetDepthStencilSurface(device, depth_stencil); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + + IDirect3DSurface9_Release(surface); + } + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + IDirect3DVolumeTexture9 *texture; + D3DVOLUME_DESC volume_desc; + IDirect3DVolume9 *volume; + HRESULT expected_hr; + D3DLOCKED_BOX lb; + + if (tests[j].format == FORMAT_DEPTH) + continue; + + if (tests[j].format == FORMAT_ATI2) + format = MAKEFOURCC('A','T','I','2'); + else + format = colour_format; + + hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 16, 16, 1, 1, + tests[i].usage, format, tests[i].pool, &texture, NULL); + todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED + ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(texture, 0, &volume); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DVolume9_GetDesc(volume, &volume_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(volume_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, volume_desc.Usage); + ok(volume_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, volume_desc.Pool); + + hr = IDirect3DVolume9_LockBox(volume, &lb, NULL, 0); + if (volume_desc.Pool != D3DPOOL_DEFAULT || volume_desc.Usage & D3DUSAGE_DYNAMIC) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DVolume9_UnlockBox(volume); + ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9Ex_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9Ex_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DVolume9_Release(volume); + IDirect3DVolumeTexture9_Release(texture); + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + D3DINDEXBUFFER_DESC ib_desc; + IDirect3DIndexBuffer9 *ib; + void *data; + + hr = IDirect3DDevice9Ex_CreateIndexBuffer(device, 16, tests[i].usage, + tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL); + todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED + || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DIndexBuffer9_GetDesc(ib, &ib_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage); + ok(ib_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, ib_desc.Pool); + + hr = IDirect3DIndexBuffer9_Lock(ib, 0, 0, &data, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9Ex_SetIndices(device, ib); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9Ex_SetIndices(device, NULL); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DIndexBuffer9_Release(ib); + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + D3DVERTEXBUFFER_DESC vb_desc; + IDirect3DVertexBuffer9 *vb; + void *data; + + hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, 16, tests[i].usage, + tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb, NULL); + todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED + || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); + if (FAILED(hr)) + continue; + + hr = IDirect3DVertexBuffer9_GetDesc(vb, &vb_desc); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); + ok(vb_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, vb_desc.Pool); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, 0, &data, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirect3DDevice9Ex_SetStreamSource(device, 0, vb, 0, 16); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DDevice9Ex_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + IDirect3DVertexBuffer9_Release(vb); + } + + IDirect3DSurface9_Release(depth_stencil); + IDirect3DSurface9_Release(backbuffer); + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4158,4 +4617,5 @@ START_TEST(d3d9ex) test_format_unknown(); test_device_caps(); test_frame_latency(); + test_resource_access(); } -- 2.11.0

2 1

[PATCH 1/5] d3d9: Do not add map access indiscriminately in d3d9_device_create_surface().
by Henri Verbeet 22 Nov '18

22 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 3 +-- dlls/d3d9/tests/device.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index eed3a043a67..0dec4ce215a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1399,8 +1399,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage); - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cb38aead42a..6edf2b35b30 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12877,11 +12877,9 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D - && surface_types[i].type != SURFACE_CUBE) - ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DSurface9_UnlockRect(surface); - todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_CUBE) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type == SURFACE_2D) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture))) -- 2.11.0

2 1

[PATCH] dwrite: Add support for memory font resources in CreateFontFaceFromHdc().
by Nikolay Sivov 22 Nov '18

22 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/gdiinterop.c | 200 ++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 71 ++++++++++++-- 2 files changed, 261 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 5501f377c4..2e4a949286 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -2,7 +2,7 @@ * GDI Interop * * Copyright 2011 Huw Davies - * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2018 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,10 +54,17 @@ struct rendertarget { struct gdiinterop { IDWriteGdiInterop1 IDWriteGdiInterop1_iface; + IDWriteFontFileLoader IDWriteFontFileLoader_iface; LONG ref; IDWriteFactory5 *factory; }; +struct memresource_stream { + IDWriteFontFileStream IDWriteFontFileStream_iface; + LONG ref; + DWORD key; +}; + static inline int get_dib_stride(int width, int bpp) { return ((width * bpp + 31) >> 3) & ~3; @@ -111,6 +118,16 @@ static inline struct gdiinterop *impl_from_IDWriteGdiInterop1(IDWriteGdiInterop1 return CONTAINING_RECORD(iface, struct gdiinterop, IDWriteGdiInterop1_iface); } +static inline struct gdiinterop *impl_from_IDWriteFontFileLoader(IDWriteFontFileLoader *iface) +{ + return CONTAINING_RECORD(iface, struct gdiinterop, IDWriteFontFileLoader_iface); +} + +static inline struct memresource_stream *impl_from_IDWriteFontFileStream(IDWriteFontFileStream *iface) +{ + return CONTAINING_RECORD(iface, struct memresource_stream, IDWriteFontFileStream_iface); +} + static HRESULT WINAPI rendertarget_sink_QueryInterface(ID2D1SimplifiedGeometrySink *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_ID2D1SimplifiedGeometrySink) || @@ -637,6 +654,7 @@ static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop1 *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { + IDWriteFactory5_UnregisterFontFileLoader(This->factory, &This->IDWriteFontFileLoader_iface); factory_detach_gdiinterop(This->factory, iface); heap_free(This); } @@ -728,6 +746,7 @@ struct font_fileinfo { /* Undocumented gdi32 exports, used to access actually selected font information */ extern BOOL WINAPI GetFontRealizationInfo(HDC hdc, struct font_realization_info *info); extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed); +extern BOOL WINAPI GetFontFileData(DWORD instance_id, DWORD unknown, UINT64 offset, void *buff, DWORD buff_size); static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface, HDC hdc, IDWriteFontFace **fontface) @@ -773,8 +792,12 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface return E_FAIL; } - hr = IDWriteFactory5_CreateFontFileReference(This->factory, fileinfo->path, &fileinfo->writetime, - &file); + if (*fileinfo->path) + hr = IDWriteFactory5_CreateFontFileReference(This->factory, fileinfo->path, &fileinfo->writetime, &file); + else + hr = IDWriteFactory5_CreateCustomFontFileReference(This->factory, &info.instance_id, sizeof(info.instance_id), + &This->IDWriteFontFileLoader_iface, &file); + heap_free(fileinfo); if (FAILED(hr)) return hr; @@ -897,6 +920,175 @@ static const struct IDWriteGdiInterop1Vtbl gdiinteropvtbl = { gdiinterop1_GetMatchingFontsByLOGFONT }; +static HRESULT WINAPI memresourcestream_QueryInterface(IDWriteFontFileStream *iface, REFIID riid, void **out) +{ + struct memresource_stream *This = impl_from_IDWriteFontFileStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if (IsEqualIID(&IID_IDWriteFontFileStream, riid) || IsEqualIID(&IID_IUnknown, riid)) { + *out = iface; + IDWriteFontFileStream_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI memresourcestream_AddRef(IDWriteFontFileStream *iface) +{ + struct memresource_stream *This = impl_from_IDWriteFontFileStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI memresourcestream_Release(IDWriteFontFileStream *iface) +{ + struct memresource_stream *This = impl_from_IDWriteFontFileStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI memresourcestream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, + UINT64 offset, UINT64 fragment_size, void **fragment_context) +{ + struct memresource_stream *This = impl_from_IDWriteFontFileStream(iface); + struct font_fileinfo fileinfo; + void *fragment; + + TRACE("(%p)->(%p %s %s %p)\n", This, fragment_start, wine_dbgstr_longlong(offset), + wine_dbgstr_longlong(fragment_size), fragment_context); + + *fragment_context = NULL; + *fragment_start = NULL; + + if (!GetFontFileInfo(This->key, 0, &fileinfo, sizeof(fileinfo), NULL)) + return E_INVALIDARG; + + if ((offset >= fileinfo.size.QuadPart - 1) || (fragment_size > fileinfo.size.QuadPart - offset)) + return E_INVALIDARG; + + if (!(fragment = heap_alloc(fragment_size))) + return E_OUTOFMEMORY; + + if (!GetFontFileData(This->key, 0, offset, fragment, fragment_size)) + return E_FAIL; + + *fragment_start = *fragment_context = fragment; + return S_OK; +} + +static void WINAPI memresourcestream_ReleaseFileFragment(IDWriteFontFileStream *iface, void *fragment_context) +{ + struct memresource_stream *This = impl_from_IDWriteFontFileStream(iface); + + TRACE("(%p)->(%p)\n", This, fragment_context); + + heap_free(fragment_context); +} + +static HRESULT WINAPI memresourcestream_GetFileSize(IDWriteFontFileStream *iface, UINT64 *size) +{ + struct memresource_stream *This = impl_from_IDWriteFontFileStream(iface); + struct font_fileinfo fileinfo; + + TRACE("(%p)->(%p)\n", This, size); + + if (!GetFontFileInfo(This->key, 0, &fileinfo, sizeof(fileinfo), NULL)) + return E_INVALIDARG; + + *size = fileinfo.size.QuadPart; + + return S_OK; +} + +static HRESULT WINAPI memresourcestream_GetLastWriteTime(IDWriteFontFileStream *iface, UINT64 *last_writetime) +{ + struct memresource_stream *This = impl_from_IDWriteFontFileStream(iface); + + TRACE("(%p)->(%p)\n", This, last_writetime); + + return E_NOTIMPL; +} + +static const struct IDWriteFontFileStreamVtbl memresourcestreamvtbl = { + memresourcestream_QueryInterface, + memresourcestream_AddRef, + memresourcestream_Release, + memresourcestream_ReadFileFragment, + memresourcestream_ReleaseFileFragment, + memresourcestream_GetFileSize, + memresourcestream_GetLastWriteTime, +}; + +static HRESULT WINAPI memresourceloader_QueryInterface(IDWriteFontFileLoader *iface, REFIID riid, void **out) +{ + struct gdiinterop *This = impl_from_IDWriteFontFileLoader(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if (IsEqualIID(&IID_IDWriteFontFileLoader, riid) || IsEqualIID(&IID_IUnknown, riid)) { + *out = iface; + IDWriteFontFileLoader_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI memresourceloader_AddRef(IDWriteFontFileLoader *iface) +{ + return 2; +} + +static ULONG WINAPI memresourceloader_Release(IDWriteFontFileLoader *iface) +{ + return 1; +} + +static HRESULT WINAPI memresourceloader_CreateStreamFromKey(IDWriteFontFileLoader *iface, void const *key, + UINT32 key_size, IDWriteFontFileStream **ret) +{ + struct gdiinterop *This = impl_from_IDWriteFontFileLoader(iface); + struct memresource_stream *stream; + + TRACE("(%p)->(%p %u %p)\n", This, key, key_size, ret); + + *ret = NULL; + + if (!key || key_size != sizeof(DWORD)) + return E_INVALIDARG; + + if (!(stream = heap_alloc(sizeof(*stream)))) + return E_OUTOFMEMORY; + + stream->IDWriteFontFileStream_iface.lpVtbl = &memresourcestreamvtbl; + stream->ref = 1; + memcpy(&stream->key, key, sizeof(stream->key)); + + *ret = &stream->IDWriteFontFileStream_iface; + + return S_OK; +} + +static const struct IDWriteFontFileLoaderVtbl memresourceloadervtbl = { + memresourceloader_QueryInterface, + memresourceloader_AddRef, + memresourceloader_Release, + memresourceloader_CreateStreamFromKey, +}; + HRESULT create_gdiinterop(IDWriteFactory5 *factory, IDWriteGdiInterop1 **ret) { struct gdiinterop *interop; @@ -907,8 +1099,10 @@ HRESULT create_gdiinterop(IDWriteFactory5 *factory, IDWriteGdiInterop1 **ret) return E_OUTOFMEMORY; interop->IDWriteGdiInterop1_iface.lpVtbl = &gdiinteropvtbl; + interop->IDWriteFontFileLoader_iface.lpVtbl = &memresourceloadervtbl; interop->ref = 1; IDWriteFactory5_AddRef(interop->factory = factory); + IDWriteFactory5_RegisterFontFileLoader(factory, &interop->IDWriteFontFileLoader_iface); *ret = &interop->IDWriteGdiInterop1_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2ac81573de..86efb8cc05 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2018 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -122,6 +122,8 @@ static void _expect_ref_broken(IUnknown* obj, ULONG ref, ULONG brokenref, int li ok_(__FILE__,line)(rc == ref || broken(rc == brokenref), "expected refcount %d, got %d\n", ref, rc); } +static BOOL (WINAPI *pGetFontRealizationInfo)(HDC hdc, void *); + static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR arialW[] = {'A','r','i','a','l',0}; @@ -3735,10 +3737,22 @@ static void *map_font_file(const WCHAR *filename, DWORD *file_size) return ptr; } +struct font_realization_info +{ + DWORD size; + DWORD flags; + DWORD cache_num; + DWORD instance_id; + DWORD unk; + WORD face_index; + WORD simulations; +}; + static void test_CreateFontFaceFromHdc(void) { IDWriteFontFileStream *stream, *stream2; void *font_data, *fragment_context; + struct font_realization_info info; const void *refkey, *fragment; IDWriteFontFileLoader *loader; DWORD data_size, num_fonts; @@ -3748,10 +3762,10 @@ static void test_CreateFontFaceFromHdc(void) UINT64 size, writetime; IDWriteFontFile *file; HFONT hfont, oldhfont; + UINT32 count, dummy; LOGFONTW logfont; HANDLE resource; IUnknown *unk; - UINT32 count; LOGFONTA lf; WCHAR *path; HRESULT hr; @@ -3761,6 +3775,8 @@ static void test_CreateFontFaceFromHdc(void) factory = create_factory(); + pGetFontRealizationInfo = (void *)GetProcAddress(GetModuleHandleA("gdi32"), "GetFontRealizationInfo"); + interop = NULL; hr = IDWriteFactory_GetGdiInterop(factory, &interop); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3789,7 +3805,23 @@ static void test_CreateFontFaceFromHdc(void) fontface = NULL; hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create font face, hr %#x.\n", hr); + + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + ok(hr == S_OK, "Failed to get font files, hr %#x.\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "Failed to get file loader, hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void **)&unk); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Expected local loader, hr %#x.\n", hr); + if (unk) + IUnknown_Release(unk); + + IDWriteFontFileLoader_Release(loader); + IDWriteFontFile_Release(file); + IDWriteFontFace_Release(fontface); DeleteObject(SelectObject(hdc, oldhfont)); @@ -3828,11 +3860,8 @@ static void test_CreateFontFaceFromHdc(void) oldhfont = SelectObject(hdc, hfont); hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); -todo_wine ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); -if (fontface) -{ count = 1; hr = IDWriteFontFace_GetFiles(fontface, &count, &file); ok(hr == S_OK, "Failed to get font files, hr %#x.\n", hr); @@ -3854,6 +3883,17 @@ if (fontface) ok(hr == S_OK, "Failed to get ref key, hr %#x.\n", hr); ok(count > 0, "Unexpected key length %u.\n", count); + if (pGetFontRealizationInfo) + { + info.size = sizeof(info); + ret = pGetFontRealizationInfo(hdc, &info); + ok(ret, "Failed to get realization info.\n"); + ok(count == sizeof(info.instance_id), "Unexpected key size.\n"); + ok(*(DWORD *)refkey == info.instance_id, "Unexpected stream key.\n"); + } + else + win_skip("GetFontRealizationInfo() is not available.\n"); + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, refkey, count, &stream); ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); @@ -3862,6 +3902,17 @@ if (fontface) ok(stream2 != stream, "Unexpected stream instance.\n"); IDWriteFontFileStream_Release(stream2); + dummy = 1; + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, &dummy, count, &stream2); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + + writetime = 1; + hr = IDWriteFontFileStream_GetLastWriteTime(stream2, &writetime); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(writetime == 1, "Unexpected write time.\n"); + + IDWriteFontFileStream_Release(stream2); + hr = IDWriteFontFileStream_GetFileSize(stream, &size); ok(hr == S_OK, "Failed to get stream size, hr %#x.\n", hr); ok(size == data_size, "Unexpected stream size.\n"); @@ -3876,13 +3927,19 @@ if (fontface) ok(fragment == fragment_context, "Unexpected data pointer %p, context %p.\n", fragment, fragment_context); IDWriteFontFileStream_ReleaseFileFragment(stream, fragment_context); + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, size + 1, &fragment_context); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, size - 1, size / 2, &fragment_context); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + IDWriteFontFileStream_Release(stream); IDWriteFontFileLoader_Release(loader); IDWriteFontFile_Release(file); IDWriteFontFace_Release(fontface); -} + ret = RemoveFontMemResourceEx(resource); ok(ret, "Failed to remove memory resource font, %d.\n", GetLastError()); -- 2.19.1

1 0

[PATCH] winspool.drv: Stop crash when PortName is NULL
by Alistair Leslie-Hughes 22 Nov '18

22 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33502 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7c4ee9a..ea4afec 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1572,7 +1572,8 @@ static void old_printer_check( BOOL delete_phase ) EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num ); for (i = 0; i < num; i++) { - if (strncmpW( pi[i].pPortName, CUPS_Port, strlenW(CUPS_Port) ) && + if (pi[i].pPortName && + strncmpW( pi[i].pPortName, CUPS_Port, strlenW(CUPS_Port) ) && strncmpW( pi[i].pPortName, LPR_Port, strlenW(LPR_Port) )) continue; -- 1.9.1

2 1

[PATCH] winspool: Skip the old printer check if it has a NULL port name.
by Huw Davies 22 Nov '18

22 Nov '18

Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33502 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7c4ee9a26f..fb268a047f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1572,6 +1572,8 @@ static void old_printer_check( BOOL delete_phase ) EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num ); for (i = 0; i < num; i++) { + if (!pi[i].pPortName) continue; + if (strncmpW( pi[i].pPortName, CUPS_Port, strlenW(CUPS_Port) ) && strncmpW( pi[i].pPortName, LPR_Port, strlenW(LPR_Port) )) continue; -- 2.18.0

1 0

[PATCH 5/5] kernelbase: Implement PathCchIsRoot.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 38 ++++++++++ dlls/kernelbase/tests/path.c | 69 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index a09889f415..61eb22031e 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -10,7 +10,7 @@ @ stub PathCchCombine @ stub PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension -@ stub PathCchIsRoot +@ stdcall PathCchIsRoot(wstr) kernelbase.PathCchIsRoot @ stub PathCchRemoveBackslash @ stub PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index aefc63e54c..ffb5a95721 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1039,7 +1039,7 @@ # @ stub PathCchCombine # @ stub PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) -# @ stub PathCchIsRoot +@ stdcall PathCchIsRoot(wstr) # @ stub PathCchRemoveBackslash # @ stub PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index c59fba8d3e..ff8e0dddd1 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -242,6 +242,44 @@ HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR return S_OK; } +BOOL WINAPI PathCchIsRoot(const WCHAR *path) +{ + const WCHAR *root_end; + const WCHAR *next; + BOOL is_unc; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || !*path) return FALSE; + + root_end = get_root_end(path); + if (!root_end) return FALSE; + + if ((is_unc = is_prefixed_unc(path)) || (path[0] == '\\' && path[1] == '\\' && path[2] != '?')) + { + next = root_end + 1; + /* No extra segments */ + if ((is_unc && !*next) || (!is_unc && !*next)) return TRUE; + + /* Has first segment with an ending backslash but no remaining characters */ + if (get_next_segment(next, &next) && !*next) return FALSE; + /* Has first segment with no ending backslash */ + else if (!*next) + return TRUE; + /* Has first segment with an ending backslash and has remaining characters*/ + else + { + next++; + /* Second segment must have no backslash and no remaining characters */ + return !get_next_segment(next, &next) && !*next; + } + } + else if (*root_end == '\\' && !root_end[1]) + return TRUE; + else + return FALSE; +} + HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) { const WCHAR *extension; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 5b47b84831..6d37bbf8ef 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -35,6 +35,7 @@ HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); +BOOL (WINAPI *pPathCchIsRoot)(const WCHAR *path); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT (WINAPI *pPathCchSkipRoot)(const WCHAR *path, const WCHAR **root_end); @@ -477,6 +478,72 @@ static void test_PathCchFindExtension(void) } } +struct isroot_test +{ + const CHAR *path; + BOOL ret; +}; + +static const struct isroot_test isroot_tests[] = +{ + {"", FALSE}, + {"a", FALSE}, + {"C:", FALSE}, + {"C:\\", TRUE}, + {"C:\\a", FALSE}, + {"\\\\?\\C:\\", TRUE}, + {"\\\\?\\C:", FALSE}, + {"\\\\?\\C:\\a", FALSE}, + {"\\", TRUE}, + {"\\a\\", FALSE}, + {"\\a\\b", FALSE}, + {"\\\\", TRUE}, + {"\\\\a", TRUE}, + {"\\\\a\\", FALSE}, + {"\\\\a\\b", TRUE}, + {"\\\\a\\b\\", FALSE}, + {"\\\\a\\b\\c", FALSE}, + {"\\\\?\\UNC\\", TRUE}, + {"\\\\?\\UNC\\a", TRUE}, + {"\\\\?\\UNC\\a\\", FALSE}, + {"\\\\?\\UNC\\a\\b", TRUE}, + {"\\\\?\\UNC\\a\\b\\", FALSE}, + {"\\\\?\\UNC\\a\\b\\c", FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", TRUE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", FALSE}, + {"..\\a", FALSE}, + + /* Wrong MSDN examples */ + {"\\a", FALSE}, + {"X:", FALSE}, + {"\\server", FALSE} +}; + +static void test_PathCchIsRoot(void) +{ + WCHAR pathW[MAX_PATH]; + BOOL ret; + INT i; + + if (!pPathCchIsRoot) + { + win_skip("PathCchIsRoot() is not available.\n"); + return; + } + + ret = pPathCchIsRoot(NULL); + ok(ret == FALSE, "expect return FALSE\n"); + + for (i = 0; i < ARRAY_SIZE(isroot_tests); i++) + { + const struct isroot_test *t = isroot_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + ret = pPathCchIsRoot(pathW); + ok(ret == t->ret, "path %s expect return %d, got %d\n", t->path, t->ret, ret); + } +} + struct removeextension_test { const CHAR *path; @@ -1039,6 +1106,7 @@ START_TEST(path) pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); + pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); pPathCchSkipRoot = (void *)GetProcAddress(hmod, "PathCchSkipRoot"); @@ -1051,6 +1119,7 @@ START_TEST(path) test_PathCchAddBackslashEx(); test_PathCchAddExtension(); test_PathCchFindExtension(); + test_PathCchIsRoot(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); test_PathCchSkipRoot(); diff --git a/include/pathcch.h b/include/pathcch.h index 56920b3444..443ccd3a4f 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -30,6 +30,7 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); +BOOL WINAPI PathCchIsRoot(const WCHAR *path); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); -- 2.19.1

1 0

[PATCH 4/5] kernelbase: Implement PathCchStripToRoot.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 39 ++++++ dlls/kernelbase/tests/path.c | 128 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 170 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index e07fe02a51..a09889f415 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -18,5 +18,5 @@ @ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension @ stdcall PathCchSkipRoot(wstr ptr) kernelbase.PathCchSkipRoot @ stdcall PathCchStripPrefix(wstr long) kernelbase.PathCchStripPrefix -@ stub PathCchStripToRoot +@ stdcall PathCchStripToRoot(wstr long) kernelbase.PathCchStripToRoot @ stdcall PathIsUNCEx(wstr ptr) kernelbase.PathIsUNCEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index eae67be147..aefc63e54c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1047,7 +1047,7 @@ @ stdcall PathCchRenameExtension(wstr long wstr) @ stdcall PathCchSkipRoot(wstr ptr) @ stdcall PathCchStripPrefix(wstr long) -# @ stub PathCchStripToRoot +@ stdcall PathCchStripToRoot(wstr long) @ stdcall PathCombineA(ptr str str) shlwapi.PathCombineA @ stdcall PathCombineW(ptr wstr wstr) shlwapi.PathCombineW @ stdcall PathCommonPrefixA(str str ptr) shlwapi.PathCommonPrefixA diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 168edd0610..c59fba8d3e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -330,6 +330,45 @@ HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size) return S_FALSE; } +HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size) +{ + const WCHAR *root_end; + WCHAR *segment_end; + BOOL is_unc; + + TRACE("%s %lu\n", wine_dbgstr_w(path), size); + + if (!path || !*path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + /* \\\\?\\UNC\\* and \\\\* have to have at least two extra segments to be striped, + * e.g. \\\\?\\UNC\\a\\b\\c -> \\\\?\\UNC\\a\\b + * \\\\a\\b\\c -> \\\\a\\b */ + if ((is_unc = is_prefixed_unc(path)) || (path[0] == '\\' && path[1] == '\\' && path[2] != '?')) + { + root_end = is_unc ? path + 8 : path + 3; + if (!get_next_segment(root_end, &root_end)) return S_FALSE; + if (!get_next_segment(root_end, &root_end)) return S_FALSE; + + if (root_end - path >= size) return E_INVALIDARG; + + segment_end = path + (root_end - path) - 1; + *segment_end = 0; + return S_OK; + } + else if (PathCchSkipRoot(path, &root_end) == S_OK) + { + if (root_end - path >= size) return E_INVALIDARG; + + segment_end = path + (root_end - path); + if (!*segment_end) return S_FALSE; + + *segment_end = 0; + return S_OK; + } + else + return E_INVALIDARG; +} + BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) { const WCHAR *result = NULL; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index f54e77be46..5b47b84831 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -39,6 +39,7 @@ HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT (WINAPI *pPathCchSkipRoot)(const WCHAR *path, const WCHAR **root_end); HRESULT (WINAPI *pPathCchStripPrefix)(WCHAR *path, SIZE_T size); +HRESULT (WINAPI *pPathCchStripToRoot)(WCHAR *path, SIZE_T size); BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); static const struct @@ -835,6 +836,131 @@ static void test_PathCchStripPrefix(void) } } +struct striptoroot_test +{ + const CHAR *path; + const CHAR *root; + HRESULT hr; + SIZE_T size; +}; + +static const struct striptoroot_test striptoroot_tests[] = +{ + /* Invalid */ + {"", "", E_INVALIDARG}, + {"C", NULL, E_INVALIDARG}, + {"\\\\?\\UNC", NULL, E_INVALIDARG}, + + /* Size */ + {"C:\\", NULL, E_INVALIDARG, PATHCCH_MAX_CCH + 1}, + {"C:\\", "C:\\", S_FALSE, PATHCCH_MAX_CCH}, + /* Size < original path length + 1, read beyond size */ + {"C:\\a", "C:\\", S_OK, ARRAY_SIZE("C:\\a") - 1}, + /* Size < stripped path length + 1 */ + {"C:\\a", "C:\\", E_INVALIDARG, ARRAY_SIZE("C:\\") - 1}, + {"\\\\a\\b\\c", NULL, E_INVALIDARG, ARRAY_SIZE("\\\\a\\b") - 1}, + + /* X: */ + {"C:", "C:", S_FALSE}, + {"C:a", "C:", S_OK}, + {"C:a\\b", "C:", S_OK}, + {"C:a\\b\\c", "C:", S_OK}, + + /* X:\ */ + {"C:\\", "C:\\", S_FALSE}, + {"C:\\a", "C:\\", S_OK}, + {"C:\\a\\b", "C:\\", S_OK}, + {"C:\\a\\b\\c", "C:\\", S_OK}, + + /* \ */ + {"\\", "\\", S_FALSE}, + {"\\a", "\\", S_OK}, + {"\\a\\b", "\\", S_OK}, + {"\\a\\b\\c", "\\", S_OK}, + + /* \\ */ + {"\\\\", "\\\\", S_FALSE}, + {"\\\\a", "\\\\a", S_FALSE}, + {"\\\\a\\b", "\\\\a\\b", S_FALSE}, + {"\\\\a\\b\\c", "\\\\a\\b", S_OK}, + + /* UNC */ + {"\\\\?\\UNC\\", "\\\\?\\UNC\\", S_FALSE}, + {"\\\\?\\UNC\\a", "\\\\?\\UNC\\a", S_FALSE}, + {"\\\\?\\UNC\\a\\b", "\\\\?\\UNC\\a\\b", S_FALSE}, + {"\\\\?\\UNC\\a\\b\\", "\\\\?\\UNC\\a\\b", S_OK}, + {"\\\\?\\UNC\\a\\b\\c", "\\\\?\\UNC\\a\\b", S_OK}, + + /* Prefixed X: */ + {"\\\\?\\C:", "\\\\?\\C:", S_FALSE}, + {"\\\\?\\C:a", "\\\\?\\C:", S_OK}, + {"\\\\?\\C:a\\b", "\\\\?\\C:", S_OK}, + {"\\\\?\\C:a\\b\\c", "\\\\?\\C:", S_OK}, + + /* Prefixed X:\ */ + {"\\\\?\\C:\\", "\\\\?\\C:\\", S_FALSE}, + {"\\\\?\\C:\\a", "\\\\?\\C:\\", S_OK}, + {"\\\\?\\C:\\a\\b", "\\\\?\\C:\\", S_OK}, + {"\\\\?\\C:\\a\\b\\c", "\\\\?\\C:\\", S_OK}, + + /* UNC Volume */ + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a\\b", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a\\b\\c", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_OK}, + + /* UNC Volume with backslash */ + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\b", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\b\\c", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_OK}, +}; + +static void test_PathCchStripToRoot(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH]; + CHAR rootA[PATHCCH_MAX_CCH]; + SIZE_T size; + HRESULT hr; + INT i; + + if (!pPathCchStripToRoot) + { + win_skip("PathCchStripToRoot() is not available.\n"); + return; + } + + /* Null arguments */ + hr = pPathCchStripToRoot(NULL, ARRAY_SIZE(pathW)); + ok(hr == E_INVALIDARG, "Expect result %#x, got %#x\n", E_INVALIDARG, hr); + + MultiByteToWideChar(CP_ACP, 0, "C:\\a", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchStripToRoot(pathW, 0); + ok(hr == E_INVALIDARG, "Expect result %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(striptoroot_tests); i++) + { + const struct striptoroot_test *t = striptoroot_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + size = t->size ? t->size : ARRAY_SIZE(pathW); + hr = pPathCchStripToRoot(pathW, size); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, rootA, ARRAY_SIZE(rootA), NULL, NULL); + ok(!lstrcmpA(rootA, t->root), "path %s expect stripped path %s, got %s\n", t->path, t->root, rootA); + } + } +} + struct isuncex_test { const CHAR *path; @@ -917,6 +1043,7 @@ START_TEST(path) pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); pPathCchSkipRoot = (void *)GetProcAddress(hmod, "PathCchSkipRoot"); pPathCchStripPrefix = (void *)GetProcAddress(hmod, "PathCchStripPrefix"); + pPathCchStripToRoot = (void *)GetProcAddress(hmod, "PathCchStripToRoot"); pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); test_PathCchCombineEx(); @@ -928,5 +1055,6 @@ START_TEST(path) test_PathCchRenameExtension(); test_PathCchSkipRoot(); test_PathCchStripPrefix(); + test_PathCchStripToRoot(); test_PathIsUNCEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 42bae4edd0..56920b3444 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -34,4 +34,5 @@ HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); +HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size); BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); -- 2.19.1

1 0

[PATCH 3/5] kernelbase: Implement PathCchSkipRoot.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 110 +++++++++++++++ dlls/kernelbase/tests/path.c | 128 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 241 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 53f7b987ca..e07fe02a51 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -16,7 +16,7 @@ @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension -@ stub PathCchSkipRoot +@ stdcall PathCchSkipRoot(wstr ptr) kernelbase.PathCchSkipRoot @ stdcall PathCchStripPrefix(wstr long) kernelbase.PathCchStripPrefix @ stub PathCchStripToRoot @ stdcall PathIsUNCEx(wstr ptr) kernelbase.PathIsUNCEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8f4136eb6b..eae67be147 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1045,7 +1045,7 @@ @ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) -# @ stub PathCchSkipRoot +@ stdcall PathCchSkipRoot(wstr ptr) @ stdcall PathCchStripPrefix(wstr long) # @ stub PathCchStripToRoot @ stdcall PathCombineA(ptr str str) shlwapi.PathCombineA diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 366efa41e1..168edd0610 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -50,6 +50,84 @@ static BOOL is_prefixed_disk(const WCHAR *string) return !memcmp(string, prefix, sizeof(prefix)) && isalphaW(string[4]) && string[5] == ':'; } +static BOOL is_prefixed_volume(const WCHAR *string) +{ + static const WCHAR prefixed_volume[] = {'\\', '\\', '?', '\\', 'V', 'o', 'l', 'u', 'm', 'e'}; + const WCHAR *guid; + INT ret; + INT i = 0; + + ret = memicmpW(string, prefixed_volume, ARRAY_SIZE(prefixed_volume)); + if (ret) return FALSE; + + guid = string + ARRAY_SIZE(prefixed_volume); + + while (i <= 37) + { + switch (i) + { + case 0: + if (guid[i] != '{') return FALSE; + break; + case 9: + case 14: + case 19: + case 24: + if (guid[i] != '-') return FALSE; + break; + case 37: + if (guid[i] != '}') return FALSE; + break; + default: + if (!isalnumW(guid[i])) return FALSE; + break; + } + i++; + } + + return TRUE; +} + +/* Get the next character beyond end of the segment. + Return TRUE if the last segment ends with a backslash */ +static BOOL get_next_segment(const WCHAR *next, const WCHAR **next_segment) +{ + while (*next && *next != '\\') next++; + if (*next == '\\') + { + *next_segment = next + 1; + return TRUE; + } + else + { + *next_segment = next; + return FALSE; + } +} + +/* Find the last character of the root in a path, if there is one, without any segments */ +static const WCHAR *get_root_end(const WCHAR *path) +{ + /* Find path root */ + if (is_prefixed_volume(path)) + return path[48] == '\\' ? path + 48 : path + 47; + else if (is_prefixed_unc(path)) + return path + 7; + else if (is_prefixed_disk(path)) + return path[6] == '\\' ? path + 6 : path + 5; + /* \\ */ + else if (path[0] == '\\' && path[1] == '\\') + return path + 1; + /* \ */ + else if (path[0] == '\\') + return path; + /* X:\ */ + else if (isalphaW(path[0]) && path[1] == ':') + return path[2] == '\\' ? path + 2 : path + 1; + else + return NULL; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); @@ -196,6 +274,38 @@ HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *ext return FAILED(hr) ? hr : S_OK; } +HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end) +{ + static const WCHAR unc_prefix[] = {'\\', '\\', '?'}; + + TRACE("%s %p\n", debugstr_w(path), root_end); + + if (!path || !path[0] || !root_end + || (!memicmpW(unc_prefix, path, ARRAY_SIZE(unc_prefix)) && !is_prefixed_volume(path) && !is_prefixed_unc(path) + && !is_prefixed_disk(path))) + return E_INVALIDARG; + + *root_end = get_root_end(path); + if (*root_end) + { + (*root_end)++; + if (is_prefixed_unc(path)) + { + get_next_segment(*root_end, root_end); + get_next_segment(*root_end, root_end); + } + else if (path[0] == '\\' && path[1] == '\\' && path[2] != '?') + { + /* Skip share server */ + get_next_segment(*root_end, root_end); + /* If mount point is empty, don't skip over mount point */ + if (**root_end != '\\') get_next_segment(*root_end, root_end); + } + } + + return *root_end ? S_OK : E_INVALIDARG; +} + HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size) { TRACE("%s %lu\n", wine_dbgstr_w(path), size); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index af15e83d60..f54e77be46 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -37,6 +37,7 @@ HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchSkipRoot)(const WCHAR *path, const WCHAR **root_end); HRESULT (WINAPI *pPathCchStripPrefix)(WCHAR *path, SIZE_T size); BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); @@ -634,6 +635,131 @@ static void test_PathCchRenameExtension(void) } } +struct skiproot_test +{ + const char *path; + int root_offset; + HRESULT hr; +}; + +static const struct skiproot_test skiproot_tests [] = +{ + /* Basic combination */ + {"", 0, E_INVALIDARG}, + {"C:\\", 3, S_OK}, + {"\\", 1, S_OK}, + {"\\\\.\\", 4, S_OK}, + {"\\\\?\\UNC\\", 8, S_OK}, + {"\\\\?\\C:\\", 7, S_OK}, + + /* Basic + \ */ + {"C:\\\\", 3, S_OK}, + {"\\\\", 2, S_OK}, + {"\\\\.\\\\", 4, S_OK}, + {"\\\\?\\UNC\\\\", 9, S_OK}, + {"\\\\?\\C:\\\\", 7, S_OK}, + + /* Basic + a */ + {"a", 0, E_INVALIDARG}, + {"C:\\a", 3, S_OK}, + {"\\a", 1, S_OK}, + {"\\\\.\\a", 5, S_OK}, + {"\\\\?\\UNC\\a", 9, S_OK}, + + /* Basic + \a */ + {"\\a", 1, S_OK}, + {"C:\\\\a", 3, S_OK}, + {"\\\\a", 3, S_OK}, + {"\\\\.\\\\a", 4, S_OK}, + {"\\\\?\\UNC\\\\a", 10, S_OK}, + {"\\\\?\\C:\\\\a", 7, S_OK}, + + /* Basic + a\ */ + {"a\\", 0, E_INVALIDARG}, + {"C:\\a\\", 3, S_OK}, + {"\\a\\", 1, S_OK}, + {"\\\\.\\a\\", 6, S_OK}, + {"\\\\?\\UNC\\a\\", 10, S_OK}, + {"\\\\?\\C:\\a\\", 7, S_OK}, + + /* Network share */ + {"\\\\\\\\", 3, S_OK}, + {"\\\\a\\", 4, S_OK}, + {"\\\\a\\b", 5, S_OK}, + {"\\\\a\\b\\", 6, S_OK}, + {"\\\\a\\b\\\\", 6, S_OK}, + {"\\\\a\\b\\\\c", 6, S_OK}, + {"\\\\a\\b\\c", 6, S_OK}, + {"\\\\a\\b\\c\\", 6, S_OK}, + {"\\\\a\\b\\c\\d", 6, S_OK}, + {"\\\\a\\\\b\\c\\", 4, S_OK}, + {"\\\\aa\\bb\\cc\\", 8, S_OK}, + + /* UNC */ + {"\\\\?\\UNC\\\\", 9, S_OK}, + {"\\\\?\\UNC\\a\\b", 11, S_OK}, + {"\\\\?\\UNC\\a\\b", 11, S_OK}, + {"\\\\?\\UNC\\a\\b\\", 12, S_OK}, + {"\\\\?\\UNC\\a\\b\\c", 12, S_OK}, + {"\\\\?\\UNC\\a\\b\\c\\", 12, S_OK}, + {"\\\\?\\UNC\\a\\b\\c\\d", 12, S_OK}, + {"\\\\?\\C:", 6, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", 48, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 49, S_OK}, + {"\\\\?\\unc\\a\\b", 11, S_OK}, + {"\\\\?\\volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 49, S_OK}, + {"\\\\?\\volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", 49, S_OK}, + + /* Malformed */ + {"C:", 2, S_OK}, + {":", 0, E_INVALIDARG}, + {":\\", 0, E_INVALIDARG}, + {"C\\", 0, E_INVALIDARG}, + {"\\?", 1, S_OK}, + {"\\?\\UNC", 1, S_OK}, + {"\\\\?\\", 0, E_INVALIDARG}, + {"\\\\?\\UNC", 0, E_INVALIDARG}, + {"\\\\?\\::\\", 0, E_INVALIDARG}, + {"\\\\?\\Volume", 0, E_INVALIDARG}, + {"\\.", 1, S_OK}, + {"\\\\..", 4, S_OK}, + {"\\\\..a", 5, S_OK} +}; + +static void test_PathCchSkipRoot(void) +{ + WCHAR pathW[MAX_PATH]; + const WCHAR *root_end; + HRESULT hr; + INT i; + + if (!pPathCchSkipRoot) + { + win_skip("PathCchSkipRoot() is not available.\n"); + return; + } + + root_end = (const WCHAR *)0xdeadbeef; + hr = pPathCchSkipRoot(NULL, &root_end); + ok(hr == E_INVALIDARG, "Expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(root_end == (const WCHAR *)0xdeadbeef, "Expect root_end 0xdeadbeef, got %p\n", root_end); + + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchSkipRoot(pathW, NULL); + ok(hr == E_INVALIDARG, "Expect result %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(skiproot_tests); i++) + { + const struct skiproot_test *t = skiproot_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchSkipRoot(pathW, &root_end); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + ok(root_end - pathW == t->root_offset, "path %s expect root offset %d, got %d\n", t->path, t->root_offset, + root_end - pathW); + } +} + struct stripprefix_test { const CHAR *path; @@ -789,6 +915,7 @@ START_TEST(path) pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); + pPathCchSkipRoot = (void *)GetProcAddress(hmod, "PathCchSkipRoot"); pPathCchStripPrefix = (void *)GetProcAddress(hmod, "PathCchStripPrefix"); pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); @@ -799,6 +926,7 @@ START_TEST(path) test_PathCchFindExtension(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); + test_PathCchSkipRoot(); test_PathCchStripPrefix(); test_PathIsUNCEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 1ff9e24648..42bae4edd0 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -32,5 +32,6 @@ HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, con HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); -- 2.19.1

1 0

[PATCH 2/5] kernelbase: Implement PathCchStripPrefix.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 30 +++++++ dlls/kernelbase/tests/path.c | 78 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index d874f8c802..53f7b987ca 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -17,6 +17,6 @@ @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension @ stub PathCchSkipRoot -@ stub PathCchStripPrefix +@ stdcall PathCchStripPrefix(wstr long) kernelbase.PathCchStripPrefix @ stub PathCchStripToRoot @ stdcall PathIsUNCEx(wstr ptr) kernelbase.PathIsUNCEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b3b28872af..8f4136eb6b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1046,7 +1046,7 @@ # @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) # @ stub PathCchSkipRoot -# @ stub PathCchStripPrefix +@ stdcall PathCchStripPrefix(wstr long) # @ stub PathCchStripToRoot @ stdcall PathCombineA(ptr str str) shlwapi.PathCombineA @ stdcall PathCombineW(ptr wstr wstr) shlwapi.PathCombineW diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 5f11e11962..366efa41e1 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -44,6 +44,12 @@ static BOOL is_prefixed_unc(const WCHAR *string) return !memicmpW(string, prefixed_unc, ARRAY_SIZE(prefixed_unc)); } +static BOOL is_prefixed_disk(const WCHAR *string) +{ + static const WCHAR prefix[] = {'\\', '\\', '?', '\\'}; + return !memcmp(string, prefix, sizeof(prefix)) && isalphaW(string[4]) && string[5] == ':'; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); @@ -190,6 +196,30 @@ HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *ext return FAILED(hr) ? hr : S_OK; } +HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size) +{ + TRACE("%s %lu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + if (is_prefixed_unc(path)) + { + /* \\?\UNC\a -> \\a */ + if (size < strlenW(path + 8) + 3) return E_INVALIDARG; + strcpyW(path + 2, path + 8); + return S_OK; + } + else if (is_prefixed_disk(path)) + { + /* \\?\C:\ -> C:\ */ + if (size < strlenW(path + 4) + 1) return E_INVALIDARG; + strcpyW(path, path + 4); + return S_OK; + } + else + return S_FALSE; +} + BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) { const WCHAR *result = NULL; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 8bd23191b0..af15e83d60 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -37,6 +37,7 @@ HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchStripPrefix)(WCHAR *path, SIZE_T size); BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); static const struct @@ -633,6 +634,81 @@ static void test_PathCchRenameExtension(void) } } +struct stripprefix_test +{ + const CHAR *path; + const CHAR *stripped_path; + HRESULT hr; + SIZE_T size; +}; + +static const struct stripprefix_test stripprefix_tests[] = +{ + {"\\\\?\\UNC\\", "\\\\", S_OK}, + {"\\\\?\\UNC\\a", "\\\\a", S_OK}, + {"\\\\?\\C:", "C:", S_OK}, + {"\\\\?\\C:\\", "C:\\", S_OK}, + {"\\\\?\\C:\\a", "C:\\a", S_OK}, + {"\\\\?\\unc\\", "\\\\", S_OK}, + {"\\\\?\\c:\\", "c:\\", S_OK}, + + {"\\", "\\", S_FALSE}, + {"\\\\", "\\\\", S_FALSE}, + {"\\\\a", "\\\\a", S_FALSE}, + {"\\\\a\\", "\\\\a\\", S_FALSE}, + {"\\\\?\\a", "\\\\?\\a", S_FALSE}, + {"\\\\?\\UNC", "\\\\?\\UNC", S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_FALSE}, + + /* Size Tests */ + {"C:\\", NULL, E_INVALIDARG, PATHCCH_MAX_CCH + 1}, + {"C:\\", "C:\\", S_FALSE, PATHCCH_MAX_CCH}, + /* Size < original path actual length + 1, read beyond size */ + {"\\\\?\\C:\\", "C:\\", S_OK, ARRAY_SIZE("\\\\?\\C:\\") - 1}, + /* Size < stripped path length + 1 */ + {"\\\\?\\C:\\", NULL, E_INVALIDARG, ARRAY_SIZE("C:\\") - 1}, + {"\\\\?\\UNC\\", NULL, E_INVALIDARG, ARRAY_SIZE("\\\\") - 1} +}; + +static void test_PathCchStripPrefix(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1] = {0}; + CHAR stripped_pathA[PATHCCH_MAX_CCH]; + SIZE_T size; + HRESULT hr; + INT i; + + if (!pPathCchStripPrefix) + { + win_skip("PathCchStripPrefix(() is not available.\n"); + return; + } + + /* Null arguments */ + hr = pPathCchStripPrefix(NULL, PATHCCH_MAX_CCH); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchStripPrefix(pathW, 0); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(stripprefix_tests); i++) + { + const struct stripprefix_test *t = stripprefix_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + size = t->size ? t->size : PATHCCH_MAX_CCH; + hr = pPathCchStripPrefix(pathW, size); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, stripped_pathA, ARRAY_SIZE(stripped_pathA), NULL, NULL); + ok(!lstrcmpA(stripped_pathA, t->stripped_path), "path %s expect stripped path %s, got %s\n", t->path, + t->stripped_path, stripped_pathA); + } + } +} + struct isuncex_test { const CHAR *path; @@ -713,6 +789,7 @@ START_TEST(path) pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); + pPathCchStripPrefix = (void *)GetProcAddress(hmod, "PathCchStripPrefix"); pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); test_PathCchCombineEx(); @@ -722,5 +799,6 @@ START_TEST(path) test_PathCchFindExtension(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); + test_PathCchStripPrefix(); test_PathIsUNCEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 6973d6dda2..1ff9e24648 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -32,4 +32,5 @@ HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, con HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); -- 2.19.1

1 0

[PATCH 1/5] kernelbase: Implement PathIsUNCEx.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 21 ++++++ dlls/kernelbase/tests/path.c | 72 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 0524e7c304..d874f8c802 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -19,4 +19,4 @@ @ stub PathCchSkipRoot @ stub PathCchStripPrefix @ stub PathCchStripToRoot -@ stub PathIsUNCEx +@ stdcall PathIsUNCEx(wstr ptr) kernelbase.PathIsUNCEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 286dae0001..b3b28872af 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1082,7 +1082,7 @@ @ stdcall PathIsSameRootA(str str) shlwapi.PathIsSameRootA @ stdcall PathIsSameRootW(wstr wstr) shlwapi.PathIsSameRootW @ stdcall PathIsUNCA(str) shlwapi.PathIsUNCA -# @ stub PathIsUNCEx +@ stdcall PathIsUNCEx(wstr ptr) @ stdcall PathIsUNCServerA(str) shlwapi.PathIsUNCServerA @ stdcall PathIsUNCServerShareA(str) shlwapi.PathIsUNCServerShareA @ stdcall PathIsUNCServerShareW(wstr) shlwapi.PathIsUNCServerShareW diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 047017eb47..5f11e11962 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -38,6 +38,12 @@ static SIZE_T strnlenW(const WCHAR *string, SIZE_T maxlen) return i; } +static BOOL is_prefixed_unc(const WCHAR *string) +{ + static const WCHAR prefixed_unc[] = {'\\', '\\', '?', '\\', 'U', 'N', 'C', '\\'}; + return !memicmpW(string, prefixed_unc, ARRAY_SIZE(prefixed_unc)); +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); @@ -183,3 +189,18 @@ HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *ext hr = PathCchAddExtension(path, size, extension); return FAILED(hr) ? hr : S_OK; } + +BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) +{ + const WCHAR *result = NULL; + + TRACE("%s %p\n", wine_dbgstr_w(path), server); + + if (is_prefixed_unc(path)) + result = path + 8; + else if (path[0] == '\\' && path[1] == '\\' && path[2] != '?') + result = path + 2; + + if (server) *server = result; + return result ? TRUE : FALSE; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 1d6f44ee76..8bd23191b0 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -37,6 +37,7 @@ HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); static const struct { @@ -632,6 +633,75 @@ static void test_PathCchRenameExtension(void) } } +struct isuncex_test +{ + const CHAR *path; + INT server_offset; + BOOL ret; +}; + +static const struct isuncex_test isuncex_tests[] = +{ + {"\\\\", 2, TRUE}, + {"\\\\a\\", 2, TRUE}, + {"\\\\.\\", 2, TRUE}, + {"\\\\?\\UNC\\", 8, TRUE}, + {"\\\\?\\UNC\\a", 8, TRUE}, + {"\\\\?\\unc\\", 8, TRUE}, + {"\\\\?\\unc\\a", 8, TRUE}, + + {"", 0, FALSE}, + {"\\", 0, FALSE}, + {"C:\\", 0, FALSE}, + {"\\??\\", 0, FALSE}, + {"\\\\?\\", 0, FALSE}, + {"\\\\?\\UNC", 0, FALSE}, + {"\\\\?\\C:", 0, FALSE}, + {"\\\\?\\C:\\", 0, FALSE}, + {"\\\\?\\C:\\a", 0, FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 0, FALSE} +}; + +static void test_PathIsUNCEx(void) +{ + WCHAR pathW[MAX_PATH]; + const WCHAR *server; + BOOL ret; + INT i; + + if (!pPathIsUNCEx) + { + win_skip("PathIsUNCEx(() is not available.\n"); + return; + } + + /* No NULL check for path pointers on Windows */ + if (0) + { + ret = pPathIsUNCEx(NULL, &server); + ok(ret == FALSE, "expect FALSE\n"); + } + + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, pathW, ARRAY_SIZE(pathW)); + ret = pPathIsUNCEx(pathW, NULL); + ok(ret == FALSE, "expect FALSE\n"); + + for (i = 0; i < ARRAY_SIZE(isuncex_tests); i++) + { + const struct isuncex_test *t = isuncex_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + server = (const WCHAR *)0xdeadbeef; + ret = pPathIsUNCEx(pathW, &server); + ok(ret == t->ret, "path \"%s\" expect return %d, got %d\n", t->path, t->ret, ret); + if (ret) + ok(server == pathW + t->server_offset, "path \"%s\" expect server offset %d, got %d\n", t->path, + t->server_offset, server - pathW); + else + ok(!server, "expect server is null, got %p\n", server); + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -643,6 +713,7 @@ START_TEST(path) pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); + pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); test_PathCchCombineEx(); test_PathCchAddBackslash(); @@ -651,4 +722,5 @@ START_TEST(path) test_PathCchFindExtension(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); + test_PathIsUNCEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 3057b6c1ec..6973d6dda2 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -32,3 +32,4 @@ HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, con HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); -- 2.19.1

1 0

[PATCH 1/3] setupapi/tests: Remove workarounds in testCreateDeviceInterface().
by Zebediah Figura 22 Nov '18

22 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 132 +++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 71 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 888b247d6d..86af09d31e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -603,87 +603,77 @@ todo_wine devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } -static void testCreateDeviceInterface(void) +static void test_device_iface(void) { + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + DWORD i; - if (!pSetupDiCreateDeviceInterfaceA || !pSetupDiEnumDeviceInterfaces) - { - win_skip("SetupDiCreateDeviceInterfaceA and/or SetupDiEnumDeviceInterfaces are not available\n"); - return; - } SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(NULL, NULL, NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(NULL, NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(NULL, NULL, &guid, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - set = pSetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); - if (set) - { - SP_DEVINFO_DATA devInfo = { 0 }; - SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), - { 0 } }; - DWORD i; + ret = SetupDiCreateDeviceInterfaceA(NULL, NULL, &guid, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(set, NULL, NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, NULL, NULL, 0, - NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - devInfo.cbSize = sizeof(devInfo); - ret = pSetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, - NULL, NULL, 0, &devInfo); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, NULL, NULL, 0, - NULL); - ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, - "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0, - NULL); - ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); - /* Creating the same interface a second time succeeds */ - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0, - NULL); - ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, "Oogah", 0, - NULL); - ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); - ret = pSetupDiEnumDeviceInterfaces(set, &devInfo, &guid, 0, - &interfaceData); - ok(ret, "SetupDiEnumDeviceInterfaces failed: %d\n", GetLastError()); - i = 0; - while (pSetupDiEnumDeviceInterfaces(set, &devInfo, &guid, i, - &interfaceData)) - i++; - ok(i == 2, "expected 2 interfaces, got %d\n", i); - ok(GetLastError() == ERROR_NO_MORE_ITEMS, - "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); - - for (i = 0; i < 2; i++) - { - ret = pSetupDiEnumDeviceInterfaces(set, &devInfo, &guid, i, &interfaceData); - ok(ret, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); - ret = pSetupDiRemoveDeviceInterface(set, &interfaceData); - todo_wine ok(ret, "SetupDiRemoveDeviceInterface failed: %08x\n", GetLastError()); - } + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInterfaceA(set, NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - ret = pSetupDiRemoveDevice(set, &devInfo); - todo_wine ok(ret, "got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInterfaceA(set, &device, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + device.cbSize = sizeof(device); + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInterfaceA(set, &device, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); - ret = pSetupDiDestroyDeviceInfoList(set); - ok(ret, "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); + /* Creating the same interface a second time succeeds */ + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "Oogah", 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 0, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + + i = 0; + while (SetupDiEnumDeviceInterfaces(set, &device, &guid, i, &iface)) + i++; + ok(i == 2, "expected 2 interfaces, got %d\n", i); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + + for (i = 0; i < 2; i++) + { + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, i, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + + ret = SetupDiRemoveDeviceInterface(set, &iface); +todo_wine + ok(ret, "Failed to remove interface, error %#x.\n", GetLastError()); } + + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } static void testGetDeviceInterfaceDetail(void) @@ -1538,7 +1528,7 @@ START_TEST(devinst) test_device_info(); test_get_device_instance_id(); test_register_device_info(); - testCreateDeviceInterface(); + test_device_iface(); testGetDeviceInterfaceDetail(); testDevRegKey(); testRegisterAndGetDetail(); -- 2.14.1

1 2

[PATCH] user32: Attempt to set scroll info in SetScrollPos even if SCROLL_GetInternalInfo fails.
by Jacek Caban 22 Nov '18

22 Nov '18

SetScrollPos may be called on non-scroll window and we should send SBM_SETSCROLLINFO. This fixes scrollbars in Visio. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/scroll.c | 5 ++--- dlls/user32/tests/scroll.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-)

3 2

[PATCH] winebus: Don't override real VID/PID for controllers
by Brendan McGrath 21 Nov '18

21 Nov '18

From: Andrew Eikum <aeikum(a)codeweavers.com> It's unclear what this was useful for, possibly native xinput requires it. Our built-in xinput is good enough now, though, so let's keep the real VID/PID. This lets applications match setupapi devices with dinput devices, see: "XInput and DirectInput" https://docs.microsoft.com/en-us/windows/desktop/xinput/xinput-and-directin… Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- This is the patch from Proton that removed the VID/PID override for controllers. If there is demand for the overrides - I can always add the registry hacks in a later commit (but with the improved XInput functionality I don't expect there to be). I wasn't sure if you needed my Signed-off tag but I added it just in case. dlls/winebus.sys/bus_sdl.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6b2b28e8c90..a17f11e0457 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -818,25 +818,17 @@ static void try_add_device(SDL_JoystickID index) controller = pSDL_GameControllerOpen(index); id = pSDL_JoystickInstanceID(joystick); - if (controller) - { - vid = VID_MICROSOFT; - pid = PID_XBOX_CONTROLLERS[3]; - version = 0x01; + + if (pSDL_JoystickGetProductVersion != NULL) { + vid = pSDL_JoystickGetVendor(joystick); + pid = pSDL_JoystickGetProduct(joystick); + version = pSDL_JoystickGetProductVersion(joystick); } else { - if (pSDL_JoystickGetProductVersion != NULL) { - vid = pSDL_JoystickGetVendor(joystick); - pid = pSDL_JoystickGetProduct(joystick); - version = pSDL_JoystickGetProductVersion(joystick); - } - else - { - vid = 0x01; - pid = pSDL_JoystickInstanceID(joystick) + 1; - version = 0; - } + vid = 0x01; + pid = pSDL_JoystickInstanceID(joystick) + 1; + version = 0; } guid = pSDL_JoystickGetGUID(joystick); -- 2.17.1

1 0

[PATCH v2] winebus.sys: Allow XBOX Masquerade to be turned off
by Brendan McGrath 21 Nov '18

21 Nov '18

Elite Dangerous appears to iterate input devices via DInput and will only defer to XInput if there is a HID device with a matching VID and PID. The current behaviour of the SDLBUS is to masquerade any controller as an XBOX controller. This causes Elite Dangerous to treat any other type of contoller as a Joystick. This patch allows this masquerading behaviour to be switched off via two REG_DWORD registry entries under HKLM\System\CurrentControlSet\Services\SDLJOY: - 'Controller VID' - 'Controller PID' 0 - Turns it off (so it uses the real VID and PID) Any other value will define the value used in the masquerade. If the values are missing, the default behaviour is to leave it as is (i.e an XBOX controller). Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Changes since v2: - allow VID and PID to be defined (as well as switched off) - use the existing SDLJOY registry entry I'm using a Logitech F310 gamepad. SDL recognises it as a controller but Elite Dangerous ignores it (due to the masquerade). At the moment, if 'Map Controllers' is set to '1' - the VID and PID is hard-coded to be an XBOX controller (I'm not familiar with the history to understand why that is - but I suspect for better game support). So I would say the device is able to be programmatically recognised by using the the SDL_IsGameController API. But this is currently only used when 'Map Controllers' is set to '1' and thus the real VID and PID values are lost (note that Proton does not have this masquerade thus the controller is working). When I set 'Map Controllers' to '0' - the correct VID and PID are added, but not as a gamepad (it uses an 'IM' entry instead of 'IG'). So again Elite Dangerous ignores the entry. This is because my controller reports 11 buttons where as the code expects a gamepad to report 14 or more. I changed it to look for 10 and a hat and this worked - but the mapping was all wrong. This is an approach I could explore further - but I feel the SDL_IsGameController approach is already working - but for the masquerade. dlls/winebus.sys/bus_sdl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6b2b28e8c90..86e652faa14 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -84,6 +84,8 @@ static DRIVER_OBJECT *sdl_driver_obj = NULL; static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; static DWORD map_controllers = 0; +static DWORD controller_vid = 0; +static DWORD controller_pid = 0; #include "initguid.h" DEFINE_GUID(GUID_DEVCLASS_SDL, 0x463d60b5,0x802b,0x4bb2,0x8f,0xdb,0x7d,0xa9,0xb9,0x96,0x04,0xd8); @@ -820,9 +822,9 @@ static void try_add_device(SDL_JoystickID index) id = pSDL_JoystickInstanceID(joystick); if (controller) { - vid = VID_MICROSOFT; - pid = PID_XBOX_CONTROLLERS[3]; - version = 0x01; + vid = (controller_vid) ? controller_vid : pSDL_JoystickGetVendor(joystick); + pid = (controller_pid) ? controller_pid : pSDL_JoystickGetProduct(joystick); + version = (controller_vid || controller_pid) ? 0x01 : pSDL_JoystickGetProductVersion(joystick); } else { @@ -935,7 +937,11 @@ void sdl_driver_unload( void ) NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; + static const WCHAR controller_vid_valueW[] = {'C','o','n','t','r','o','l','l','e','r',' ','V','I','D',0}; + static const WCHAR controller_pid_valueW[] = {'C','o','n','t','r','o','l','l','e','r',' ','P','I','D',0}; static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; + static const UNICODE_STRING controller_vid_value = {sizeof(controller_vid_valueW) - sizeof(WCHAR), sizeof(controller_vid_valueW), (WCHAR*)controller_vid_valueW}; + static const UNICODE_STRING controller_pid_value = {sizeof(controller_pid_valueW) - sizeof(WCHAR), sizeof(controller_pid_valueW), (WCHAR*)controller_pid_valueW}; HANDLE events[2]; DWORD result; @@ -993,6 +999,8 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = hid_internal_dispatch; map_controllers = check_bus_option(registry_path, &controller_mode, 1); + controller_vid = check_bus_option(registry_path, &controller_vid_value, VID_MICROSOFT); + controller_pid = check_bus_option(registry_path, &controller_pid_value, PID_XBOX_CONTROLLERS[3]); if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) goto error; -- 2.17.1

4 8

[PATCH v3] ws2_32: Return WSAEAFNOSUPPORT when ip4/6 disabled
by Brendan McGrath 21 Nov '18

21 Nov '18

Currently, when IPv6 is disabled by the kernel, attempting to use the 'WebRequest' API with .NET native causes a crash. This can be recreated using the following gist: https://gist.github.com/redmcg/7d81ef833c77bee6965b5f441006f697 This patch fixes the crash by returning WSAEAFNOSUPPORT, as expected by .NET. See: https://referencesource.microsoft.com/#System/net/System/Net/Sockets/Socket… Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Changes since v2: - Add the 'Signed-off-by' tag dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe8527..956ead2e9d5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7646,6 +7646,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, /* invalid combination of valid parameters, like SOCK_STREAM + IPPROTO_UDP */ if (err == WSAEINVAL) err = WSAESOCKTNOSUPPORT; + else if (err == WSAEOPNOTSUPP && (unixaf == AF_INET || unixaf == AF_INET6)) + err = WSAEAFNOSUPPORT; else if (err == WSAEOPNOTSUPP) err = WSAEPROTONOSUPPORT; } -- 2.17.1

2 7

[PATCH v4 01/11] comctl32/tests: Confirm that emptying the listbox sends a LB_RESETCONTENT to itself
by Gabriel Ivăncescu 21 Nov '18

21 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/tests/listbox.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 43da3ca..d457b13 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -110,6 +110,15 @@ static HWND create_listbox(DWORD add_style, HWND parent) return handle; } +static UINT lb_resetcontent_count; +static WNDPROC lb_test_subclass_proc_prev; +static LRESULT WINAPI lb_test_subclass_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == LB_RESETCONTENT) lb_resetcontent_count++; + + return CallWindowProcW(lb_test_subclass_proc_prev, hwnd, msg, wParam, lParam); +} + struct listbox_prop { DWORD add_style; @@ -227,6 +236,17 @@ static void run_test(DWORD style, const struct listbox_test test) res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); ok(res == 4, "Expected 4 items, got %d\n", res); + /* Confirm that emptying the listbox sends a LB_RESETCONTENT to itself */ + lb_test_subclass_proc_prev = (WNDPROC)SetWindowLongPtrW(hLB, GWLP_WNDPROC, (LONG_PTR)lb_test_subclass_proc); + + lb_resetcontent_count = 0; + for (i = 4; i--;) + { + res = SendMessageA(hLB, LB_DELETESTRING, 0, 0); + ok(res == i, "Expected %d items, got %d\n", i, res); + } + ok(lb_resetcontent_count == 1, "Expected 1 LB_RESETCONTENT message, got %u\n", lb_resetcontent_count); + DestroyWindow(hLB); } @@ -1798,6 +1818,14 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + /* Confirm that emptying the listbox sends a LB_RESETCONTENT to itself */ + lb_test_subclass_proc_prev = (WNDPROC)SetWindowLongPtrW(listbox, GWLP_WNDPROC, (LONG_PTR)lb_test_subclass_proc); + + lb_resetcontent_count = 0; + ret = SendMessageA(listbox, LB_SETCOUNT, 0, 0); + ok(ret == 0, "got %d\n", ret); + ok(lb_resetcontent_count == 1, "Expected 1 LB_RESETCONTENT message, got %u\n", lb_resetcontent_count); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i) -- 2.19.1

1 10

[v3 PATCH 1/4] gdi32/tests: Run memory resource font test in a child process.
by Nikolay Sivov 21 Nov '18

21 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4f10e2f38d..dfb2f8e224 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <assert.h> #include "windef.h" @@ -6859,8 +6860,25 @@ static void test_long_names(void) START_TEST(font) { + static const char *test_names[] = + { + "AddFontMemResource", + }; + char path_name[MAX_PATH]; + STARTUPINFOA startup; + char **argv; + int argc, i; + init(); + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + if (!strcmp(argv[2], "AddFontMemResource")) + test_AddFontMemResource(); + return; + } + test_stock_fonts(); test_logfont(); test_bitmap_font(); @@ -6879,7 +6897,6 @@ START_TEST(font) test_nonexistent_font(); test_orientation(); test_height_selection(); - test_AddFontMemResource(); test_EnumFonts(); test_EnumFonts_subst(); @@ -6928,4 +6945,19 @@ START_TEST(font) */ test_vertical_font(); test_CreateScalableFontResource(); + + winetest_get_mainargs( &argv ); + for (i = 0; i < ARRAY_SIZE(test_names); ++i) + { + PROCESS_INFORMATION info; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s font %s", argv[0], test_names[i]); + ok(CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n"); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } } -- 2.19.1

2 7

[PATCH 4/4] d3d11/tests: Add test for SO statistics with multiple vertex streams.
by Józef Kucia 21 Nov '18

21 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 186 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2f81a2c84ad1..5e0a3fed7155 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5801,13 +5801,94 @@ static void test_so_statistics_query(void) struct d3d11_test_context test_context; D3D11_QUERY_DATA_SO_STATISTICS data; ID3D11DeviceContext *context; + unsigned int vertex_count[4]; D3D11_QUERY_DESC query_desc; + ID3D11Buffer *so_buffer[4]; ID3D11Asynchronous *query; + ID3D11GeometryShader *gs; + ID3D11VertexShader *vs; unsigned int data_size; ID3D11Device *device; + ID3D11Buffer *cb; unsigned int i; HRESULT hr; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD vs_code[] = + { +#if 0 + float4 main(uint id : SV_VertexID) : custom + { + return (float4)id; + } +#endif + 0x43425844, 0x8b0e47b9, 0x6efc9512, 0xd55ca6ff, 0x487c5ef2, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000090, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, + 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x74737563, 0xab006d6f, 0x52444853, 0x0000003c, 0x00010040, 0x0000000f, + 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x03000065, 0x001020f2, 0x00000000, 0x05000056, + 0x001020f2, 0x00000000, 0x00101006, 0x00000000, 0x0100003e, + }; + static const DWORD gs_code[] = + { +#if 0 + struct vertex + { + float4 data : custom; + }; + + uint4 vertex_count; + + [maxvertexcount(32)] + void main(point vertex input[1], uint id : SV_PrimitiveID, + inout PointStream<vertex> output0, + inout PointStream<vertex> output1, + inout PointStream<vertex> output2, + inout PointStream<vertex> output3) + { + if (id < vertex_count.x) + output0.Append(input[0]); + if (id < vertex_count.y) + output1.Append(input[0]); + if (id < vertex_count.z) + output2.Append(input[0]); + if (id < vertex_count.w) + output3.Append(input[0]); + } +#endif + 0x43425844, 0xd616829d, 0x4355ce2a, 0xd71909e5, 0xdc916d4c, 0x00000001, 0x000002bc, 0x00000003, + 0x0000002c, 0x00000084, 0x0000010c, 0x4e475349, 0x00000050, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x0000003f, 0x00000000, 0x00000007, + 0x00000001, 0xffffffff, 0x00000101, 0x74737563, 0x53006d6f, 0x72505f56, 0x74696d69, 0x49657669, + 0xabab0044, 0x3547534f, 0x00000080, 0x00000004, 0x00000008, 0x00000000, 0x00000078, 0x00000000, + 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000001, 0x00000078, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x00000002, 0x00000078, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000003, 0x00000078, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x74737563, 0xab006d6f, 0x58454853, 0x000001a8, 0x00020050, 0x0000006a, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, + 0x0200005f, 0x0000b000, 0x02000068, 0x00000001, 0x0100085d, 0x0300008f, 0x00110000, 0x00000000, + 0x0100085c, 0x03000065, 0x001020f2, 0x00000000, 0x0300008f, 0x00110000, 0x00000001, 0x0100085c, + 0x03000065, 0x001020f2, 0x00000000, 0x0300008f, 0x00110000, 0x00000002, 0x0100085c, 0x03000065, + 0x001020f2, 0x00000000, 0x0300008f, 0x00110000, 0x00000003, 0x0100085c, 0x03000065, 0x001020f2, + 0x00000000, 0x0200005e, 0x00000020, 0x0700004f, 0x001000f2, 0x00000000, 0x0000b001, 0x00208e46, + 0x00000000, 0x00000000, 0x0304001f, 0x0010000a, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x01000015, 0x0304001f, + 0x0010001a, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, + 0x03000075, 0x00110000, 0x00000001, 0x01000015, 0x0304001f, 0x0010002a, 0x00000000, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000002, + 0x01000015, 0x0304001f, 0x0010003a, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, + 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000003, 0x01000015, 0x0100003e, + }; + static const D3D11_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "custom", 0, 0, 4, 0}, + {1, "custom", 0, 0, 4, 1}, + {2, "custom", 0, 0, 4, 2}, + {3, "custom", 0, 0, 4, 3}, + }; + static const unsigned int offset[4] = {0}; + static const struct { D3D11_QUERY query; @@ -5883,6 +5964,111 @@ static void test_so_statistics_query(void) ID3D11Asynchronous_Release(query); } + if (ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_11_0) + { + skip("Vertex streams are not supported.\n"); + goto done; + } + + /* multiple vertex streams */ + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(hr == S_OK, "Failed to create vertex shader, hr %#x.\n", hr); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + + hr = ID3D11Device_CreateGeometryShaderWithStreamOutput(device, gs_code, sizeof(gs_code), + so_declaration, ARRAY_SIZE(so_declaration), + NULL, 0, D3D11_SO_NO_RASTERIZED_STREAM, NULL, &gs); + todo_wine + ok(hr == S_OK, "Failed to create geometry shader with stream output, hr %#x.\n", hr); + if (FAILED(hr)) + { + ID3D11VertexShader_Release(vs); + goto done; + } + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + + for (i = 0; i < ARRAY_SIZE(vertex_count); ++i) + vertex_count[i] = 5; + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(vertex_count), vertex_count); + ID3D11DeviceContext_GSSetConstantBuffers(context, 0, 1, &cb); + + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D11_QUERY_SO_STATISTICS; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Draw(context, 5, 0); + ID3D11DeviceContext_End(context, query); + + memset(&data, 0xff, sizeof(data)); + get_query_data(context, query, &data, sizeof(data)); + ok(!data.NumPrimitivesWritten, "Got unexpected primitives written %u.\n", + (unsigned int)data.NumPrimitivesWritten); + ok(data.PrimitivesStorageNeeded == 5, "Got unexpected primitives storage needed %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + for (i = 0; i < ARRAY_SIZE(so_buffer); ++i) + so_buffer[i] = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, sizeof(struct vec4) * 10, NULL); + + ID3D11DeviceContext_SOSetTargets(context, D3D11_SO_BUFFER_SLOT_COUNT, so_buffer, offset); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Draw(context, 16, 0); + ID3D11DeviceContext_End(context, query); + memset(&data, 0xff, sizeof(data)); + get_query_data(context, query, &data, sizeof(data)); + ok(data.NumPrimitivesWritten == 5, "Got unexpected primitives written %u.\n", + (unsigned int)data.NumPrimitivesWritten); + ok(data.PrimitivesStorageNeeded == 5, "Got unexpected primitives storage needed %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + vertex_count[0] = 3; + vertex_count[1] = 6; + vertex_count[2] = 4; + vertex_count[3] = 12; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, vertex_count, 0, 0); + + ID3D11DeviceContext_SOSetTargets(context, D3D11_SO_BUFFER_SLOT_COUNT, so_buffer, offset); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Draw(context, 32, 0); + ID3D11DeviceContext_End(context, query); + memset(&data, 0xff, sizeof(data)); + get_query_data(context, query, &data, sizeof(data)); + ok(data.NumPrimitivesWritten == 3, "Got unexpected primitives written %u.\n", + (unsigned int)data.NumPrimitivesWritten); + ok(data.PrimitivesStorageNeeded == 3, "Got unexpected primitives storage needed %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + vertex_count[0] = 16; + vertex_count[1] = 6; + vertex_count[2] = 4; + vertex_count[3] = 12; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, vertex_count, 0, 0); + + ID3D11DeviceContext_SOSetTargets(context, D3D11_SO_BUFFER_SLOT_COUNT, so_buffer, offset); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Draw(context, 32, 0); + ID3D11DeviceContext_End(context, query); + memset(&data, 0xff, sizeof(data)); + get_query_data(context, query, &data, sizeof(data)); + ok(data.NumPrimitivesWritten == 10, "Got unexpected primitives written %u.\n", + (unsigned int)data.NumPrimitivesWritten); + ok(data.PrimitivesStorageNeeded == 16, "Got unexpected primitives storage needed %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + ID3D11Asynchronous_Release(query); + + for (i = 0; i < ARRAY_SIZE(so_buffer); ++i) + ID3D11Buffer_Release(so_buffer[i]); + ID3D11Buffer_Release(cb); + ID3D11GeometryShader_Release(gs); + ID3D11VertexShader_Release(vs); + +done: release_test_context(&test_context); } -- 2.18.1

3 2

[PATCH 3/4] wined3d: Implement WINED3D_QUERY_TYPE_SO_STATISTICS.
by Józef Kucia 21 Nov '18

21 Nov '18

The WINED3D_QUERY_TYPE_SO_STATISTICS query type is just WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0, but it is supported on feature level 10. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 9 +++++---- dlls/d3d11/tests/d3d11.c | 8 +++----- dlls/wined3d/query.c | 3 +++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 43fa65e280ed..d4efad9d7df8 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -4377,7 +4377,7 @@ static void test_create_query(void) {D3D10_QUERY_TIMESTAMP_DISJOINT, FALSE, FALSE}, {D3D10_QUERY_PIPELINE_STATISTICS, FALSE, FALSE}, {D3D10_QUERY_OCCLUSION_PREDICATE, TRUE, FALSE}, - {D3D10_QUERY_SO_STATISTICS, FALSE, TRUE}, + {D3D10_QUERY_SO_STATISTICS, FALSE, FALSE}, {D3D10_QUERY_SO_OVERFLOW_PREDICATE, TRUE, TRUE}, }; @@ -4813,9 +4813,7 @@ static void test_so_statistics_query(void) query_desc.Query = D3D10_QUERY_SO_STATISTICS; query_desc.MiscFlags = 0; hr = ID3D10Device_CreateQuery(device, &query_desc, (ID3D10Query **)&query); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (FAILED(hr)) goto done; data_size = ID3D10Asynchronous_GetDataSize(query); ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); @@ -4829,8 +4827,10 @@ static void test_so_statistics_query(void) ID3D10Asynchronous_Begin(query); hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); draw_quad(&test_context); @@ -4839,6 +4839,7 @@ static void test_so_statistics_query(void) get_query_data(query, &data, sizeof(data)); ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", (unsigned int)data.NumPrimitivesWritten); + todo_wine ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", (unsigned int)data.PrimitivesStorageNeeded); @@ -4848,11 +4849,11 @@ static void test_so_statistics_query(void) get_query_data(query, &data, sizeof(data)); ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", (unsigned int)data.NumPrimitivesWritten); + todo_wine ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", (unsigned int)data.PrimitivesStorageNeeded); ID3D10Asynchronous_Release(query); -done: release_test_context(&test_context); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5c6dfe000735..2f81a2c84ad1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5292,7 +5292,7 @@ static void test_create_query(void) {D3D11_QUERY_TIMESTAMP_DISJOINT, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_PIPELINE_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_OCCLUSION_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, FALSE}, - {D3D11_QUERY_SO_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, TRUE}, + {D3D11_QUERY_SO_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_SO_OVERFLOW_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, TRUE}, {D3D11_QUERY_SO_STATISTICS_STREAM0, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, FALSE}, {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE}, @@ -5839,9 +5839,7 @@ static void test_so_statistics_query(void) query_desc.Query = tests[i].query; query_desc.MiscFlags = 0; hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); - todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (FAILED(hr)) continue; data_size = ID3D11Asynchronous_GetDataSize(query); ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); @@ -5868,7 +5866,7 @@ static void test_so_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", (unsigned int)data.NumPrimitivesWritten); - todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS || query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", (unsigned int)data.PrimitivesStorageNeeded); @@ -5878,7 +5876,7 @@ static void test_so_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", (unsigned int)data.NumPrimitivesWritten); - todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS || query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", (unsigned int)data.PrimitivesStorageNeeded); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c0a146940909..d4e7cf5b37ef 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1259,6 +1259,8 @@ static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, if (WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) stream_idx = type - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0; + else if (type == WINED3D_QUERY_TYPE_SO_STATISTICS) + stream_idx = 0; else return WINED3DERR_NOTAVAILABLE; @@ -1353,6 +1355,7 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q case WINED3D_QUERY_TYPE_TIMESTAMP_FREQ: return wined3d_timestamp_disjoint_query_create(device, type, parent, parent_ops, query); + case WINED3D_QUERY_TYPE_SO_STATISTICS: case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: -- 2.18.1

3 2

[PATCH 1/4] d3d10core/tests: Add test for SO statistics queries.
by Józef Kucia 21 Nov '18

21 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 61 ++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 9821054601bd..43fa65e280ed 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -4796,6 +4796,66 @@ static void test_timestamp_query(void) release_test_context(&test_context); } +static void test_so_statistics_query(void) +{ + struct d3d10core_test_context test_context; + D3D10_QUERY_DATA_SO_STATISTICS data; + D3D10_QUERY_DESC query_desc; + ID3D10Asynchronous *query; + unsigned int data_size; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + query_desc.Query = D3D10_QUERY_SO_STATISTICS; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, (ID3D10Query **)&query); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) goto done; + data_size = ID3D10Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D10Asynchronous_End(query); + ID3D10Asynchronous_Begin(query); + ID3D10Asynchronous_Begin(query); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_quad(&test_context); + + ID3D10Asynchronous_End(query); + get_query_data(query, &data, sizeof(data)); + ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", + (unsigned int)data.NumPrimitivesWritten); + ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + ID3D10Asynchronous_Begin(query); + draw_quad(&test_context); + ID3D10Asynchronous_End(query); + get_query_data(query, &data, sizeof(data)); + ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", + (unsigned int)data.NumPrimitivesWritten); + ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + ID3D10Asynchronous_Release(query); +done: + release_test_context(&test_context); +} + static void test_device_removed_reason(void) { ID3D10Device *device; @@ -17627,6 +17687,7 @@ START_TEST(d3d10core) queue_test(test_occlusion_query); queue_test(test_pipeline_statistics_query); queue_test(test_timestamp_query); + queue_test(test_so_statistics_query); queue_test(test_device_removed_reason); queue_test(test_scissor); queue_test(test_clear_state); -- 2.18.1

3 2

[PATCH 2/4] wined3d: Add fallback for WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0.
by Józef Kucia 21 Nov '18

21 Nov '18

Use non-indexed queries when ARB_transform_feedback3 is not available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/query.c | 47 +++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 4239fc08b3d9..c0a146940909 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -817,6 +817,24 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW return written_available && generated_available; } +static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query *query, + struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) + { + GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, query->stream_idx)); + GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, query->stream_idx)); + } + else + { + GL_EXTCALL(glEndQuery(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN)); + GL_EXTCALL(glEndQuery(GL_PRIMITIVES_GENERATED)); + } + checkGLcall("end query"); +} + static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); @@ -833,9 +851,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context = context_reacquire(device, pq->context))) { - gl_info = context->gl_info; - GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx)); - GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, pq->stream_idx)); + wined3d_so_statistics_query_end(pq, context); } else { @@ -854,10 +870,20 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D } gl_info = context->gl_info; - GL_EXTCALL(glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, - pq->stream_idx, pq->u.query.written)); - GL_EXTCALL(glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, - pq->stream_idx, pq->u.query.generated)); + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) + { + GL_EXTCALL(glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, + pq->stream_idx, pq->u.query.written)); + GL_EXTCALL(glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, + pq->stream_idx, pq->u.query.generated)); + } + else + { + GL_EXTCALL(glBeginQuery(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, + pq->u.query.written)); + GL_EXTCALL(glBeginQuery(GL_PRIMITIVES_GENERATED, + pq->u.query.generated)); + } checkGLcall("begin query"); context_release(context); @@ -869,10 +895,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context = context_reacquire(device, pq->context))) { - gl_info = context->gl_info; - GL_EXTCALL(glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, pq->stream_idx)); - GL_EXTCALL(glEndQueryIndexed(GL_PRIMITIVES_GENERATED, pq->stream_idx)); - checkGLcall("end query"); + wined3d_so_statistics_query_end(pq, context); context_release(context); poll = TRUE; @@ -1247,7 +1270,7 @@ static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, WARN("OpenGL implementation does not support primitive queries.\n"); return WINED3DERR_NOTAVAILABLE; } - if (!gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) + if (stream_idx && !gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) { WARN("OpenGL implementation does not support indexed queries.\n"); return WINED3DERR_NOTAVAILABLE; -- 2.18.1

2 1

[PATCH 5/6] dxgi: Report non-zero shared system memory.
by Józef Kucia 21 Nov '18

21 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40803 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 71e15d7b7c8c..4371ae74f7e1 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -178,7 +178,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ desc->Revision = adapter_id.revision; desc->DedicatedVideoMemory = adapter_id.video_memory; desc->DedicatedSystemMemory = 0; /* FIXME */ - desc->SharedSystemMemory = 0; /* FIXME */ + desc->SharedSystemMemory = adapter_id.shared_system_memory; desc->AdapterLuid = adapter_id.adapter_luid; desc->Flags = 0; desc->GraphicsPreemptionGranularity = 0; /* FIXME */ -- 2.18.1

3 2

[PATCH 4/6] wined3d: Report system shared memory for adapters.
by Józef Kucia 21 Nov '18

21 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 15 ++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e41da8d95296..b9aa9fa44003 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -492,11 +492,12 @@ const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_p void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) { + const struct driver_version_information *version_info; + enum wined3d_driver_model driver_model; + enum wined3d_display_driver driver; + MEMORYSTATUSEX memory_status; OSVERSIONINFOW os_version; WORD driver_os_version; - enum wined3d_display_driver driver; - enum wined3d_driver_model driver_model; - const struct driver_version_information *version_info; memset(&os_version, 0, sizeof(os_version)); os_version.dwOSVersionInfoSize = sizeof(os_version); @@ -585,6 +586,13 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->vram_bytes = LONG_MAX; } + driver_info->sysmem_bytes = 64 * 1024 * 1024; + memory_status.dwLength = sizeof(memory_status); + if (GlobalMemoryStatusEx(&memory_status)) + driver_info->sysmem_bytes = max(memory_status.ullTotalPhys / 2, driver_info->sysmem_bytes); + else + ERR("Failed to get global memory status.\n"); + /* Try to obtain driver version information for the current Windows version. This fails in * some cases: * - the gpu is not available on the currently selected OS version: @@ -1200,6 +1208,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); + identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 668bbc7030be..f908ff717324 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2648,6 +2648,7 @@ struct wined3d_driver_info const char *name; const char *description; UINT64 vram_bytes; + UINT64 sysmem_bytes; DWORD version_high; DWORD version_low; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f8e201c3d088..40553f7e5146 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1736,6 +1736,7 @@ struct wined3d_adapter_identifier DWORD whql_level; LUID adapter_luid; SIZE_T video_memory; + SIZE_T shared_system_memory; }; struct wined3d_swapchain_desc -- 2.18.1

3 2

[PATCH 6/6] dxgi/tests: Add basic test for QueryVideoMemoryInfo().
by Józef Kucia 21 Nov '18

21 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bd5c574ec829..9073a03554dd 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -820,6 +820,57 @@ static void test_adapter_luid(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_query_video_memory_info(void) +{ + DXGI_QUERY_VIDEO_MEMORY_INFO memory_info; + IDXGIAdapter3 *adapter3; + IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter3, (void **)&adapter3); + ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + if (hr == E_NOINTERFACE) + goto done; + + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); + ok(hr == S_OK, "Failed to query video memory info, hr %#x.\n", hr); + ok(memory_info.Budget >= memory_info.AvailableForReservation, + "Available for reservation 0x%s is greater than budget 0x%s.\n", + wine_dbgstr_longlong(memory_info.AvailableForReservation), + wine_dbgstr_longlong(memory_info.Budget)); + ok(!memory_info.CurrentReservation, "Got unexpected current reservation 0x%s.\n", + wine_dbgstr_longlong(memory_info.CurrentReservation)); + + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &memory_info); + ok(hr == S_OK, "Failed to query video memory info, hr %#x.\n", hr); + ok(memory_info.Budget >= memory_info.AvailableForReservation, + "Available for reservation 0x%s is greater than budget 0x%s.\n", + wine_dbgstr_longlong(memory_info.AvailableForReservation), + wine_dbgstr_longlong(memory_info.Budget)); + ok(!memory_info.CurrentReservation, "Got unexpected current reservation 0x%s.\n", + wine_dbgstr_longlong(memory_info.CurrentReservation)); + + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL + 1, &memory_info); + ok(hr == E_INVALIDARG, "Failed to query video memory info, hr %#x.\n", hr); + + IDXGIAdapter3_Release(adapter3); + +done: + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_check_interface_support(void) { LARGE_INTEGER driver_version; @@ -4694,6 +4745,7 @@ START_TEST(dxgi) queue_test(test_adapter_desc); queue_test(test_adapter_luid); + queue_test(test_query_video_memory_info); queue_test(test_check_interface_support); queue_test(test_create_surface); queue_test(test_parents); -- 2.18.1

3 2

[PATCH 3/6] wined3d: Get rid of vram_bytes from struct wined3d_adapter.
by Józef Kucia 21 Nov '18

21 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 3 +-- dlls/wined3d/device.c | 10 +++++++--- dlls/wined3d/directx.c | 5 ++--- dlls/wined3d/wined3d_private.h | 5 ++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 99df19cc3172..2a3514a1bef3 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3845,9 +3845,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); - adapter->vram_bytes = driver_info->vram_bytes; adapter->vram_bytes_used = 0; - TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes)); gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) | adapter->fragment_pipe->get_emul_mask(gl_info); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2ae9235b0675..a89a33d676e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1302,14 +1302,18 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device) UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device) { + const struct wined3d_driver_info *driver_info; + TRACE("device %p.\n", device); + driver_info = &device->adapter->driver_info; + TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n", - wine_dbgstr_longlong(device->adapter->vram_bytes), + wine_dbgstr_longlong(driver_info->vram_bytes), wine_dbgstr_longlong(device->adapter->vram_bytes_used), - wine_dbgstr_longlong(device->adapter->vram_bytes - device->adapter->vram_bytes_used)); + wine_dbgstr_longlong(driver_info->vram_bytes - device->adapter->vram_bytes_used)); - return min(UINT_MAX, device->adapter->vram_bytes - device->adapter->vram_bytes_used); + return min(UINT_MAX, driver_info->vram_bytes - device->adapter->vram_bytes_used); } void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index afbc5cb95e5b..e41da8d95296 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1199,7 +1199,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); - identifier->video_memory = min(~(SIZE_T)0, adapter->vram_bytes); + identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); return WINED3D_OK; } @@ -2491,9 +2491,8 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, DWORD win TRACE("adapter %p.\n", adapter); wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0); - adapter->vram_bytes = adapter->driver_info.vram_bytes; adapter->vram_bytes_used = 0; - TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); if (!wined3d_adapter_no3d_init_format_info(adapter)) return FALSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d493e9f57582..668bbc7030be 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2674,13 +2674,12 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; - unsigned int cfg_count; - struct wined3d_pixel_format *cfgs; - UINT64 vram_bytes; UINT64 vram_bytes_used; LUID luid; WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ + unsigned int cfg_count; + struct wined3d_pixel_format *cfgs; void *formats; size_t format_size; -- 2.18.1

3 2

[PATCH 1/6] dxgi: Partially implement dxgi_adapter_QueryVideoMemoryInfo().
by Józef Kucia 21 Nov '18

21 Nov '18

Based on a patch by Matteo Bruni. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/adapter.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index b96904e90c01..71e15d7b7c8c 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -297,10 +297,44 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterHardwareContentProtectionTe static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdapter *iface, UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *memory_info) { - FIXME("iface %p, node_index %u, segment_group %#x, memory_info %p stub!\n", + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr; + + FIXME("iface %p, node_index %u, segment_group %#x, memory_info %p partial stub!\n", iface, node_index, segment_group, memory_info); - return E_NOTIMPL; + if (node_index) + FIXME("Ignoring node index %u.\n", node_index); + + adapter_id.driver_size = 0; + adapter_id.description_size = 0; + adapter_id.device_name_size = 0; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + return hr; + + switch (segment_group) + { + case DXGI_MEMORY_SEGMENT_GROUP_LOCAL: + memory_info->Budget = adapter_id.video_memory; + memory_info->CurrentUsage = 0; + memory_info->AvailableForReservation = adapter_id.video_memory / 2; + memory_info->CurrentReservation = 0; + break; + case DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL: + memset(memory_info, 0, sizeof(*memory_info)); + break; + default: + WARN("Invalid memory segment group %#x.\n", segment_group); + return E_INVALIDARG; + } + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetVideoMemoryReservation(IWineDXGIAdapter *iface, -- 2.18.1

3 2

[PATCH 2/6] wined3d: Rename DeviceName to device_name.
by Józef Kucia 21 Nov '18

21 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4a135860dcfc..afbc5cb95e5b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -730,7 +730,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, &rotation))) return hr; - memcpy(desc->device_name, adapter->DeviceName, sizeof(desc->device_name)); + memcpy(desc->device_name, adapter->device_name, sizeof(desc->device_name)); SetRect(&desc->desktop_rect, 0, 0, mode.width, mode.height); OffsetRect(&desc->desktop_rect, adapter->monitor_position.x, adapter->monitor_position.y); /* FIXME: We should get this from EnumDisplayDevices() when the adapters @@ -769,7 +769,7 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); - while (EnumDisplaySettingsExW(adapter->DeviceName, j++, &mode, 0)) + while (EnumDisplaySettingsExW(adapter->device_name, j++, &mode, 0)) { if (mode.dmFields & DM_DISPLAYFLAGS) { @@ -825,7 +825,7 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada while (i <= mode_idx) { - if (!EnumDisplaySettingsExW(adapter->DeviceName, j++, &m, 0)) + if (!EnumDisplaySettingsExW(adapter->device_name, j++, &m, 0)) { WARN("Invalid mode_idx %u.\n", mode_idx); return WINED3DERR_INVALIDCALL; @@ -994,7 +994,7 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI memset(&m, 0, sizeof(m)); m.dmSize = sizeof(m); - EnumDisplaySettingsExW(adapter->DeviceName, ENUM_CURRENT_SETTINGS, &m, 0); + EnumDisplaySettingsExW(adapter->device_name, ENUM_CURRENT_SETTINGS, &m, 0); mode->width = m.dmPelsWidth; mode->height = m.dmPelsHeight; mode->refresh_rate = DEFAULT_REFRESH_RATE; @@ -1097,7 +1097,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } else { - if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode)) + if (!EnumDisplaySettingsW(adapter->device_name, ENUM_REGISTRY_SETTINGS, &new_mode)) { ERR("Failed to read mode from registry.\n"); return WINED3DERR_NOTAVAILABLE; @@ -1106,7 +1106,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } /* Only change the mode if necessary. */ - if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_CURRENT_SETTINGS, &current_mode)) + if (!EnumDisplaySettingsW(adapter->device_name, ENUM_CURRENT_SETTINGS, &current_mode)) { ERR("Failed to get current display mode.\n"); } @@ -1123,7 +1123,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, return WINED3D_OK; } - ret = ChangeDisplaySettingsExW(adapter->DeviceName, &new_mode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(adapter->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); if (ret != DISP_CHANGE_SUCCESSFUL) { if (new_mode.dmFields & DM_DISPLAYFREQUENCY) @@ -1131,7 +1131,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, WARN("ChangeDisplaySettingsExW failed, trying without the refresh rate.\n"); new_mode.dmFields &= ~DM_DISPLAYFREQUENCY; new_mode.dmDisplayFrequency = 0; - ret = ChangeDisplaySettingsExW(adapter->DeviceName, &new_mode, NULL, CDS_FULLSCREEN, NULL); + ret = ChangeDisplaySettingsExW(adapter->device_name, &new_mode, NULL, CDS_FULLSCREEN, NULL); } if (ret != DISP_CHANGE_SUCCESSFUL) return WINED3DERR_NOTAVAILABLE; @@ -1182,7 +1182,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, /* Note that d3d8 doesn't supply a device name. */ if (identifier->device_name_size) { - if (!WideCharToMultiByte(CP_ACP, 0, adapter->DeviceName, -1, identifier->device_name, + if (!WideCharToMultiByte(CP_ACP, 0, adapter->device_name, -1, identifier->device_name, identifier->device_name_size, NULL, NULL)) { ERR("Failed to convert device name, last error %#x.\n", GetLastError()); @@ -2516,8 +2516,8 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); - strcpyW(adapter->DeviceName, display_device.DeviceName); + TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); + strcpyW(adapter->device_name, display_device.DeviceName); if (!AllocateLocallyUniqueId(&adapter->luid)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f739e5f79c1e..d493e9f57582 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2674,13 +2674,14 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; - WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ unsigned int cfg_count; struct wined3d_pixel_format *cfgs; UINT64 vram_bytes; UINT64 vram_bytes_used; LUID luid; + WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ + void *formats; size_t format_size; -- 2.18.1

3 2

[PATCH] winegcc: Fix cross linking on multiarch platforms.
by Jacek Caban 21 Nov '18

21 Nov '18

From: Andre Heider <a.heider(a)gmail.com> If e.g. the 64bit libdir was set to /foo/lib/x86_64-linux-gnu/bar, winegcc will now look for the 32bit libdir at /foo/lib/i386-linux-gnu/bar. Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I simplified string copies a bit and fixed off-by-one mistake. tools/winegcc/winegcc.c | 44 ++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-)

2 1

[PATCH 6/6] d3d9: Do not add map access indiscriminately in cubetexture_init().
by Henri Verbeet 21 Nov '18

21 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 5 +++-- dlls/d3d9/texture.c | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 205a9cc1cd0..cb38aead42a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12877,10 +12877,11 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D + && surface_types[i].type != SURFACE_CUBE) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DSurface9_UnlockRect(surface); - todo_wine_if(expected_hr != D3D_OK) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_CUBE) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture))) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index de485bafd01..84a1bd85e78 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1397,8 +1397,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; desc.height = edge_length; desc.depth = 1; -- 2.11.0

2 1

[PATCH 5/6] d3d9: Do not add map access indiscriminately in texture_init().
by Henri Verbeet 21 Nov '18

21 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This patch and the next depend on patch 154534 and 154532. --- dlls/d3d9/tests/device.c | 2 +- dlls/d3d9/texture.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 05e6d81390d..205a9cc1cd0 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12877,7 +12877,7 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr != D3D_OK) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DSurface9_UnlockRect(surface); todo_wine_if(expected_hr != D3D_OK) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index e6524169e04..de485bafd01 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1314,8 +1314,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1; -- 2.11.0

2 1

[PATCH 4/6] d3d9: Disallow rendertarget and depth/stencil usage on index buffers.
by Henri Verbeet 21 Nov '18

21 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 4 ++++ dlls/d3d9/tests/device.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 67586c28e04..4b0b39293cb 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -579,6 +579,10 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de if (pool == D3DPOOL_SCRATCH) return D3DERR_INVALIDCALL; + /* In d3d9, buffers can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b2803ba0926..05e6d81390d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12965,16 +12965,14 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL); - todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) - ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; hr = IDirect3DIndexBuffer9_GetDesc(ib, &ib_desc); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage); + ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage); ok(ib_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, ib_desc.Pool); hr = IDirect3DIndexBuffer9_Lock(ib, 0, 0, &data, 0); -- 2.11.0

2 1

[PATCH 3/6] d3d8: Disallow rendertarget and depth/stencil usage on index buffers.
by Henri Verbeet 21 Nov '18

21 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 4 ++++ dlls/d3d8/tests/device.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 84873128cf0..558583d752d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -580,6 +580,10 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de if (pool == D3DPOOL_SCRATCH) return D3DERR_INVALIDCALL; + /* In d3d8, buffers can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b3260eaaf6c..49d2a9818cc 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9130,16 +9130,14 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateIndexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib); - todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) - ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; hr = IDirect3DIndexBuffer8_GetDesc(ib, &ib_desc); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage); + ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage); ok(ib_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, ib_desc.Pool); hr = IDirect3DIndexBuffer8_Lock(ib, 0, 0, &data, 0); -- 2.11.0

2 1

[PATCH 2/6] d3d9: Disallow rendertarget and depth/stencil usage on vertex buffers.
by Henri Verbeet 21 Nov '18

21 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 4 ++++ dlls/d3d9/tests/device.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index b870107830c..67586c28e04 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -283,6 +283,10 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * return D3DERR_INVALIDCALL; } + /* In d3d9, buffers can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->fvf = fvf; d3d9_resource_init(&buffer->resource); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index af0e8a0b337..b2803ba0926 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12998,16 +12998,14 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateVertexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb, NULL); - todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) - ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; hr = IDirect3DVertexBuffer9_GetDesc(vb, &vb_desc); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); + ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); ok(vb_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, vb_desc.Pool); hr = IDirect3DVertexBuffer9_Lock(vb, 0, 0, &data, 0); -- 2.11.0

2 1

[PATCH 1/6] d3d8: Disallow rendertarget and depth/stencil usage on vertex buffers.
by Henri Verbeet 21 Nov '18

21 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 4 ++++ dlls/d3d8/tests/device.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 475bf48aa1b..84873128cf0 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -282,6 +282,10 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * return D3DERR_INVALIDCALL; } + /* In d3d8, buffers can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; d3d8_resource_init(&buffer->resource); buffer->fvf = fvf; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 8ac6ed70b23..b3260eaaf6c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9163,16 +9163,14 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb); - todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) - ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; hr = IDirect3DVertexBuffer8_GetDesc(vb, &vb_desc); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); + ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); ok(vb_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, vb_desc.Pool); hr = IDirect3DVertexBuffer8_Lock(vb, 0, 0, &data, 0); -- 2.11.0

2 1

[PATCH] wined3d: Don't pull _ACCESS_GPU textures to system memory in texture2d_blt().
by Paul Gofman 21 Nov '18

21 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46068 The change introduced by commit 54a9e84952ce8f566f79ab92930faf84bad0cfc1 had side effect of ultimately selecting detsination texture location as dst_texture->resource.map_binding, which is not the case in the default texture2d_blt() code path. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f5c53a8b8..18542e1b74 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3275,7 +3275,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ } } else if (!(src_sub_resource->locations & surface_simple_locations) - && (dst_sub_resource->locations & dst_texture->resource.map_binding)) + && (dst_sub_resource->locations & dst_texture->resource.map_binding) + && !(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { /* Download */ if (scale) -- 2.19.1

3 8

[PATCH] testbot: Provide the missions list to the Reconfig scripts.
by Francois Gouget 21 Nov '18

21 Nov '18

The scripts need it to know which builds to update. A Wine VM may only need to update the win32 build for instance, but may have to recreate wineprefixes for multiple locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4d50a3789a..2a8b1d625d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Engine::Notify; @@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " echo git pull &&\n". - " ../bin/build/$Script\n". + " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.19.1

1 0

[PATCH 09/10] d3dx9: Use intermediate surfaces for loading from unmappable source surfaces in D3DXLoadSurfaceFromSurface().
by Henri Verbeet 21 Nov '18

21 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 36 ++++++++++++++++++++++++++---------- dlls/d3dx9_36/tests/surface.c | 4 ---- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 7d48cc6b132..cf9a16d9b78 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1924,10 +1924,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { - RECT rect; + IDirect3DSurface9 *surface = src_surface; + IDirect3DDevice9 *device; + D3DSURFACE_DESC src_desc; D3DLOCKED_RECT lock; - D3DSURFACE_DESC SrcDesc; HRESULT hr; + RECT s; TRACE("dst_surface %p, dst_palette %p, dst_rect %s, src_surface %p, " "src_palette %p, src_rect %s, filter %#x, color_key 0x%08x.\n", @@ -1937,23 +1939,37 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, if (!dst_surface || !src_surface) return D3DERR_INVALIDCALL; - IDirect3DSurface9_GetDesc(src_surface, &SrcDesc); + IDirect3DSurface9_GetDesc(src_surface, &src_desc); + if (src_desc.Pool == D3DPOOL_DEFAULT && !(src_desc.Usage & D3DUSAGE_DYNAMIC)) + { + IDirect3DSurface9_GetDevice(src_surface, &device); + if (FAILED(IDirect3DDevice9_CreateRenderTarget(device, src_desc.Width, src_desc.Height, + src_desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL)) + || FAILED(IDirect3DDevice9_StretchRect(device, src_surface, NULL, surface, NULL, D3DTEXF_NONE))) + surface = src_surface; + IDirect3DDevice9_Release(device); + } if (!src_rect) - SetRect(&rect, 0, 0, SrcDesc.Width, SrcDesc.Height); - else - rect = *src_rect; + { + SetRect(&s, 0, 0, src_desc.Width, src_desc.Height); + src_rect = &s; + } - if (FAILED(IDirect3DSurface9_LockRect(src_surface, &lock, NULL, D3DLOCK_READONLY))) + if (FAILED(IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY))) { FIXME("Called for unlockable source surface.\n"); + if (surface != src_surface) + IDirect3DSurface9_Release(surface); return D3DXERR_INVALIDDATA; } - hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, - lock.pBits, SrcDesc.Format, lock.Pitch, src_palette, &rect, filter, color_key); + hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, + src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - IDirect3DSurface9_UnlockRect(src_surface); + IDirect3DSurface9_UnlockRect(surface); + if (surface != src_surface) + IDirect3DSurface9_Release(surface); return hr; } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index f153cd92c65..d3450722ef7 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -869,16 +869,12 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0xff000000); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_TRIANGLE | D3DX_FILTER_MIRROR, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_LINEAR, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); IDirect3DSurface9_Release(newsurf); -- 2.11.0

4 5

[PATCH v2] include: Add qos2.h
by Gijs Vermeulen 21 Nov '18

21 Nov '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- Superseeds 154617 v2: Add forgotten Makefile changes, sorry for the noise. include/Makefile.in | 1 + include/qos2.h | 104 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 include/qos2.h diff --git a/include/Makefile.in b/include/Makefile.in index cc78b1c154..295374814f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -527,6 +527,7 @@ SOURCES = \ pshpack8.h \ pstore.idl \ qedit.idl \ + qos2.h \ ras.h \ rasdlg.h \ raserror.h \ diff --git a/include/qos2.h b/include/qos2.h new file mode 100644 index 0000000000..2ae0f2f43d --- /dev/null +++ b/include/qos2.h @@ -0,0 +1,104 @@ +/* + * Copyright 2018 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_QOS2_H__ +#define __WINE_QOS2_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define QOSSetTrafficType 0 +#define QOSSetOutgoingRate 1 +#define QOSSetOutgoingDSCPValue 2 + +typedef UINT32 QOS_FLOWID; + +typedef enum _QOS_SHAPING { + QOSShapeOnly = 0, + QOSShapeAndMark = 1, + QOSUseNonConformantMarkings = 2 +} QOS_SHAPING, *PQOS_SHAPING; + +typedef enum _QOS_FLOWRATE_REASON { + QOSFlowRateNotApplicable = 0, + QOSFlowRateContentChange = 1, + QOSFlowRateCongestion = 2, + QOSFlowRateHigherContentEncoding = 3, + QOSFlowRateUserCaused = 4 +} QOS_FLOWRATE_REASON, PQOS_FLOWRATE_REASON; + +typedef enum _QOS_NOTIFY_FLOW { + QOSNotifyCongested = 0, + QOSNotifyUncongested = 1, + QOSNotifyAvailable = 2 +} QOS_NOTIFY_FLOW, *PQOS_NOTIFY_FLOW; + +typedef enum _QOS_QUERY_FLOW { + QOSQueryFlowFundamentals = 0, + QOSQueryPacketPriority = 1, + QOSQueryOutgoingRate = 2 +} QOS_QUERY_FLOW; + +typedef enum _QOS_SET_FLOW { + QOSSetTrafficType = 0, + QOSSetOutgoingRate = 1, + QOSSetOutgoingDSCPValue = 2 +} QOS_SET_FLOW, *PQOS_SET_FLOW; + +typedef enum _QOS_TRAFFIC_TYPE { + QOSTrafficTypeBestEffort, + QOSTrafficTypeBackground, + QOSTrafficTypeExcellentEffort, + QOSTrafficTypeAudioVideo, + QOSTrafficTypeVoice, + QOSTrafficTypeControl +} QOS_TRAFFIC_TYPE, *PQOS_TRAFFIC_TYPE; + +typedef struct _QOS_FLOW_FUNDAMENTALS { + BOOL BottleneckBandwidthSet; + UINT64 BottleneckBandwidth; + BOOL AvailableBandwidthSet; + UINT64 AvailableBandwidth; + BOOL RTTSet; + UINT32 RTT; +} QOS_FLOW_FUNDAMENTALS, *PQOS_FLOW_FUNDAMENTALS; + +typedef struct _QOS_FLOWRATE_OUTGOING { + UINT64 Bandwidth; + QOS_SHAPING ShapingBehavior; + QOS_FLOWRATE_REASON Reason; +} QOS_FLOWRATE_OUTGOING, *PQOS_FLOWRATE_OUTGOING; + +typedef struct _QOS_PACKET_PRIORITY { + ULONG ConformantDSCPValue; + ULONG NonConformantDSCPValue; + ULONG ConformantL2Value; + ULONG NonConformantL2Value; +} QOS_PACKET_PRIORITY, *PQOS_PACKET_PRIORITY; + +typedef struct _QOS_VERSION { + USHORT MajorVersion; + USHORT MinorVersion; +} QOS_VERSION, *PQOS_VERSION; + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_QOS2_H__ */ -- 2.19.1

1 0

[PATCH v2 1/2] comctl32/listbox: Implement LBS_NODATA for single-selection listboxes
by Gabriel Ivăncescu 21 Nov '18

21 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32374 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I reduced the patch to just single-selection changes so that it still works. After these are in, the multi-selection patches should be smaller. Please note that the new helper functions (such as NODATA_is_sel) should remain as-is because they will be extended later for multi-selection listboxes, even if they seem redundant for now, so that I can really trim down the size of the multi-selection patches. :-) By the way, this patch really looks larger than it is. Most of the changes are in SetCount and the helper functions. InsertItem and RemoveItem seem large, but the changes are minor -- it's mostly just indentation, so it should be simple to review. The reason I changed the entirety of SetCount is to reduce the amount of changes for the multi-selection patches that will come later, otherwise I'd have to go back-and-forth with indentation changes unless I used a goto :-/ v2: Fix a dumb mistake when rounding the size. dlls/comctl32/listbox.c | 280 ++++++++++++++++++++++++++++------------ 1 file changed, 201 insertions(+), 79 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index dbc7b4a..7ba6b1b 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - LBS_NODATA + * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -125,6 +125,71 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +/*********************************************************************** + * Helper functions for LBS_NODATA listboxes + * + * Since LBS_NODATA listboxes can be extremely large, we need to store + * them with minimal overhead, both for performance and memory usage. + * + * In all cases, it is important to note that descr->items must never be + * dereferenced directly with LBS_NODATA, outside of these helpers. + * + * For single-selection listboxes, we store literally no data for items, + * and thus descr->items will always be NULL in this case. + * + * FIXME: Multi-selection listboxes are not implemented yet for LBS_NODATA. + * + */ +static BOOL is_singlesel_NODATA(const LB_DESCR *descr) +{ + return (descr->style & LBS_NODATA) && + !(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)); +} + +static BOOL NODATA_is_sel(const LB_DESCR *descr, UINT index) +{ + return index == descr->selected_item; +} + +static BOOL NODATA_multisel_expand(LB_DESCR *descr, UINT num) +{ + LB_ITEMDATA *p = descr->items; + UINT sz = num * sizeof(*p); + + if (!p || sz > HeapSize(GetProcessHeap(), 0, p)) + { + sz += LB_ARRAY_GRANULARITY * sizeof(*p) - 1; + sz -= sz % (LB_ARRAY_GRANULARITY * sizeof(*p)); + if (!p) p = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz); + else p = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, p, sz); + if (!p) return FALSE; + descr->items = p; + } + return TRUE; +} + +static void NODATA_multisel_shrink(LB_DESCR *descr, UINT orig_num) +{ + LB_ITEMDATA *p = descr->items; + UINT sz = descr->nb_items * sizeof(*p); + UINT orig_sz = orig_num * sizeof(*p); + + /* Shrink the array if needed */ + if (sz + LB_ARRAY_GRANULARITY * sizeof(*p) * 2 < HeapSize(GetProcessHeap(), 0, p)) + { + UINT rnd_sz = sz + LB_ARRAY_GRANULARITY * sizeof(*p) - 1; + rnd_sz -= rnd_sz % (LB_ARRAY_GRANULARITY * sizeof(*p)); + if ((p = HeapReAlloc(GetProcessHeap(), 0, p, rnd_sz))) + { + descr->items = p; + orig_sz = rnd_sz; + } + } + memset(&p[sz / sizeof(*p)], 0, orig_sz - sz); +} + + + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -494,7 +559,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); @@ -517,16 +582,19 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.hDC = hdc; dis.itemID = index; dis.itemState = 0; - if (item->selected) dis.itemState |= ODS_SELECTED; + if ( ( is_singlesel_NODATA(descr) && NODATA_is_sel(descr, index)) || + (!is_singlesel_NODATA(descr) && item->selected) ) + dis.itemState |= ODS_SELECTED; + if (!ignoreFocus && (descr->focus_item == index) && (descr->caret_on) && (descr->in_focus)) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item->data; + dis.itemData = (descr->style & LBS_NODATA) ? 0 : item->data; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, debugstr_w(item->str), action, - dis.itemState, wine_dbgstr_rect(rect) ); + descr->self, index, debugstr_w((descr->style & LBS_NODATA) ? NULL : item->str), + action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn ); if (hrgn) DeleteObject( hrgn ); @@ -673,6 +741,9 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { LB_ITEMDATA *item; + if (is_singlesel_NODATA(descr)) + return LB_OKAY; + nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { @@ -1440,10 +1511,13 @@ static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, { INT oldsel = descr->selected_item; if (index == oldsel) return LB_OKAY; - if (oldsel != -1) descr->items[oldsel].selected = FALSE; - if (index != -1) descr->items[index].selected = TRUE; - if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); + if (!(descr->style & LBS_NODATA)) + { + if (oldsel != -1) descr->items[oldsel].selected = FALSE; + if (index != -1) descr->items[index].selected = TRUE; + } descr->selected_item = index; + if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); if (index != -1) LISTBOX_RepaintItem( descr, index, ODA_SELECT ); if (send_notify && descr->nb_items) SEND_NOTIFICATION( descr, (index != -1) ? LBN_SELCHANGE : LBN_SELCANCEL ); @@ -1516,54 +1590,59 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) - { - /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; - if (descr->items) - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - max_items * sizeof(LB_ITEMDATA) ); - else - item = HeapAlloc( GetProcessHeap(), 0, - max_items * sizeof(LB_ITEMDATA) ); - if (!item) + if (is_singlesel_NODATA(descr)) + { + descr->nb_items++; + } + else + { + if (!descr->items) max_items = 0; + else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + if (descr->nb_items == max_items) { - SEND_NOTIFICATION( descr, LBN_ERRSPACE ); - return LB_ERRSPACE; + /* We need to grow the array */ + max_items += LB_ARRAY_GRANULARITY; + if (descr->items) + item = HeapReAlloc( GetProcessHeap(), 0, descr->items, + max_items * sizeof(LB_ITEMDATA) ); + else + item = HeapAlloc( GetProcessHeap(), 0, + max_items * sizeof(LB_ITEMDATA) ); + if (!item) + { + SEND_NOTIFICATION( descr, LBN_ERRSPACE ); + return LB_ERRSPACE; + } + descr->items = item; } - descr->items = item; - } - - /* Insert the item structure */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item + 1, item, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; - descr->nb_items++; - /* Get item height */ + /* Insert the item structure */ + item = &descr->items[index]; + if (index < descr->nb_items) + RtlMoveMemory( item + 1, item, + (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); + item->str = str; + item->data = HAS_STRINGS(descr) ? 0 : data; + item->height = 0; + item->selected = FALSE; + descr->nb_items++; - if (descr->style & LBS_OWNERDRAWVARIABLE) - { - MEASUREITEMSTRUCT mis; - UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); + /* Get item height */ + if (descr->style & LBS_OWNERDRAWVARIABLE) + { + MEASUREITEMSTRUCT mis; + UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); - mis.CtlType = ODT_LISTBOX; - mis.CtlID = id; - mis.itemID = index; - mis.itemData = data; - mis.itemHeight = descr->item_height; - SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); - item->height = mis.itemHeight ? mis.itemHeight : 1; - TRACE("[%p]: measure item %d (%s) = %d\n", - descr->self, index, str ? debugstr_w(str) : "", item->height ); + mis.CtlType = ODT_LISTBOX; + mis.CtlID = id; + mis.itemID = index; + mis.itemData = data; + mis.itemHeight = descr->item_height; + SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); + item->height = mis.itemHeight ? mis.itemHeight : 1; + TRACE("[%p]: measure item %d (%s) = %d\n", + descr->self, index, str ? debugstr_w(str) : "", item->height ); + } } /* Repaint the items */ @@ -1678,28 +1757,38 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) LISTBOX_InvalidateItems( descr, index ); descr->nb_items--; - LISTBOX_DeleteItem( descr, index ); - - if (!descr->nb_items) return LB_OKAY; - - /* Remove the item */ + if (is_singlesel_NODATA(descr)) + { + if (!descr->nb_items) + { + SendMessageW(descr->self, LB_RESETCONTENT, 0, 0); + return LB_OKAY; + } + } + else + { + LISTBOX_DeleteItem( descr, index ); - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item, item + 1, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - if (descr->anchor_item == descr->nb_items) descr->anchor_item--; + if (!descr->nb_items) return LB_OKAY; - /* Shrink the item array if possible */ + /* Remove the item */ + item = &descr->items[index]; + if (index < descr->nb_items) + RtlMoveMemory( item, item + 1, + (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); - if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) - { - max_items -= LB_ARRAY_GRANULARITY; - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - max_items * sizeof(LB_ITEMDATA) ); - if (item) descr->items = item; + /* Shrink the item array if possible */ + max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) + { + max_items -= LB_ARRAY_GRANULARITY; + item = HeapReAlloc( GetProcessHeap(), 0, descr->items, + max_items * sizeof(LB_ITEMDATA) ); + if (item) descr->items = item; + } } + descr->anchor_item = min(descr->anchor_item, descr->nb_items - 1); + /* Repaint the items */ LISTBOX_UpdateScroll( descr ); @@ -1737,7 +1826,8 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) { INT i; - for(i = descr->nb_items - 1; i>=0; i--) LISTBOX_DeleteItem( descr, i); + if (!is_singlesel_NODATA(descr)) + for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); HeapFree( GetProcessHeap(), 0, descr->items ); descr->nb_items = 0; descr->top_item = 0; @@ -1753,22 +1843,52 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) */ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) { - LRESULT ret; + INT orig_num; if (!(descr->style & LBS_NODATA)) return LB_ERR; + count = max(count, 0); - /* FIXME: this is far from optimal... */ if (count > descr->nb_items) { - while (count > descr->nb_items) - if ((ret = LISTBOX_InsertString( descr, -1, 0 )) < 0) - return ret; + if ((descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) && + !NODATA_multisel_expand(descr, count)) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return LB_ERRSPACE; + } + orig_num = descr->nb_items; + descr->nb_items = count; + + LISTBOX_UpdateScroll(descr); + LISTBOX_InvalidateItems(descr, orig_num); + + /* If listbox was empty, set focus to the first item */ + if (orig_num == 0) LISTBOX_SetCaretIndex(descr, 0, FALSE); } else if (count < descr->nb_items) { - while (count < descr->nb_items) - if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) - return ret; + LISTBOX_InvalidateItems(descr, count); + orig_num = descr->nb_items; + descr->nb_items = count; + + if (count == 0) SendMessageW(descr->self, LB_RESETCONTENT, 0, 0); + else + { + descr->anchor_item = min(descr->anchor_item, count - 1); + + if (descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) + NODATA_multisel_shrink(descr, orig_num); + else if (descr->selected_item >= descr->nb_items) + descr->selected_item = -1; + + LISTBOX_UpdateScroll(descr); + + /* If we removed the scrollbar, reset the top of the list */ + if (descr->nb_items <= descr->page_size && orig_num > descr->page_size) + LISTBOX_SetTopItem(descr, 0, TRUE); + + descr->focus_item = min(descr->focus_item, descr->nb_items - 1); + } } InvalidateRect( descr->self, NULL, TRUE ); @@ -2763,6 +2883,8 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; + if (is_singlesel_NODATA(descr)) + return NODATA_is_sel(descr, wParam); return descr->items[wParam].selected; case LB_SETSEL: -- 2.19.1

2 5

[PATCH] include: Add qos2.h
by Gijs Vermeulen 21 Nov '18

21 Nov '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/qos2.h | 104 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 include/qos2.h diff --git a/include/qos2.h b/include/qos2.h new file mode 100644 index 0000000000..2ae0f2f43d --- /dev/null +++ b/include/qos2.h @@ -0,0 +1,104 @@ +/* + * Copyright 2018 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_QOS2_H__ +#define __WINE_QOS2_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define QOSSetTrafficType 0 +#define QOSSetOutgoingRate 1 +#define QOSSetOutgoingDSCPValue 2 + +typedef UINT32 QOS_FLOWID; + +typedef enum _QOS_SHAPING { + QOSShapeOnly = 0, + QOSShapeAndMark = 1, + QOSUseNonConformantMarkings = 2 +} QOS_SHAPING, *PQOS_SHAPING; + +typedef enum _QOS_FLOWRATE_REASON { + QOSFlowRateNotApplicable = 0, + QOSFlowRateContentChange = 1, + QOSFlowRateCongestion = 2, + QOSFlowRateHigherContentEncoding = 3, + QOSFlowRateUserCaused = 4 +} QOS_FLOWRATE_REASON, PQOS_FLOWRATE_REASON; + +typedef enum _QOS_NOTIFY_FLOW { + QOSNotifyCongested = 0, + QOSNotifyUncongested = 1, + QOSNotifyAvailable = 2 +} QOS_NOTIFY_FLOW, *PQOS_NOTIFY_FLOW; + +typedef enum _QOS_QUERY_FLOW { + QOSQueryFlowFundamentals = 0, + QOSQueryPacketPriority = 1, + QOSQueryOutgoingRate = 2 +} QOS_QUERY_FLOW; + +typedef enum _QOS_SET_FLOW { + QOSSetTrafficType = 0, + QOSSetOutgoingRate = 1, + QOSSetOutgoingDSCPValue = 2 +} QOS_SET_FLOW, *PQOS_SET_FLOW; + +typedef enum _QOS_TRAFFIC_TYPE { + QOSTrafficTypeBestEffort, + QOSTrafficTypeBackground, + QOSTrafficTypeExcellentEffort, + QOSTrafficTypeAudioVideo, + QOSTrafficTypeVoice, + QOSTrafficTypeControl +} QOS_TRAFFIC_TYPE, *PQOS_TRAFFIC_TYPE; + +typedef struct _QOS_FLOW_FUNDAMENTALS { + BOOL BottleneckBandwidthSet; + UINT64 BottleneckBandwidth; + BOOL AvailableBandwidthSet; + UINT64 AvailableBandwidth; + BOOL RTTSet; + UINT32 RTT; +} QOS_FLOW_FUNDAMENTALS, *PQOS_FLOW_FUNDAMENTALS; + +typedef struct _QOS_FLOWRATE_OUTGOING { + UINT64 Bandwidth; + QOS_SHAPING ShapingBehavior; + QOS_FLOWRATE_REASON Reason; +} QOS_FLOWRATE_OUTGOING, *PQOS_FLOWRATE_OUTGOING; + +typedef struct _QOS_PACKET_PRIORITY { + ULONG ConformantDSCPValue; + ULONG NonConformantDSCPValue; + ULONG ConformantL2Value; + ULONG NonConformantL2Value; +} QOS_PACKET_PRIORITY, *PQOS_PACKET_PRIORITY; + +typedef struct _QOS_VERSION { + USHORT MajorVersion; + USHORT MinorVersion; +} QOS_VERSION, *PQOS_VERSION; + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_QOS2_H__ */ -- 2.19.1

1 0

[PATCH 1/3] setupapi/tests: Remove workarounds in testGetDeviceInstanceId().
by Zebediah Figura 21 Nov '18

21 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 115 ++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 60 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f5d0f8cc95..7ae198a169 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -47,7 +47,6 @@ static HKEY (WINAPI *pSetupDiOpenDevRegKey)(HDEVINFO, PSP_DEVINFO_DATA, DWOR static HKEY (WINAPI *pSetupDiCreateDevRegKeyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR); static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiCreateDeviceInfoW)(HDEVINFO, PCWSTR, GUID *, PCWSTR, HWND, DWORD, PSP_DEVINFO_DATA); -static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DATA, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); @@ -77,7 +76,6 @@ static void init_function_pointers(void) pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiEnumDeviceInterfaces = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInterfaces"); - pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); pSetupDiGetDeviceInterfaceDetailA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailA"); pSetupDiGetDeviceInterfaceDetailW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailW"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); @@ -473,71 +471,68 @@ todo_wine { SetupDiDestroyDeviceInfoList(set); } -static void testGetDeviceInstanceId(void) +static void test_get_device_instance_id(void) { BOOL ret; HDEVINFO set; - SP_DEVINFO_DATA devInfo = { 0 }; + SP_DEVINFO_DATA device = {0}; + char id[200]; + DWORD size; SetLastError(0xdeadbeef); - ret = pSetupDiGetDeviceInstanceIdA(NULL, NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %08x\n", GetLastError()); + ret = SetupDiGetDeviceInstanceIdA(NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); - ret = pSetupDiGetDeviceInstanceIdA(NULL, &devInfo, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %08x\n", GetLastError()); - set = pSetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %08x\n", - GetLastError()); - if (set) - { - char instanceID[MAX_PATH]; - DWORD size; + ret = SetupDiGetDeviceInstanceIdA(NULL, &device, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiGetDeviceInstanceIdA(set, NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - devInfo.cbSize = sizeof(devInfo); - SetLastError(0xdeadbeef); - ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, - NULL, NULL, 0, &devInfo); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); - ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, instanceID, - sizeof(instanceID), NULL); - ok(ret, "SetupDiGetDeviceInstanceIdA failed: %08x\n", GetLastError()); - ok(!lstrcmpA(instanceID, "ROOT\\LEGACY_BOGUS\\0000"), - "Unexpected instance ID %s\n", instanceID); - ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, - NULL, NULL, DICD_GENERATE_ID, &devInfo); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); - ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, instanceID, - sizeof(instanceID), NULL); - ok(ret, "SetupDiGetDeviceInstanceIdA failed: %08x\n", GetLastError()); - /* NT4 returns 'Root' and W2K and above 'ROOT' */ - ok(!lstrcmpiA(instanceID, "ROOT\\LEGACY_BOGUS\\0001"), - "Unexpected instance ID %s\n", instanceID); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); - ret = pSetupDiRemoveDevice(set, &devInfo); - todo_wine ok(ret, "got %u\n", GetLastError()); - pSetupDiDestroyDeviceInfoList(set); - } + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstanceIdA(set, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstanceIdA(set, &device, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstanceIdA(set, &device, NULL, 0, &size); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + device.cbSize = sizeof(device); + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstanceIdA(set, &device, NULL, 0, &size); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstanceIdA(set, &device, NULL, 0, &size); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Failed to get device id, error %#x.\n", GetLastError()); + ok(!strcmp(id, "ROOT\\LEGACY_BOGUS\\0000"), "Got unexpected id %s.\n", id); + + ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Failed to get device id, error %#x.\n", GetLastError()); + ok(!strcmp(id, "ROOT\\LEGACY_BOGUS\\0001"), "Got unexpected id %s.\n", id); + + SetupDiDestroyDeviceInfoList(set); } static void testRegisterDeviceInfo(void) @@ -1521,7 +1516,7 @@ START_TEST(devinst) test_install_class(); test_device_info(); - testGetDeviceInstanceId(); + test_get_device_instance_id(); testRegisterDeviceInfo(); testCreateDeviceInterface(); testGetDeviceInterfaceDetail(); -- 2.14.1

1 2

[PATCH] xinput: Make exported functions hot-patchable.
by Zebediah Figura 21 Nov '18

21 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46142 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/xinput1_3/xinput_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index f6e3e15568..c412887ad7 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -71,7 +71,7 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) } } -DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) +DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) { TRACE("(index %u, vibration %p)\n", index, vibration); @@ -126,7 +126,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state return xinput_get_state(index, state); } -DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) { static int warn_once; @@ -141,7 +141,7 @@ DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE k return ERROR_NOT_SUPPORTED; } -DWORD WINAPI XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES* capabilities) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES* capabilities) { TRACE("(index %u, flags 0x%x, capabilities %p)\n", index, flags, capabilities); @@ -159,7 +159,7 @@ DWORD WINAPI XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES return ERROR_SUCCESS; } -DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD index, GUID* render_guid, GUID* capture_guid) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID* render_guid, GUID* capture_guid) { FIXME("(index %u, render guid %p, capture guid %p) Stub!\n", index, render_guid, capture_guid); @@ -171,7 +171,7 @@ DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD index, GUID* render_guid, GUI return ERROR_NOT_SUPPORTED; } -DWORD WINAPI XInputGetBatteryInformation(DWORD index, BYTE type, XINPUT_BATTERY_INFORMATION* battery) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE type, XINPUT_BATTERY_INFORMATION* battery) { static int once; -- 2.19.1

1 0

[PATCH 1/3] hlink: Use clearer variable names in IHlink_fnNavigate().
by Zebediah Figura 21 Nov '18

21 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- "pbc" is a bit of an unfortunate choice in a function that includes "bind context", "bind status callback", and "browse context". dlls/hlink/link.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 25ee45d7c7..db7f0c3932 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -472,32 +472,33 @@ static HRESULT WINAPI IHlink_fnGetMiscStatus(IHlink* iface, DWORD* pdwStatus) return E_NOTIMPL; } -static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, - IBindStatusCallback *pbsc, IHlinkBrowseContext *phbc) +static HRESULT WINAPI IHlink_fnNavigate(IHlink *iface, DWORD flags, IBindCtx *user_bind_ctx, + IBindStatusCallback *bind_callback, IHlinkBrowseContext *browse_ctx) { - HlinkImpl *This = impl_from_IHlink(iface); + HlinkImpl *This = impl_from_IHlink(iface); IMoniker *mon = NULL; HRESULT r; - FIXME("Semi-Stub:(%p)->(%i %p %p %p)\n", This, grfHLNF, pbc, pbsc, phbc); + TRACE("hlink %p, flags %#x, user_bind_ctx %p, bind_callback %p, browse_ctx %p.\n", + This, flags, user_bind_ctx, bind_callback, browse_ctx); r = __GetMoniker(This, &mon, HLINKGETREF_ABSOLUTE); TRACE("Moniker %p\n", mon); if (SUCCEEDED(r)) { - IBindCtx *bcxt = NULL; + IBindCtx *bind_ctx = NULL; IUnknown *unk = NULL; IHlinkTarget *target; - if (phbc) + if (browse_ctx) { - r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk); + r = IHlinkBrowseContext_GetObject(browse_ctx, mon, TRUE, &unk); if (r != S_OK) { - CreateBindCtx(0, &bcxt); - RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); - r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IUnknown, (void**)&unk); + CreateBindCtx(0, &bind_ctx); + RegisterBindStatusCallback(bind_ctx, bind_callback, NULL, 0); + r = IMoniker_BindToObject(mon, bind_ctx, NULL, &IID_IUnknown, (void**)&unk); } if (r == S_OK) { @@ -506,13 +507,13 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, } if (r == S_OK) { - if (bcxt) IHlinkTarget_SetBrowseContext(target, phbc); - r = IHlinkTarget_Navigate(target, grfHLNF, This->Location); + if (bind_ctx) IHlinkTarget_SetBrowseContext(target, browse_ctx); + r = IHlinkTarget_Navigate(target, flags, This->Location); IHlinkTarget_Release(target); } - RevokeBindStatusCallback(bcxt, pbsc); - if (bcxt) IBindCtx_Release(bcxt); + RevokeBindStatusCallback(bind_ctx, bind_callback); + if (bind_ctx) IBindCtx_Release(bind_ctx); } else { -- 2.19.1

1 2

[PATCH] api-ms-win-core-libraryloader-l1-2-1: Sync spec file
by Alistair Leslie-Hughes 21 Nov '18

21 Nov '18

File version 6.3.9600.16384 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46101 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../api-ms-win-core-libraryloader-l1-2-1.spec | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec index 95a765f7528..4cc3358eed5 100644 --- a/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec +++ b/dlls/api-ms-win-core-libraryloader-l1-2-1/api-ms-win-core-libraryloader-l1-2-1.spec @@ -1,3 +1,29 @@ -@ stdcall FindResourceW(long wstr wstr) kernel32.FindResourceW +@ stdcall AddDllDirectory(wstr) kernel32.AddDllDirectory +@ stdcall DisableThreadLibraryCalls(long) kernel32.DisableThreadLibraryCalls +@ stdcall EnumResourceLanguagesExA(long str str ptr long long long) kernel32.EnumResourceLanguagesExA +@ stdcall EnumResourceLanguagesExW(long wstr wstr ptr long long long) kernel32.EnumResourceLanguagesExW +@ stub EnumResourceNamesExA +@ stub EnumResourceNamesExW +@ stub EnumResourceTypesExA +@ stub EnumResourceTypesExW +@ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW +@ stdcall FindStringOrdinal(long wstr long wstr long long) kernel32.FindStringOrdinal +@ stdcall FreeLibrary(long) kernel32.FreeLibrary +@ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread +@ stdcall FreeResource(long) kernel32.FreeResource +@ stdcall GetModuleFileNameA(long ptr long) kernel32.GetModuleFileNameA +@ stdcall GetModuleFileNameW(long ptr long) kernel32.GetModuleFileNameW +@ stdcall GetModuleHandleA(str) kernel32.GetModuleHandleA +@ stdcall GetModuleHandleExA(long ptr ptr) kernel32.GetModuleHandleExA +@ stdcall GetModuleHandleExW(long ptr ptr) kernel32.GetModuleHandleExW +@ stdcall GetModuleHandleW(wstr) kernel32.GetModuleHandleW +@ stdcall GetProcAddress(long str) kernel32.GetProcAddress +@ stdcall LoadLibraryExA( str long long) kernel32.LoadLibraryExA +@ stdcall LoadLibraryExW(wstr long long) kernel32.LoadLibraryExW +@ stdcall LoadResource(long long) kernel32.LoadResource @ stdcall LoadLibraryA(str) kernel32.LoadLibraryA @ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW +@ stdcall LockResource(long) kernel32.LockResource +@ stdcall RemoveDllDirectory(ptr) kernel32.RemoveDllDirectory +@ stdcall SetDefaultDllDirectories(long) kernel32.SetDefaultDllDirectories +@ stdcall SizeofResource(long long) kernel32.SizeofResource -- 2.19.1

1 0

[PATCH] include: Add IMFSequencerSource interface
by Alistair Leslie-Hughes 20 Nov '18

20 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mfidl.idl | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 84be055d09b..45d52fc7293 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -21,6 +21,7 @@ import "mftransform.idl"; typedef unsigned __int64 TOPOID; typedef LONGLONG MFTIME; +typedef DWORD MFSequencerElementId; typedef enum MF_TOPOLOGY_TYPE { @@ -250,6 +251,60 @@ interface IMFGetService : IUnknown ); } +[ + object, + uuid(03cb2711-24d7-4db6-a17f-f3a7a479a536), +] +interface IMFPresentationDescriptor : IMFAttributes +{ + HRESULT GetStreamDescriptorCount( + [out] DWORD *count ); + + HRESULT GetStreamDescriptorByIndex( + [in] DWORD index, + [out] BOOL *selected, + [out] IMFStreamDescriptor **descriptor ); + + HRESULT SelectStream( + [in] DWORD index ); + + HRESULT DeselectStream( + [in] DWORD index ); + + HRESULT Clone( + [out] IMFPresentationDescriptor **descriptor ); +} + +[ + object, + uuid(197cd219-19cb-4de1-a64c-acf2edcbe59e), + local +] +interface IMFSequencerSource : IUnknown +{ + HRESULT AppendTopology( + [in] IMFTopology *topology, + [in] DWORD flags, + [out] MFSequencerElementId *element ); + + HRESULT DeleteTopology( + [in] MFSequencerElementId element); + + HRESULT GetPresentationContext( + [in] IMFPresentationDescriptor *pd, + [out, optional] MFSequencerElementId *id, + [out, optional] IMFTopology **topology ); + + HRESULT UpdateTopology( + [in] MFSequencerElementId od, + [in] IMFTopology *topology); + + HRESULT UpdateTopologyFlags( + [in] MFSequencerElementId id, + [in] DWORD flags ); + +}; + cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") -- 2.19.1

1 0

[PATCH v3] mfplat: Improve CreateObjectFromByteStream stub in IMFSourceResolver.
by Sven Baars 20 Nov '18

20 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v3: Don't submit the first two patches of the series. dlls/mfplat/main.c | 187 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 78 +++++++++++++++- include/mfidl.idl | 47 ++++++++++ 3 files changed, 310 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 46a697538c..62461bb5f7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1315,6 +1315,174 @@ HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) return S_OK; } +typedef struct _mfsource +{ + IMFMediaSource IMFMediaSource_iface; + LONG ref; +} mfsource; + +static inline mfsource *impl_from_IMFMediaSource(IMFMediaSource *iface) +{ + return CONTAINING_RECORD(iface, mfsource, IMFMediaSource_iface); +} + +static HRESULT WINAPI mfsource_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSource) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &This->IMFMediaSource_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfsource_AddRef(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsource_Release(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfsource_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p)\n", This, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", This, characteristics); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p): stub\n", This, descriptor); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, + const GUID *time_format, const PROPVARIANT *start_position) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p)->(%p, %p, %p): stub\n", This, descriptor, time_format, start_position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_Stop(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_Pause(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsource_Shutdown(IMFMediaSource *iface) +{ + mfsource *This = impl_from_IMFMediaSource(iface); + + FIXME("(%p): stub\n", This); + + return S_OK; +} + +static const IMFMediaSourceVtbl mfsourcevtbl = +{ + mfsource_QueryInterface, + mfsource_AddRef, + mfsource_Release, + mfsource_GetEvent, + mfsource_BeginGetEvent, + mfsource_EndGetEvent, + mfsource_QueueEvent, + mfsource_GetCharacteristics, + mfsource_CreatePresentationDescriptor, + mfsource_Start, + mfsource_Stop, + mfsource_Pause, + mfsource_Shutdown, +}; + typedef struct _mfsourceresolver { IMFSourceResolver IMFSourceResolver_iface; @@ -1388,6 +1556,25 @@ static HRESULT WINAPI mfsourceresolver_CreateObjectFromByteStream(IMFSourceResol FIXME("(%p)->(%p, %s, %#x, %p, %p, %p): stub\n", This, stream, debugstr_w(url), flags, props, obj_type, object); + if (!stream || !obj_type || !object) + return E_POINTER; + + if (flags & MF_RESOLUTION_MEDIASOURCE) + { + mfsource *new_object; + + new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + if (!new_object) + return E_OUTOFMEMORY; + + new_object->IMFMediaSource_iface.lpVtbl = &mfsourcevtbl; + new_object->ref = 1; + + *object = (IUnknown *)&new_object->IMFMediaSource_iface; + *obj_type = MF_OBJECT_MEDIASOURCE; + return S_OK; + } + return E_NOTIMPL; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 48a8d0d361..d0f7ea4c98 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -42,6 +42,8 @@ static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(MF_BYTESTREAM_CONTENT_TYPE, 0xfc358289,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a); + DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x87,0x47,0x75,0x6f); @@ -200,7 +202,14 @@ if(0) static void test_source_resolver(void) { IMFSourceResolver *resolver, *resolver2; + IMFByteStream *bytestream; + IMFAttributes *attributes; + IMFMediaSource *mediasource; + MF_OBJECT_TYPE obj_type; HRESULT hr; + WCHAR *filename; + + static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; if (!pMFCreateSourceResolver) { @@ -208,6 +217,9 @@ static void test_source_resolver(void) return; } + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pMFCreateSourceResolver(NULL); ok(hr == E_POINTER, "got %#x\n", hr); @@ -218,8 +230,70 @@ static void test_source_resolver(void) ok(hr == S_OK, "got %#x\n", hr); ok(resolver != resolver2, "Expected new instance\n"); - IMFSourceResolver_Release(resolver); IMFSourceResolver_Release(resolver2); + + filename = load_resource(mp4file); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, NULL, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&mediasource); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + NULL, (IUnknown **)&mediasource); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&mediasource); + todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + if (hr == S_OK) IMFMediaSource_Release(mediasource); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_BYTESTREAM, NULL, + &obj_type, (IUnknown **)&mediasource); + todo_wine ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); + + IMFByteStream_Release(bytestream); + + /* We have to create a new bytestream here, because all following + * calls to CreateObjectFromByteStream will fail. */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, file_type); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + IMFAttributes_Release(attributes); + + hr = IMFSourceResolver_CreateObjectFromByteStream( + resolver, bytestream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&mediasource); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mediasource != NULL, "got %p\n", mediasource); + ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); + + IMFMediaSource_Release(mediasource); + IMFByteStream_Release(bytestream); + + IMFSourceResolver_Release(resolver); + + MFShutdown(); + + DeleteFileW(filename); } static void init_functions(void) @@ -619,7 +693,6 @@ START_TEST(mfplat) init_functions(); test_register(); - test_source_resolver(); test_MFCreateMediaType(); test_MFCreateMediaEvent(); test_MFCreateAttributes(); @@ -627,6 +700,7 @@ START_TEST(mfplat) test_MFCreateFile(); test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); + test_source_resolver(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 84be055d09..ac5acc50f5 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -212,6 +212,53 @@ interface IMFStreamDescriptor : IMFAttributes HRESULT GetMediaTypeHandler([out] IMFMediaTypeHandler **handler); } +[ + object, + uuid(03cb2711-24d7-4db6-a17f-f3a7a479a536), +] +interface IMFPresentationDescriptor : IMFAttributes +{ + HRESULT GetStreamDescriptorCount([out] DWORD *pdwDescriptorCount); + HRESULT GetStreamDescriptorByIndex([in] DWORD dwIndex, [out] BOOL *pfSelected, [out] IMFStreamDescriptor **ppDescriptor); + HRESULT SelectStream([in] DWORD dwDescriptorIndex); + HRESULT DeselectStream([in] DWORD dwDescriptorIndex); + HRESULT Clone([out] IMFPresentationDescriptor **ppPresentationDescriptor); +} + +[ + object, + uuid(279a808d-aec7-40c8-9c6b-a6b492c78a66), +] +interface IMFMediaSource : IMFMediaEventGenerator +{ + HRESULT GetCharacteristics([out] DWORD *pdwCharacteristics); + + [local] + HRESULT CreatePresentationDescriptor([out] IMFPresentationDescriptor **ppPresentationDescriptor); + [call_as(CreatePresentationDescriptor)] + HRESULT RemoteCreatePresentationDescriptor( + [out] DWORD *pcbPD, + [out, size_is(,*pcbPD)] BYTE **pbPD, + [out] IMFPresentationDescriptor **ppRemotePD); + + HRESULT Start( + [in] IMFPresentationDescriptor *pPresentationDescriptor, + [in, unique] const GUID *pguidTimeFormat, + [in, unique] const PROPVARIANT *pvarStartPosition); + + HRESULT Stop(); + HRESULT Pause(); + HRESULT Shutdown(); +} + +cpp_quote("#define MF_RESOLUTION_MEDIASOURCE 0x00000001") +cpp_quote("#define MF_RESOLUTION_BYTESTREAM 0x00000002") +cpp_quote("#define MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE 0x00000010") +cpp_quote("#define MF_RESOLUTION_KEEP_BYTE_STREAM_ALIVE_ON_FAIL 0x00000020") +cpp_quote("#define MF_RESOLUTION_READ 0x00010000") +cpp_quote("#define MF_RESOLUTION_WRITE 0x00020000") +cpp_quote("#define MF_RESOLUTION_DISABLE_LOCAL_PLUGINS 0x00000040") + [ object, uuid(f6696e82-74f7-4f3d-a178-8a5e09c3659f) -- 2.17.1

1 0

[PATCH 6/6] d3dx9: Try to use IDirect3DDevice9_StretchRect() in D3DXLoadSurfaceFromSurface().
by Henri Verbeet 20 Nov '18

20 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Unmodified resend of patch 154372. --- dlls/d3dx9_36/surface.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 3cf8c60d6ab..11a0ee1a2fe 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1925,6 +1925,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { IDirect3DSurface9 *surface = src_surface; + D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; D3DSURFACE_DESC src_desc; D3DLOCKED_RECT lock; @@ -1939,6 +1940,37 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, if (!dst_surface || !src_surface) return D3DERR_INVALIDCALL; + if (!dst_palette && !src_palette && !color_key) + { + switch (filter) + { + case D3DX_FILTER_NONE: + d3d_filter = D3DTEXF_NONE; + break; + + case D3DX_FILTER_POINT: + d3d_filter = D3DTEXF_POINT; + break; + + case D3DX_FILTER_LINEAR: + d3d_filter = D3DTEXF_LINEAR; + break; + + default: + d3d_filter = ~0u; + break; + } + + if (d3d_filter != ~0u) + { + IDirect3DSurface9_GetDevice(src_surface, &device); + hr = IDirect3DDevice9_StretchRect(device, src_surface, src_rect, dst_surface, dst_rect, d3d_filter); + IDirect3DDevice9_Release(device); + if (SUCCEEDED(hr)) + return D3D_OK; + } + } + IDirect3DSurface9_GetDesc(src_surface, &src_desc); if (!src_rect) -- 2.11.0

3 2

[PATCH 5/6] d3dx9: Use intermediate surfaces for loading from unmappable source surfaces in D3DXLoadSurfaceFromSurface().
by Henri Verbeet 20 Nov '18

20 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 154371. v2: Avoid leaking the surface on the StretchRect() error path. Only bother creating an intermediate surface if mapping the source surface actually failed. --- dlls/d3dx9_36/surface.c | 43 +++++++++++++++++++++++++++++++------------ dlls/d3dx9_36/tests/surface.c | 4 ---- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 7d48cc6b132..3cf8c60d6ab 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1924,10 +1924,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { - RECT rect; + IDirect3DSurface9 *surface = src_surface; + IDirect3DDevice9 *device; + D3DSURFACE_DESC src_desc; D3DLOCKED_RECT lock; - D3DSURFACE_DESC SrcDesc; HRESULT hr; + RECT s; TRACE("dst_surface %p, dst_palette %p, dst_rect %s, src_surface %p, " "src_palette %p, src_rect %s, filter %#x, color_key 0x%08x.\n", @@ -1937,23 +1939,40 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, if (!dst_surface || !src_surface) return D3DERR_INVALIDCALL; - IDirect3DSurface9_GetDesc(src_surface, &SrcDesc); + IDirect3DSurface9_GetDesc(src_surface, &src_desc); if (!src_rect) - SetRect(&rect, 0, 0, SrcDesc.Width, SrcDesc.Height); - else - rect = *src_rect; + { + SetRect(&s, 0, 0, src_desc.Width, src_desc.Height); + src_rect = &s; + } - if (FAILED(IDirect3DSurface9_LockRect(src_surface, &lock, NULL, D3DLOCK_READONLY))) + if (FAILED(IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY))) { - FIXME("Called for unlockable source surface.\n"); - return D3DXERR_INVALIDDATA; + IDirect3DSurface9_GetDevice(src_surface, &device); + if (FAILED(IDirect3DDevice9_CreateRenderTarget(device, src_desc.Width, src_desc.Height, + src_desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL))) + { + IDirect3DDevice9_Release(device); + return D3DXERR_INVALIDDATA; + } + + if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, surface, NULL, D3DTEXF_NONE))) + hr = IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + { + IDirect3DSurface9_Release(surface); + return D3DXERR_INVALIDDATA; + } } - hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, - lock.pBits, SrcDesc.Format, lock.Pitch, src_palette, &rect, filter, color_key); + hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, + src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - IDirect3DSurface9_UnlockRect(src_surface); + IDirect3DSurface9_UnlockRect(surface); + if (surface != src_surface) + IDirect3DSurface9_Release(surface); return hr; } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index f153cd92c65..d3450722ef7 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -869,16 +869,12 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0xff000000); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_TRIANGLE | D3DX_FILTER_MIRROR, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_LINEAR, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); IDirect3DSurface9_Release(newsurf); -- 2.11.0

3 2

[v2 PATCH 1/3] gdi32: Improve GetFontFileInfo() compatibility.
by Nikolay Sivov 20 Nov '18

20 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/gdiinterop.c | 4 +- dlls/gdi32/freetype.c | 6 +- dlls/gdi32/tests/font.c | 266 ++++++++++++++++++++++++++++++++------- 3 files changed, 229 insertions(+), 47 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ad95e94959..5501f377c4 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -727,7 +727,7 @@ struct font_fileinfo { /* Undocumented gdi32 exports, used to access actually selected font information */ extern BOOL WINAPI GetFontRealizationInfo(HDC hdc, struct font_realization_info *info); -extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed); +extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed); static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface, HDC hdc, IDWriteFontFace **fontface) @@ -740,7 +740,7 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface IDWriteFontFile *file; BOOL is_supported; UINT32 facenum; - DWORD needed; + SIZE_T needed; HRESULT hr; TRACE("(%p)->(%p %p)\n", This, hdc, fontface); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3fc41c3241..1f46fc809f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8576,9 +8576,10 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) /************************************************************************* * GetFontFileInfo (GDI32.@) */ -BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed ) +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed ) { struct font_handle_entry *entry = handle_entry( instance_id ); + SIZE_T required_size; const GdiFont *font; if (!entry) @@ -8587,6 +8588,9 @@ BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_filei return FALSE; } + if (!needed) + needed = &required_size; + font = entry->obj; *needed = sizeof(*info) + strlenW(font->fileinfo->path) * sizeof(WCHAR); if (*needed > size) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4f10e2f38d..73d6b8ea40 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <assert.h> #include "windef.h" @@ -59,7 +60,7 @@ static BOOL (WINAPI *pRemoveFontMemResourceEx)(HANDLE); static INT (WINAPI *pAddFontResourceExA)(LPCSTR, DWORD, PVOID); static BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR, DWORD, PVOID); static BOOL (WINAPI *pGetFontRealizationInfo)(HDC hdc, DWORD *); -static BOOL (WINAPI *pGetFontFileInfo)(DWORD, DWORD, void *, DWORD, DWORD *); +static BOOL (WINAPI *pGetFontFileInfo)(DWORD, DWORD, void *, SIZE_T, SIZE_T *); static BOOL (WINAPI *pGetFontFileData)(DWORD, DWORD, ULONGLONG, void *, DWORD); static HMODULE hgdi32 = 0; @@ -4254,41 +4255,43 @@ todo_wine DeleteDC(hdc); } -static void test_RealizationInfo(void) +struct font_realization_info { - struct font_realization_info { - DWORD size; - DWORD flags; - DWORD cache_num; - DWORD instance_id; - DWORD unk; - WORD face_index; - WORD simulations; - }; + DWORD size; + DWORD flags; + DWORD cache_num; + DWORD instance_id; + DWORD unk; + WORD face_index; + WORD simulations; +}; + +struct file_info +{ + FILETIME time; + LARGE_INTEGER size; + WCHAR path[MAX_PATH]; +}; +static void test_RealizationInfo(void) +{ struct realization_info_t { DWORD flags; DWORD cache_num; DWORD instance_id; }; - + struct file_info file_info; HDC hdc; - DWORD info[4], info2[10]; - BOOL r, have_file = FALSE; + DWORD info[4], info2[32], read; HFONT hfont, hfont_old; + SIZE_T needed; LOGFONTA lf; - DWORD needed, read; HANDLE h; BYTE file[16], data[14]; - struct file_info - { - FILETIME time; - LARGE_INTEGER size; - WCHAR path[MAX_PATH]; - } file_info; FILETIME time; LARGE_INTEGER size; + BOOL r; if(!pGdiRealizationInfo) { @@ -4374,11 +4377,11 @@ static void test_RealizationInfo(void) needed = 0; r = pGetFontFileInfo(fri->instance_id, 0, &file_info, sizeof(file_info), &needed); - ok(r != 0 || GetLastError() == ERROR_NOACCESS, "ret %d gle %d\n", r, GetLastError()); + ok(r != 0, "Failed to get font file info, error %d.\n", GetLastError()); if (r) { - ok(needed > 0 && needed < sizeof(file_info), "got needed size %u\n", needed); + ok(needed > 0 && needed < sizeof(file_info), "Unexpected required size.\n"); h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); @@ -4391,7 +4394,6 @@ static void test_RealizationInfo(void) /* Read first 16 bytes from the file */ ReadFile(h, file, sizeof(file), &read, NULL); CloseHandle(h); - have_file = TRUE; /* shorter buffer */ SetLastError(0xdeadbeef); @@ -4404,10 +4406,7 @@ static void test_RealizationInfo(void) r = pGetFontFileData(fri->instance_id, 0, 2, data, sizeof(data)); ok(r != 0, "ret 0 gle %d\n", GetLastError()); - if (have_file) - ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); - else - win_skip("GetFontFileInfo() failed, skipping\n"); + ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); } } @@ -5049,9 +5048,14 @@ static void *load_font(const char *font_name, DWORD *font_size) HANDLE file, mapping; void *font; - if (!GetWindowsDirectoryA(file_name, sizeof(file_name))) return NULL; - strcat(file_name, "\\fonts\\"); - strcat(file_name, font_name); + if (font_name[1] == ':') + strcpy(file_name, font_name); + else + { + if (!GetWindowsDirectoryA(file_name, sizeof(file_name))) return NULL; + strcat(file_name, "\\fonts\\"); + strcat(file_name, font_name); + } file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) return NULL; @@ -5072,8 +5076,120 @@ static void *load_font(const char *font_name, DWORD *font_size) return font; } +static void test_realization_info(const char *name, DWORD size, BOOL is_memory_resource) +{ + struct font_realization_info info; + struct file_info file_info; + HFONT hfont, hfont_prev; + SIZE_T needed; + LOGFONTA lf; + BYTE *data; + BOOL ret; + HDC hdc; + + if (!pGetFontRealizationInfo) + return; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + strcpy(lf.lfFaceName, name); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "Failed to create a font, %u.\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "Failed to select font.\n"); + + memset(&info, 0xcc, sizeof(info)); + info.size = sizeof(info); + ret = pGetFontRealizationInfo(hdc, (DWORD *)&info); + ok(ret != 0, "Unexpected return value %d.\n", ret); + + ok((info.flags & 0xf) == 0x3, "Unexpected flags %#x.\n", info.flags); + ok(info.cache_num != 0, "Unexpected cache num %u.\n", info.cache_num); + ok(info.instance_id != 0, "Unexpected instance id %u.\n", info.instance_id); + ok(info.simulations == 0, "Unexpected simulations %#x.\n", info.simulations); + ok(info.face_index == 0, "Unexpected face index %u.\n", info.face_index); + + ret = pGetFontFileInfo(info.instance_id, 0, NULL, 0, NULL); + ok(ret == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected return value %d, error %d.\n", + ret, GetLastError()); + + needed = 0; + ret = pGetFontFileInfo(info.instance_id, 0, NULL, 0, &needed); + ok(ret == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected return value %d, error %d.\n", + ret, GetLastError()); + + ret = pGetFontFileInfo(info.instance_id, 0, &file_info, 0, NULL); + ok(ret == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected return value %d, error %d.\n", + ret, GetLastError()); + + ret = pGetFontFileInfo(info.instance_id, 0, &file_info, needed - 1, NULL); + ok(ret == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected return value %d, error %d.\n", + ret, GetLastError()); + + ret = pGetFontFileInfo(info.instance_id, 0, &file_info, needed, NULL); + ok(ret != 0, "Failed to get font file info, ret %d gle %d.\n", ret, GetLastError()); + + memset(&file_info, 0xcc, sizeof(file_info)); + ret = pGetFontFileInfo(info.instance_id, 0, &file_info, sizeof(file_info), NULL); + ok(ret != 0, "Failed to get font file info, ret %d gle %d.\n", ret, GetLastError()); + if (ret) + { + todo_wine_if(is_memory_resource) + ok(is_memory_resource ? file_info.size.QuadPart == size : file_info.size.QuadPart > 0, "Unexpected file size.\n"); + ok(is_memory_resource ? !file_info.path[0] : file_info.path[0], "Unexpected file path %s.\n", + wine_dbgstr_w(file_info.path)); + } + +if (pGetFontFileData) +{ + size = file_info.size.LowPart; + data = HeapAlloc(GetProcessHeap(), 0, size + 16); + + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 0, data, size); + ok(ret != 0, "Failed to get font file data, %d\n", GetLastError()); + ok(*(DWORD *)data == 0x00000100, "Unexpected sfnt header version %#x.\n", *(DWORD *)data); + ok(*(WORD *)(data + 4) == 0x0e00, "Unexpected table count %#x.\n", *(WORD *)(data + 4)); + + /* Larger than font data size. */ + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 0, data, size + 16); + ok(ret == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected return value %d, error %d\n", + ret, GetLastError()); + ok(*(DWORD *)data == 0xcccccccc, "Unexpected buffer contents %#x.\n", *(DWORD *)data); + + /* With offset. */ + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 16, data, size - 16); + ok(ret != 0, "Failed to get font file data, %d\n", GetLastError()); + ok(*(DWORD *)data == 0x1000000, "Unexpected buffer contents %#x.\n", *(DWORD *)data); + + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 16, data, size); + ok(ret == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected return value %d, error %d\n", + ret, GetLastError()); + ok(*(DWORD *)data == 0xcccccccc, "Unexpected buffer contents %#x.\n", *(DWORD *)data); + + /* Zero buffer size. */ + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 16, data, 0); + ok(ret == 0 && GetLastError() == ERROR_NOACCESS, "Unexpected return value %d, error %d\n", ret, GetLastError()); + ok(*(DWORD *)data == 0xcccccccc, "Unexpected buffer contents %#x.\n", *(DWORD *)data); + + HeapFree(GetProcessHeap(), 0, data); +} + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_AddFontMemResource(void) { + char ttf_name[MAX_PATH]; void *font; DWORD font_size, num_fonts; HANDLE ret; @@ -5085,13 +5201,6 @@ static void test_AddFontMemResource(void) return; } - font = load_font("sserife.fon", &font_size); - if (!font) - { - skip("Unable to locate and load font sserife.fon\n"); - return; - } - SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); @@ -5120,6 +5229,42 @@ static void test_AddFontMemResource(void) "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* Now with scalable font */ + bRet = write_ttf_file("wine_test.ttf", ttf_name); + ok(bRet, "Failed to create test font file.\n"); + + font = load_font(ttf_name, &font_size); + ok(font != NULL, "Failed to map font file.\n"); + + bRet = is_truetype_font_installed("wine_test"); + ok(!bRet, "Font wine_test should not be enumerated.\n"); + + num_fonts = 0; + ret = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); + ok(ret != 0, "Failed to add resource, %d.\n", GetLastError()); + ok(num_fonts == 1, "Unexpected number of fonts %u.\n", num_fonts); + + bRet = is_truetype_font_installed("wine_test"); +todo_wine + ok(!bRet, "Font wine_test should not be enumerated.\n"); + + test_realization_info("wine_test", font_size, TRUE); + + bRet = pRemoveFontMemResourceEx(ret); + ok(bRet, "RemoveFontMemResourceEx error %d\n", GetLastError()); + + free_font(font); + + bRet = DeleteFileA(ttf_name); + ok(bRet, "Failed to delete font file, %d.\n", GetLastError()); + + font = load_font("sserife.fon", &font_size); + if (!font) + { + skip("Unable to locate and load font sserife.fon\n"); + return; + } + SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, 0, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); @@ -5839,6 +5984,7 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_empty_contour(); test_GetGlyphOutline_metric_clipping(); test_fstype_fixup(); + test_realization_info("wine_test", 0, FALSE); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); @@ -6859,8 +7005,31 @@ static void test_long_names(void) START_TEST(font) { + static const char *test_names[] = + { + "AddFontMemResource", + "vertical_font", + "CreateScalableFontResource", + }; + char path_name[MAX_PATH]; + STARTUPINFOA startup; + char **argv; + int argc, i; + init(); + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + if (!strcmp(argv[2], "AddFontMemResource")) + test_AddFontMemResource(); + else if (!strcmp(argv[2], "vertical_font")) + test_vertical_font(); + else if (!strcmp(argv[2], "CreateScalableFontResource")) + test_CreateScalableFontResource(); + return; + } + test_stock_fonts(); test_logfont(); test_bitmap_font(); @@ -6879,7 +7048,6 @@ START_TEST(font) test_nonexistent_font(); test_orientation(); test_height_selection(); - test_AddFontMemResource(); test_EnumFonts(); test_EnumFonts_subst(); @@ -6923,9 +7091,19 @@ START_TEST(font) test_GetCharWidthI(); test_long_names(); - /* These tests should be last test until RemoveFontResource - * is properly implemented. - */ - test_vertical_font(); - test_CreateScalableFontResource(); + /* These tests run in separate processes until RemoveFontResource */ + winetest_get_mainargs( &argv ); + for (i = 0; i < ARRAY_SIZE(test_names); ++i) + { + PROCESS_INFORMATION info; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s font %s", argv[0], test_names[i]); + ok(CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n"); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } } -- 2.19.1

2 4

Re: gdi32: Specify the suitable hinting flags explicitly.
by Byeongsik Jeon 20 Nov '18

20 Nov '18

Unfortunately, this patch can't solve bug #41639. FT_LOAD_TARGET_MONO works correctly only in Freetype 2.8.1+, but bug #41639 is about Freetype 2.7. http://lists.nongnu.org/archive/html/freetype/2017-09/msg00032.html http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/src/truetype/t… In Freetype's truetype interpreter version 40, The hdmx table and modifications to phantom points are ignored. Only FT_LOAD_TARGET_MONO applies v35 internally (Freetype 2.8.1+). If bug 41639 is not 'WONTFIX', there is no solution other than how to use v35( with FT_Property_Set). In my old patch, I used v35 selectively using the gasp table version. Another solution is to decide by the presence of the hdmx table. This seems to be a better way to determine the problematic font in v40. http://lists.nongnu.org/archive/html/freetype/2018-11/msg00012.html Without FT_Property_Set, adding some flag to FT_Load_Glyph seems to be a good solution. But it can't solve bug #41639. Even if we do not consider bug # 41639, now Wine GDI has a problem using the wrong advance value for MS legacy fonts( with hdmx table) at the v40. Please comment. PS. The v35 can be misunderstood by its name, but it is a separate hinting engine with different purposes. http://lists.nongnu.org/archive/html/freetype/2017-09/msg00036.html On Tue, 13 Nov 2018 15:01:57 -0600, Alexandre Julliard <julliard(a)winehq.org> wrote: > Module: wine > Branch: master > Commit: 7da7930a10f22cf186e9454fec2807d75f239fad > URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da7930a10f22cf186e9454f… > > Author: Byeongsik Jeon <bsjeon(a)hanmail.net> > Date: Tue Nov 13 09:27:09 2018 +0000 > > gdi32: Specify the suitable hinting flags explicitly. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 > Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/gdi32/freetype.c | 38 +++++++++++++++++++++++++++++++++----- > 1 file changed, 33 insertions(+), 5 deletions(-) > > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c > index b62288c..99b7d8c 100644 > --- a/dlls/gdi32/freetype.c > +++ b/dlls/gdi32/freetype.c > @@ -6801,6 +6801,37 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b > return needed; > } > > +static FT_Int get_load_flags( UINT format ) > +{ > + FT_Int load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; > + > + if (format & GGO_UNHINTED) > + return load_flags | FT_LOAD_NO_HINTING; > + > + switch (format & ~GGO_GLYPH_INDEX) > + { > + case GGO_BITMAP: > + load_flags |= FT_LOAD_TARGET_MONO; > + break; > + case GGO_GRAY2_BITMAP: > + case GGO_GRAY4_BITMAP: > + case GGO_GRAY8_BITMAP: > + case WINE_GGO_GRAY16_BITMAP: > + load_flags |= FT_LOAD_TARGET_NORMAL; > + break; > + case WINE_GGO_HRGB_BITMAP: > + case WINE_GGO_HBGR_BITMAP: > + load_flags |= FT_LOAD_TARGET_LCD; > + break; > + case WINE_GGO_VRGB_BITMAP: > + case WINE_GGO_VBGR_BITMAP: > + load_flags |= FT_LOAD_TARGET_LCD_V; > + break; > + } > + > + return load_flags; > +} > + > static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; > > static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > @@ -6820,7 +6851,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > FT_Vector adv; > INT origin_x = 0, origin_y = 0; > FT_Angle angle = 0; > - FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; > + FT_Int load_flags = get_load_flags(format); > double widthRatio = 1.0; > FT_Matrix transMat = identityMat; > FT_Matrix transMatUnrotated; > @@ -6859,10 +6890,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > tategaki = check_unicode_tategaki(glyph); > } > > - if(format & GGO_UNHINTED) { > - load_flags |= FT_LOAD_NO_HINTING; > - format &= ~GGO_UNHINTED; > - } > + format &= ~GGO_UNHINTED; > > if(original_index >= font->gmsize * GM_BLOCK_SIZE) { > font->gmsize = (original_index / GM_BLOCK_SIZE + 1); > > >

3 6

[PATCH] winealsa.drv: Don't crash when getting NULL event from midi
by Fabian Maurer 20 Nov '18

20 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46170 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/winealsa.drv/midi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 3d4d933ead..a594f5af70 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -328,6 +328,10 @@ static DWORD WINAPI midRecThread(LPVOID arg) EnterCriticalSection(&midiSeqLock); snd_seq_event_input(midiSeq, &ev); LeaveCriticalSection(&midiSeqLock); + + if (!ev) + continue; + /* Find the target device */ for (wDevID = 0; wDevID < MIDM_NumDevs; wDevID++) if ( (ev->source.client == MidiInDev[wDevID].addr.client) && (ev->source.port == MidiInDev[wDevID].addr.port) ) -- 2.19.1

2 2

[PATCH] iphlpapi: Remove a redundant NULL check before HeapFree()
by Michael Stefaniuc 20 Nov '18

20 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 84d28ee4e6..c36f42a378 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2787,8 +2787,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE break; } HeapFree( GetProcessHeap(), 0, map ); - if (addr_scopes) - HeapFree( GetProcessHeap(), 0, addr_scopes ); + HeapFree( GetProcessHeap(), 0, addr_scopes ); fclose( fp ); } else ret = ERROR_NOT_SUPPORTED; -- 2.14.5

1 0

Re: [PATCH] msxml3/tests: Use the ARRAY_SIZE() macro
by Nikolay Sivov 20 Nov '18

20 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0

[PATCH] Translation: Review po/pt_BR fuzzy tags
by Roberto Pungartnik 20 Nov '18

20 Nov '18

1 0

[PATCH] schannel.h: Add TLS 1.3 defines.
by Jacek Caban 20 Nov '18

20 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 1 + include/schannel.h | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-)

1 0

[PATCH 4/4] msvcp110: Export time_get functions on arm.
by Piotr Caban 20 Nov '18

20 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 72 ++++++++++++++--------------- dlls/msvcp120/msvcp120.spec | 72 ++++++++++++++--------------- dlls/msvcp120_app/msvcp120_app.spec | 72 ++++++++++++++--------------- dlls/msvcp140/msvcp140.spec | 20 ++++---- 4 files changed, 118 insertions(+), 118 deletions(-)

1 0

[PATCH 3/4] msvcp100: Add time_get<char>::get_fmt implementation.
by Piotr Caban 20 Nov '18

20 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 58 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 10 deletions(-)

1 0

[PATCH 2/4] msvcp100: Add time_get<char>do_get implementation.
by Piotr Caban 20 Nov '18

20 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp110/msvcp110.spec | 6 +- dlls/msvcp120/msvcp120.spec | 6 +- dlls/msvcp120_app/msvcp120_app.spec | 6 +- dlls/msvcp140/msvcp140.spec | 6 +- dlls/msvcp90/locale.c | 238 ++++++++++++++++++++++++---- 6 files changed, 217 insertions(+), 49 deletions(-)

1 0

[PATCH 1/4] msvcp90: Add time_get<char>::do_get_date implementation.
by Piotr Caban 20 Nov '18

20 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 173 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 143 insertions(+), 30 deletions(-)

1 0

[PATCH] winegcc: fix cross linking on multiarch platforms
by Andre Heider 20 Nov '18

20 Nov '18

If e.g. the 64bit libdir was set to /foo/lib/x86_64-linux-gnu/bar, winegcc will now look for the 32bit libdir at /foo/lib/i386-linux-gnu/bar. Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- Tested on non-standard prefixes like /opt/foo as well as more exotic variations like Debian's wine-development package, which uses /usr/lib/x86_64-linux-gnu/wine-development and /usr/lib/i386-linux-gnu/wine-development tools/winegcc/winegcc.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 6b3b4b6aab..d463d7a4bf 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -444,6 +444,21 @@ static int check_platform( struct options *opts, const char *file ) return ret; } +static const char *get_multiarch_dir( enum target_cpu cpu ) +{ + switch(cpu) + { + case CPU_x86: return "/i386-linux-gnu"; + case CPU_x86_64: return "/x86_64-linux-gnu"; + case CPU_ARM: return "/arm-linux-gnueabi"; + case CPU_ARM64: return "/aarch64-linux-gnu"; + case CPU_POWERPC: return "/powerpc-linux-gnu"; + default: + assert(0); + return NULL; + } +} + static char *get_lib_dir( struct options *opts ) { static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; @@ -471,19 +486,24 @@ static char *get_lib_dir( struct options *opts ) strcpy( p, bit_suffix ); strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; - switch(opts->target_cpu) - { - case CPU_x86: strcpy( p, "/i386-linux-gnu" ); break; - case CPU_x86_64: strcpy( p, "/x86_64-linux-gnu" ); break; - case CPU_ARM: strcpy( p, "/arm-linux-gnueabi" ); break; - case CPU_ARM64: strcpy( p, "/aarch64-linux-gnu" ); break; - case CPU_POWERPC: strcpy( p, "/powerpc-linux-gnu" ); break; - default: - assert(0); - } + strcpy( p, get_multiarch_dir( opts->target_cpu )); strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; + /* try s/$build_cpu/$target_cpu/ on multiarch */ + if (build_cpu != opts->target_cpu && (p = strstr( stdlibpath[i], get_multiarch_dir( build_cpu ) ))) + { + char *suffix = p + strlen( get_multiarch_dir( build_cpu ) ); + strcpy( buffer, stdlibpath[i] ); + p = buffer + (p - stdlibpath[i]); + strcpy( p, get_multiarch_dir( opts->target_cpu ) ); + p += strlen( get_multiarch_dir( opts->target_cpu ) ); + strcpy( p, suffix ); + while (p > buffer && p[-1] == '/') p--; + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; + } + strcpy( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; -- 2.19.1

2 5

[PATCH v2 2/3] hidclass.sys: IoCreateSymbolicLink now called by IoSetDeviceInterfaceState
by Aric Stewart 20 Nov '18

20 Nov '18

v2: Divide patch as suggested by Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 7 ------- 1 file changed, 7 deletions(-)

2 1

[PATCH] ntoskrnl.exe: Create the device interface symlink in IoSetDeviceInterfaceState().
by Zebediah Figura 20 Nov '18

20 Nov '18

From: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 110 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 96 insertions(+), 14 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e52cb168a8..aec37daa59 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -102,6 +102,16 @@ struct wine_driver SERVICE_STATUS_HANDLE service_handle; }; +struct device_interface +{ + struct wine_rb_entry entry; + + UNICODE_STRING symbolic_link; + DEVICE_OBJECT *device; + GUID interface_class; + BOOL enabled; +}; + static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ); static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) @@ -114,6 +124,16 @@ static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; +static int interface_rb_compare( const void *key, const struct wine_rb_entry *entry) +{ + const struct device_interface *iface = WINE_RB_ENTRY_VALUE( entry, const struct device_interface, entry ); + const UNICODE_STRING *k = key; + + return RtlCompareUnicodeString( k, &iface->symbolic_link, FALSE ); +} + +static struct wine_rb_tree device_interfaces = { interface_rb_compare }; + static CRITICAL_SECTION drivers_cs; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -1321,6 +1341,30 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) return status; } +static NTSTATUS create_device_symlink( DEVICE_OBJECT *device, UNICODE_STRING *symlink_name ) +{ + UNICODE_STRING device_nameU; + WCHAR *device_name; + ULONG len = 0; + NTSTATUS ret; + + ret = IoGetDeviceProperty( device, DevicePropertyPhysicalDeviceObjectName, 0, NULL, &len ); + if (ret != STATUS_BUFFER_TOO_SMALL) + return ret; + + device_name = heap_alloc( len ); + ret = IoGetDeviceProperty( device, DevicePropertyPhysicalDeviceObjectName, len, device_name, &len ); + if (ret) + { + heap_free( device_name ); + return ret; + } + + RtlInitUnicodeString( &device_nameU, device_name ); + ret = IoCreateSymbolicLink( symlink_name, &device_nameU ); + heap_free( device_name ); + return ret; +} /*********************************************************************** * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) @@ -1339,16 +1383,31 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable size_t namelen = name->Length / sizeof(WCHAR); DEV_BROADCAST_DEVICEINTERFACE_W *broadcast; + struct device_interface *iface; HANDLE iface_key, control_key; OBJECT_ATTRIBUTES attr = {0}; + struct wine_rb_entry *entry; WCHAR *path, *refstr, *p; UNICODE_STRING string; + DWORD data = enable; NTSTATUS ret; - size_t len; GUID class; + ULONG len; TRACE("(%s, %d)\n", debugstr_us(name), enable); + entry = wine_rb_get( &device_interfaces, name ); + if (!entry) + return STATUS_OBJECT_NAME_NOT_FOUND; + + iface = WINE_RB_ENTRY_VALUE( entry, struct device_interface, entry ); + + if (!enable && !iface->enabled) + return STATUS_OBJECT_NAME_NOT_FOUND; + + if (enable && iface->enabled) + return STATUS_OBJECT_NAME_EXISTS; + refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) @@ -1374,22 +1433,37 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable attr.ObjectName = &string; RtlInitUnicodeString( &string, path ); ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); - if (!ret) + heap_free(path); + if (ret) + return ret; + + attr.RootDirectory = iface_key; + RtlInitUnicodeString( &string, controlW ); + ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); + NtClose( iface_key ); + if (ret) + return ret; + + RtlInitUnicodeString( &string, linkedW ); + ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + if (ret) { - attr.RootDirectory = iface_key; - RtlInitUnicodeString( &string, controlW ); - ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); - if (!ret) - { - DWORD data = enable; - RtlInitUnicodeString( &string, linkedW ); - ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); - NtClose( control_key ); - } - NtClose( iface_key ); + NtClose( control_key ); + return ret; } - heap_free( path ); + if (enable) + ret = create_device_symlink( iface->device, name ); + else + ret = IoDeleteSymbolicLink( name ); + if (ret) + { + NtDeleteValueKey( control_key, &string ); + NtClose( control_key ); + return ret; + } + + iface->enabled = enable; len = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[namelen + 1]); @@ -1696,6 +1770,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; DWORD required; BOOL rc; + struct device_interface *iface; TRACE( "(%p, %s, %s, %p)\n", device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link ); @@ -1766,9 +1841,16 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla data->DevicePath[1] = '?'; TRACE( "Device path %s\n",debugstr_w(data->DevicePath) ); + iface = heap_alloc_zero( sizeof(struct device_interface) ); + iface->device = device; + iface->interface_class = *class_guid; + RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); if (symbolic_link) RtlCreateUnicodeString( symbolic_link, data->DevicePath); + if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) + ERR( "failed to insert interface %s into tree\n", debugstr_us(&iface->symbolic_link) ); + HeapFree( GetProcessHeap(), 0, data ); return status; -- 2.14.1

2 1

[PATCH] testbot: Provide the missions list to the Reconfig scripts.
by Francois Gouget 20 Nov '18

20 Nov '18

The scripts need it to know which builds to update. A Wine VM may only need to update the win32 build for instance, but may have to recreate wineprefixes for multiple locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4d50a3789a..2a8b1d625d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Engine::Notify; @@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " echo git pull &&\n". - " ../bin/build/$Script\n". + " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.19.1

1 0

[PATCH 4/6] d3d9: Disallow rendertarget and depth/stencil usage on 3D textures.
by Henri Verbeet 20 Nov '18

20 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 6 ++---- dlls/d3d9/texture.c | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d0e566033f8..af0e8a0b337 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12926,10 +12926,8 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET - && !(tests[i].usage & D3DUSAGE_DYNAMIC) && tests[i].pool == D3DPOOL_DEFAULT) - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 4855985538c..e6524169e04 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1453,6 +1453,10 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev struct wined3d_resource_desc desc; HRESULT hr; + /* In d3d9, 3D textures can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl; d3d9_resource_init(&texture->resource); list_init(&texture->rtv_list); -- 2.11.0

2 1

[PATCH] xaudio2_7: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Nov '18

20 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/compat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index b9f416654d..4980e25f2f 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -2102,7 +2102,7 @@ static HRESULT WINAPI XA20_GetDeviceDetails(IXAudio20 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var); @@ -2385,7 +2385,7 @@ static HRESULT WINAPI XA22_GetDeviceDetails(IXAudio22 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var); @@ -2667,7 +2667,7 @@ static HRESULT WINAPI XA27_GetDeviceDetails(IXAudio27 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var); -- 2.14.5

2 1

[PATCH 3/6] d3d8: Disallow rendertarget and depth/stencil usage on 3D textures.
by Henri Verbeet 20 Nov '18

20 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 6 ++---- dlls/d3d8/texture.c | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c99ed0ea416..8ac6ed70b23 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9091,10 +9091,8 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture); - todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET - && !(tests[i].usage & D3DUSAGE_DYNAMIC) && tests[i].pool == D3DPOOL_DEFAULT) - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index ec5ae034858..ccbf60e05af 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1186,6 +1186,10 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev struct wined3d_resource_desc desc; HRESULT hr; + /* In d3d8, 3D textures can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + texture->IDirect3DBaseTexture8_iface.lpVtbl = (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl; d3d8_resource_init(&texture->resource); list_init(&texture->rtv_list); -- 2.11.0

2 1

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-devel