June 2020 - Wine-Devel - list.winehq.org

[PATCH 1/4] dwrite: Simplify single substitution handler.
by Nikolay Sivov June 17, 2020

June 17, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 05ef7d76cdf..c0a29d08df9 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4793,38 +4793,33 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; + const struct dwrite_fonttable *table = &context->table->table; UINT16 format, coverage, orig_glyph, glyph; - unsigned int idx, coverage_index; + unsigned int coverage_index; - idx = context->cur; - orig_glyph = glyph = context->u.subst.glyphs[idx]; + orig_glyph = glyph = context->u.subst.glyphs[context->cur]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); if (format == 1) { - const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - glyph = orig_glyph + GET_BE_WORD(format1->delta); + glyph = orig_glyph + table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, delta)); } else if (format == 2) { - UINT16 count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); - const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(gsub, subtable_offset, - FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count), + coverage_index, &glyph)) + { return FALSE; - - glyph = GET_BE_WORD(format2->substitutes[coverage_index]); + } } else { -- 2.27.0

1 3

[PATCH 2/2] winhttp: Implement WinHttpWebSocketCompleteUpgrade.
by Hans Leidekker June 17, 2020

June 17, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 101 ++++++++++++++++++++++++++++++++- dlls/winhttp/session.c | 13 ++--- dlls/winhttp/tests/winhttp.c | 34 +++++------ dlls/winhttp/winhttp_private.h | 14 +++++ 4 files changed, 133 insertions(+), 29 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9173bdb56d1..0511dd44eec 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -33,6 +33,7 @@ #include "httprequestid.h" #include "schannel.h" #include "winhttp.h" +#include "ntsecapi.h" #include "wine/debug.h" #include "winhttp_private.h" @@ -2098,6 +2099,25 @@ static char *build_wire_request( struct request *request, DWORD *len ) return ret; } +static WCHAR *create_websocket_key(void) +{ + WCHAR *ret; + char buf[16]; + DWORD base64_len = ((sizeof(buf) + 2) * 4) / 3; + if (!RtlGenRandom( buf, sizeof(buf) )) return NULL; + if ((ret = heap_alloc( (base64_len + 1) * sizeof(WCHAR) ))) encode_base64( buf, sizeof(buf), ret ); + return ret; +} + +static DWORD add_websocket_key_header( struct request *request ) +{ + WCHAR *key = create_websocket_key(); + if (!key) return ERROR_OUTOFMEMORY; + process_header( request, L"Sec-WebSocket-Key", key, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE, TRUE ); + heap_free( key ); + return ERROR_SUCCESS; +} + static DWORD send_request( struct request *request, const WCHAR *headers, DWORD headers_len, void *optional, DWORD optional_len, DWORD total_len, DWORD_PTR context, BOOL async ) { @@ -2125,7 +2145,14 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD swprintf( length, ARRAY_SIZE(length), L"%ld", total_len ); process_header( request, L"Content-Length", length, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); } - if (!(request->hdr.disable_flags & WINHTTP_DISABLE_KEEP_ALIVE)) + if (request->flags & REQUEST_FLAG_WEBSOCKET_UPGRADE) + { + process_header( request, L"Upgrade", L"websocket", WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + process_header( request, L"Connection", L"Upgrade", WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + process_header( request, L"Sec-WebSocket-Version", L"13", WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + if ((ret = add_websocket_key_header( request ))) return ret; + } + else if (!(request->hdr.disable_flags & WINHTTP_DISABLE_KEEP_ALIVE)) { process_header( request, L"Connection", L"Keep-Alive", WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); } @@ -3016,10 +3043,78 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write return !ret; } +static BOOL socket_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) +{ + FIXME("unimplemented option %u\n", option); + SetLastError( ERROR_WINHTTP_INVALID_OPTION ); + return FALSE; +} + +static void socket_destroy( struct object_header *hdr ) +{ + struct socket *socket = (struct socket *)hdr; + + TRACE("%p\n", socket); + + release_object( &socket->request->hdr ); + heap_free( socket ); +} + +static BOOL socket_set_option( struct object_header *hdr, DWORD option, void *buffer, DWORD buflen ) +{ + FIXME("unimplemented option %u\n", option); + SetLastError( ERROR_WINHTTP_INVALID_OPTION ); + return FALSE; +} + +static const struct object_vtbl socket_vtbl = +{ + socket_destroy, + socket_query_option, + socket_set_option, +}; + HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR context ) { - FIXME("%p, %08lx\n", hrequest, context); - return NULL; + struct socket *socket; + struct request *request; + HINTERNET hsocket = NULL; + + TRACE("%p, %08lx\n", hrequest, context); + + if (!(request = (struct request *)grab_object( hrequest ))) + { + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; + } + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return NULL; + } + if (!(socket = heap_alloc_zero( sizeof(struct socket) ))) + { + release_object( &request->hdr ); + return NULL; + } + socket->hdr.type = WINHTTP_HANDLE_TYPE_SOCKET; + socket->hdr.vtbl = &socket_vtbl; + socket->hdr.refs = 1; + socket->hdr.context = context; + list_init( &socket->hdr.children ); + + addref_object( &request->hdr ); + socket->request = request; + list_add_head( &request->hdr.children, &socket->hdr.entry ); + + if ((hsocket = alloc_handle( &socket->hdr ))) socket->hdr.handle = hsocket; + + release_object( &socket->hdr ); + release_object( &request->hdr ); + TRACE("returning %p\n", hsocket); + if (hsocket) SetLastError( ERROR_SUCCESS ); + return hsocket; } DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, void *buf, DWORD len ) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 24455d858a6..87974ffbd8e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -63,9 +63,6 @@ BOOL WINAPI WinHttpCheckPlatform( void ) return TRUE; } -/*********************************************************************** - * session_destroy (internal) - */ static void session_destroy( struct object_header *hdr ) { struct session *session = (struct session *)hdr; @@ -296,9 +293,6 @@ end: return handle; } -/*********************************************************************** - * connect_destroy (internal) - */ static void connect_destroy( struct object_header *hdr ) { struct connect *connect = (struct connect *)hdr; @@ -581,9 +575,6 @@ end: return hconnect; } -/*********************************************************************** - * request_destroy (internal) - */ static void request_destroy( struct object_header *hdr ) { struct request *request = (struct request *)hdr; @@ -1038,6 +1029,10 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b return FALSE; } + case WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET: + request->flags |= REQUEST_FLAG_WEBSOCKET_UPGRADE; + return TRUE; + case WINHTTP_OPTION_CONNECT_RETRIES: FIXME("WINHTTP_OPTION_CONNECT_RETRIES\n"); return TRUE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f08f50b9a9d..8083c4825b2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3119,7 +3119,7 @@ static void test_websocket(int port) ok(request != NULL, "got %u\n", GetLastError()); ret = WinHttpSetOption(request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); - todo_wine ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %u\n", GetLastError()); size = sizeof(header); SetLastError(0xdeadbeef); @@ -3175,41 +3175,41 @@ static void test_websocket(int port) size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Sec-WebSocket-Key", buf, &size, &index); - todo_wine ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %u\n", GetLastError()); index = 0; buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Sec-WebSocket-Version", buf, &size, &index); - todo_wine ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %u\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); - todo_wine ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %u\n", GetLastError()); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(request, &count); ok(ret, "got %u\n", GetLastError()); - todo_wine ok(!count, "got %u\n", count); + ok(!count, "got %u\n", count); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); - todo_wine ok(ret, "got %u\n", GetLastError()); - todo_wine ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); + ok(ret, "got %u\n", GetLastError()); + ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); - todo_wine ok(ret, "got %u\n", GetLastError()); - todo_wine ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); + ok(ret, "got %u\n", GetLastError()); + ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "got %u\n", GetLastError()); - todo_wine ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); + ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); len = 0xdeadbeef; size = sizeof(len); @@ -3220,27 +3220,27 @@ static void test_websocket(int port) index = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); - todo_wine ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %u\n", GetLastError()); socket = pWinHttpWebSocketCompleteUpgrade(request, 0); - todo_wine ok(socket != NULL, "got %u\n", GetLastError()); + ok(socket != NULL, "got %u\n", GetLastError()); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); - todo_wine ok(ret, "got %u\n", GetLastError()); - todo_wine ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); + ok(ret, "got %u\n", GetLastError()); + ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); - todo_wine ok(ret, "got %u\n", GetLastError()); - todo_wine ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); + ok(ret, "got %u\n", GetLastError()); + ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); index = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); - todo_wine ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %u\n", GetLastError()); /* Send/Receive on websock */ diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 657f82f6421..af695f86c3e 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -26,6 +26,8 @@ #include "sspi.h" #include "wincrypt.h" +#define WINHTTP_HANDLE_TYPE_SOCKET 4 + struct object_header; struct object_vtbl { @@ -154,10 +156,16 @@ struct authinfo BOOL finished; /* finished authenticating */ }; +enum request_flags +{ + REQUEST_FLAG_WEBSOCKET_UPGRADE = 0x01, +}; + struct request { struct object_header hdr; struct connect *connect; + enum request_flags flags; WCHAR *verb; WCHAR *path; WCHAR *version; @@ -201,6 +209,12 @@ struct request } creds[TARGET_MAX][SCHEME_MAX]; }; +struct socket +{ + struct object_header hdr; + struct request *request; +}; + struct task_header { struct list entry; -- 2.20.1

2 1

[PATCH] kernel32: Fix GetPrivateProfileInt for empty filename
by Yu Changping June 17, 2020

June 17, 2020

2 1

[PATCH 2/2] winhttp: Support WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET option
by Alistair Leslie-Hughes June 17, 2020

June 17, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/session.c | 4 ++++ dlls/winhttp/tests/winhttp.c | 2 +- dlls/winhttp/winhttp_private.h | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 24455d858a..0586656884 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1042,6 +1042,10 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b FIXME("WINHTTP_OPTION_CONNECT_RETRIES\n"); return TRUE; + case WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET: + request->websocket_state = WEBSOCKET_UPGRADING; + return TRUE; + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f08f50b9a9..e17639d4dd 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3119,7 +3119,7 @@ static void test_websocket(int port) ok(request != NULL, "got %u\n", GetLastError()); ret = WinHttpSetOption(request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); - todo_wine ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %u\n", GetLastError()); size = sizeof(header); SetLastError(0xdeadbeef); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 657f82f642..35a1daf063 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -154,6 +154,15 @@ struct authinfo BOOL finished; /* finished authenticating */ }; +enum websocket_state +{ + WEBSOCKET_NOT_SUPPORTED, + WEBSOCKET_UPGRADING, + WEBSOCKET_OPEN, + WEBSOCKET_CLOSING, + WEBSOCKET_CLOSED, +}; + struct request { struct object_header hdr; @@ -167,6 +176,7 @@ struct request struct netconn *netconn; DWORD security_flags; BOOL check_revocation; + enum websocket_state websocket_state; const CERT_CONTEXT *server_cert; const CERT_CONTEXT *client_cert; CredHandle cred_handle; -- 2.27.0

2 1

[PATCH 2/2] kernel32: Adjust toolhelp thread return order.
by Yu Changping June 17, 2020

June 17, 2020

1 0

[PATCH 1/2] kernel32/tests: Add tests for getting main thread id by toolhelp.
by Yu Changping June 17, 2020

June 17, 2020

1 0

[PATCH 1/2] winhttp: Status HTTP_STATUS_SWITCH_PROTOCOLS doesn't have any content.
by Hans Leidekker June 17, 2020

June 17, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 79d66fd5e80..9173bdb56d1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2353,8 +2353,11 @@ static void set_content_length( struct request *request, DWORD status ) WCHAR encoding[20]; DWORD buflen = sizeof(request->content_length); - if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || !wcscmp( request->verb, L"HEAD" )) + if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || + status == HTTP_STATUS_SWITCH_PROTOCOLS || !wcscmp( request->verb, L"HEAD" )) + { request->content_length = 0; + } else { if (query_headers( request, WINHTTP_QUERY_CONTENT_LENGTH|WINHTTP_QUERY_FLAG_NUMBER, -- 2.20.1

1 0

[PATCH] kernel32: Fix GetPrivateProfileInt for empty filename
by Yu Changping June 17, 2020

June 17, 2020

2 1

[PATCH] kernel32: Fix GetPrivateProfileInt for empty filename
by Yu Changping June 17, 2020

June 17, 2020

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä June 17, 2020

June 17, 2020

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5dded3a08b..1c0563a46a 100644 --- a/po/fi.po +++ b/po/fi.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-12-30 02:40+0200\n" +"PO-Revision-Date: 2020-06-17 12:10+0300\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -3608,7 +3608,7 @@ msgstr "Peliohjaimet" #: joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Testaa ja säädä peliohjaimia." #: jscript.rc:28 msgid "Error converting object to primitive type" @@ -3623,10 +3623,8 @@ msgid "Subscript out of range" msgstr "Indeksi alueen ulkopuolella" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Paperi loppu; " +msgstr "Pinosta loppui tila" #: jscript.rc:32 msgid "Object required" @@ -3765,16 +3763,12 @@ msgid "JScript object expected" msgstr "Odotettiin JScript-objektia" #: jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Odotettiin taulukkoa" +msgstr "Odotettiin Enumerator-objektia" #: jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Odotettiin totuusarvoa" +msgstr "Odotettiin säännöllistä lauseketta" #: jscript.rc:65 msgid "Syntax error in regular expression" -- 2.26.2

1 0