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

Alistair Leslie-Hughes : winhttp/tests: Add WebSocket tests.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: a46d359e91e299142a27570bb202d8141b9625da URL: https://source.winehq.org/git/wine.git/?a=commit;h=a46d359e91e299142a27570b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 16 11:45:12 2020 +0200 winhttp/tests: Add WebSocket tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 215 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ab91940ebb..f08f50b9a9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -37,6 +37,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); + static BOOL proxy_active(void) { WINHTTP_PROXY_INFO proxy_info; @@ -2205,6 +2207,12 @@ static const char passportauth[] = "WWW-Authenticate: Passport1.4\r\n" "\r\n"; +static const char switchprotocols[] = +"HTTP/1.1 101 Switching Protocols\r\n" +"Server: winetest\r\n" +"Upgrade: websocket\r\n" +"Connection: Upgrade\r\n"; + static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; static const char auth_unseen[] = "Auth Unseen"; @@ -2217,6 +2225,31 @@ struct server_info #define BIG_BUFFER_LEN 0x2250 +static void create_websocket_accept(const char *key, char *buf, unsigned int buflen) +{ + HCRYPTPROV provider; + HCRYPTHASH hash; + BYTE sha1[20]; + char data[128]; + DWORD len; + + strcpy(data, key); + strcat(data, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"); + + CryptAcquireContextW(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + CryptCreateHash(provider, CALG_SHA1, 0, 0, &hash); + CryptHashData(hash, (BYTE *)data, strlen(data), 0); + + len = sizeof(sha1); + CryptGetHashParam(hash, HP_HASHVAL, sha1, &len, 0); + CryptDestroyHash(hash); + CryptReleaseContext(provider, 0); + + buf[0] = 0; + len = buflen; + CryptBinaryToStringA( (BYTE *)sha1, sizeof(sha1), CRYPT_STRING_BASE64, buf, &len); +} + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; @@ -2388,6 +2421,29 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, passportauth, sizeof(passportauth) - 1, 0); } + else if (strstr(buffer, "GET /websocket")) + { + char headers[256], key[32], accept[64]; + const char *pos = strstr(buffer, "Sec-WebSocket-Key: "); + if (pos && strstr(buffer, "Connection: Upgrade\r\n") && + (strstr(buffer, "Upgrade: websocket\r\n") || strstr(buffer, "Upgrade: Websocket\r\n")) && + strstr(buffer, "Host: ") && strstr(buffer, "Sec-WebSocket-Version: 13\r\n")) + { + memcpy(headers, switchprotocols, sizeof(switchprotocols)); + memcpy(key, pos + 19, 24); + key[24] = 0; + + create_websocket_accept(key, accept, sizeof(accept)); + + strcat(headers, "Sec-WebSocket-Accept: "); + strcat(headers, accept); + strcat(headers, "\r\n\r\n"); + + send(c, headers, strlen(headers), 0); + } + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + continue; + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -3039,6 +3095,161 @@ static void test_head_request(int port) WinHttpCloseHandle(ses); } +static void test_websocket(int port) +{ + HINTERNET session, connection, request, socket; + DWORD size, len, count, status, index, error; + WCHAR header[32]; + char buf[128]; + BOOL ret; + + if (!pWinHttpWebSocketCompleteUpgrade) + { + win_skip("WinHttpWebSocketCompleteUpgrade not supported\n"); + return; + } + + session = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); + ok(session != NULL, "got %u\n", GetLastError()); + + connection = WinHttpConnect(session, L"localhost", port, 0); + ok(connection != NULL, "got %u\n", GetLastError()); + + request = WinHttpOpenRequest(connection, L"GET", L"/websocket", NULL, NULL, NULL, 0); + 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()); + + size = sizeof(header); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + + size = sizeof(header); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + + index = 0; + size = sizeof(buf); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Sec-WebSocket-Key", buf, &size, &index); + error = GetLastError(); + ok(!ret, "success\n"); + ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", error); + + index = 0; + size = sizeof(buf); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Sec-WebSocket-Version", buf, &size, &index); + error = GetLastError(); + ok(!ret, "success\n"); + ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", error); + + ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); + ok(ret, "got %u\n", GetLastError()); + + size = sizeof(header); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + + size = sizeof(header); + SetLastError(0xdeadbeef); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); + error = GetLastError(); + ok(!ret, "success\n"); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + + index = 0; + buf[0] = 0; + 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()); + + 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()); + + ret = WinHttpReceiveResponse(request, NULL); + todo_wine 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); + + 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)); + + 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)); + + 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); + + len = 0xdeadbeef; + size = sizeof(len); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &len, + &size, 0); + ok(!ret, "success\n"); + + 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()); + + socket = pWinHttpWebSocketCompleteUpgrade(request, 0); + todo_wine 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)); + + 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)); + + 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()); + + /* Send/Receive on websock */ + + WinHttpCloseHandle(request); + WinHttpCloseHandle(socket); + WinHttpCloseHandle(connection); + WinHttpCloseHandle(session); +} + static void test_not_modified(int port) { BOOL ret; @@ -4710,6 +4921,9 @@ START_TEST (winhttp) struct server_info si; HANDLE thread; DWORD ret; + HMODULE mod = GetModuleHandleA("winhttp.dll"); + + pWinHttpWebSocketCompleteUpgrade = (void *)GetProcAddress(mod, "WinHttpWebSocketCompleteUpgrade"); test_WinHttpOpenRequest(); test_WinHttpSendRequest(); @@ -4759,6 +4973,7 @@ START_TEST (winhttp) test_cookies(si.port); test_request_path_escapes(si.port); test_passport_auth(si.port); + test_websocket(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, L"/quit");

1 0

Paul Gofman : ddraw: Update texture_memory when setting new texture parent in ddraw_surface7_Flip().
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: 422e05d84436092b4648153bacce8cc9ddc1d6c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=422e05d84436092b4648153b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 16 19:20:29 2020 +0300 ddraw: Update texture_memory when setting new texture parent in ddraw_surface7_Flip(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49391 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ba56fad964..6d64e8f217 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1288,11 +1288,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 { struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); + struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture; struct wined3d_rendertarget_view *tmp_rtv, *src_rtv, *rtv; - struct ddraw_texture *ddraw_texture, *prev_ddraw_texture; DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; struct wined3d_texture *texture; IDirectDrawSurface7 *current; + void *texture_memory; HRESULT hr; TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); @@ -1318,7 +1319,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; rtv = wined3d_device_get_rendertarget_view(dst_impl->ddraw->wined3d_device, 0); - ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); + dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); + texture_memory = dst_ddraw_texture->texture_memory; if (src_impl) { @@ -1345,12 +1347,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); - prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); + src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); + dst_ddraw_texture->texture_memory = src_ddraw_texture->texture_memory; + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), dst_ddraw_texture); + dst_ddraw_texture = src_ddraw_texture; if (src_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); dst_impl->wined3d_texture = src_impl->wined3d_texture; - ddraw_texture = prev_ddraw_texture; } else { @@ -1376,9 +1379,10 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); - prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); - ddraw_texture = prev_ddraw_texture; + src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); + dst_ddraw_texture->texture_memory = src_ddraw_texture->texture_memory; + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), dst_ddraw_texture); + dst_ddraw_texture = src_ddraw_texture; if (src_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); dst_impl->wined3d_texture = src_impl->wined3d_texture; @@ -1393,7 +1397,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; wined3d_texture_set_sub_resource_parent(texture, 0, src_impl); - wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); + dst_ddraw_texture->texture_memory = texture_memory; + wined3d_resource_set_parent(wined3d_texture_get_resource(texture), dst_ddraw_texture); src_impl->wined3d_texture = texture; if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4))

1 0

Nikolay Sivov : dwrite: Use mark array helper in mark to mark attachment handler.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: 122cac563d2ac85c975161b75d6b43ffb9df8837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=122cac563d2ac85c975161b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 14:56:42 2020 +0300 dwrite: Use mark array helper in mark to mark attachment handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 51 +++++++------------------------------------------- 1 file changed, 7 insertions(+), 44 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index bc87df5913..05ef7d76cd 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4295,30 +4295,15 @@ static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(struct scriptshap if (format == 1) { - const struct ot_gpos_mark_to_mark_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); - unsigned int count, mark1_array_offset, mark2_array_offset, mark_class_count; - unsigned int mark1_index, mark2_index, mark2_anchor; - const struct ot_gpos_mark_array *mark1_array; - const struct ot_gpos_base_array *mark2_array; - float mark1_x, mark1_y, mark2_x, mark2_y; + const struct ot_gpos_mark_to_mark_format1 *format1; + unsigned int mark1_index, mark2_index; struct glyph_iterator mark_iter; - if (!format1) - return FALSE; + if (!(format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)))) return FALSE; mark1_index = opentype_layout_is_glyph_covered(table, subtable_offset + GET_BE_WORD(format1->mark1_coverage), context->u.pos.glyphs[context->cur]); - - mark1_array_offset = subtable_offset + GET_BE_WORD(format1->mark1_array); - if (!(count = table_read_be_word(table, mark1_array_offset))) - return FALSE; - - mark1_array = table_read_ensure(table, mark1_array_offset, FIELD_OFFSET(struct ot_gpos_mark_array, records[count])); - if (!mark1_array) - return FALSE; - - if (mark1_index == GLYPH_NOT_COVERED || mark1_index >= count) - return FALSE; + if (mark1_index == GLYPH_NOT_COVERED) return FALSE; glyph_iterator_init(context, lookup->flags & ~LOOKUP_FLAG_IGNORE_MASK, context->cur, 1, &mark_iter); if (!glyph_iterator_prev(&mark_iter)) @@ -4327,34 +4312,12 @@ static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(struct scriptshap if (!context->u.pos.glyph_props[mark_iter.pos].isDiacritic) return FALSE; - mark2_array_offset = subtable_offset + GET_BE_WORD(format1->mark2_array); - if (!(count = table_read_be_word(table, mark2_array_offset))) - return FALSE; - - mark_class_count = GET_BE_WORD(format1->mark_class_count); - - mark2_array = table_read_ensure(table, mark2_array_offset, - FIELD_OFFSET(struct ot_gpos_base_array, offsets[count * mark_class_count])); - if (!mark2_array) - return FALSE; - mark2_index = opentype_layout_is_glyph_covered(table, subtable_offset + GET_BE_WORD(format1->mark2_coverage), context->u.pos.glyphs[mark_iter.pos]); + if (mark2_index == GLYPH_NOT_COVERED) return FALSE; - if (mark2_index == GLYPH_NOT_COVERED || mark2_index >= count) - return FALSE; - - mark2_anchor = GET_BE_WORD(mark2_array->offsets[mark2_index * mark_class_count + - GET_BE_WORD(mark1_array->records[mark1_index].mark_class)]); - opentype_layout_gpos_get_anchor(context, mark1_array_offset + - GET_BE_WORD(mark1_array->records[mark1_index].mark_anchor), context->cur, &mark1_x, &mark1_y); - opentype_layout_gpos_get_anchor(context, mark2_array_offset + mark2_anchor, mark_iter.pos, - &mark2_x, &mark2_y); - - context->offsets[context->cur].advanceOffset = mark2_x - mark1_x; - context->offsets[context->cur].ascenderOffset = mark2_y - mark1_y; - - context->cur++; + return opentype_layout_apply_mark_array(context, subtable_offset, GET_BE_WORD(format1->mark1_array), mark1_index, + mark2_index, GET_BE_WORD(format1->mark2_array), GET_BE_WORD(format1->mark_class_count), mark_iter.pos); } else {

1 0

Nikolay Sivov : dwrite: Use single table pointer in GPOS handlers.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: c928c1cbd8765c694b878978c6078c50c436522c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c928c1cbd8765c694b878978… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 14:56:39 2020 +0300 dwrite: Use single table pointer in GPOS handlers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 70 ++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c928c1cbd8765c694b87…

1 0

Alexandre Julliard : ntdll: Move the NtCreateUserProcess() implementation to the Unix library.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: c4c3b06e83ce8f7f18e77a101656ba983fb0d0e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4c3b06e83ce8f7f18e77a10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 11:34:48 2020 +0200 ntdll: Move the NtCreateUserProcess() implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 349 +------------------------- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/process.c | 548 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 6 +- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 13 +- 6 files changed, 560 insertions(+), 361 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4c3b06e83ce8f7f18e7…

1 0

Porot Mo : wshom.ocx: Expand environment string before executing command through CreateProcessW.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: 2a15390eb916e563d13ae6c0fad5da741f5acd6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a15390eb916e563d13ae6c0… Author: Porot Mo <porotmjp(a)gmail.com> Date: Tue Jun 16 16:20:46 2020 +0800 wshom.ocx: Expand environment string before executing command through CreateProcessW. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 11 ++++++++++- dlls/wshom.ocx/tests/wshom.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index f05ce31ee9..e8fcba7250 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1714,6 +1714,9 @@ static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT * static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec **ret) { + BSTR expandedcmd; + HRESULT hr; + TRACE("(%s %p)\n", debugstr_w(command), ret); if (!ret) @@ -1722,7 +1725,13 @@ static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec * if (!command) return DISP_E_EXCEPTION; - return WshExec_create(command, ret); + hr = WshShell3_ExpandEnvironmentStrings(iface, command, &expandedcmd); + if (FAILED(hr)) + return hr; + + hr = WshExec_create(expandedcmd, ret); + SysFreeString(expandedcmd); + return hr; } static HRESULT WINAPI WshShell3_get_CurrentDirectory(IWshShell3 *iface, BSTR *dir) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index bc913de3b7..c5e56c84ab 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -327,6 +327,16 @@ static void test_wshshell(void) ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); SysFreeString(str); + str = SysAllocString(L"%deadbeaf% /c echo test"); + hr = IWshShell3_Exec(sh3, str, &shexec); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + SysFreeString(str); + + str = SysAllocString(L"%ComSpec% /c echo test"); + hr = IWshShell3_Exec(sh3, str, &shexec); + ok(hr == HRESULT_FROM_WIN32(ERROR_SUCCESS), "got 0x%08x\n", hr); + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3);

1 0

Nikolay Sivov : dwrite: Remove some unused types.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: 51d4e5c13457aa13251265de5daf6098a445dfe4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51d4e5c13457aa13251265de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 14:56:38 2020 +0300 dwrite: Remove some unused types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 22159e2988..419326fb2b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -104,34 +104,6 @@ struct cmap_header WORD version; WORD num_tables; struct cmap_encoding_record tables[1]; -} CMAP_Header; - -typedef struct { - DWORD startCharCode; - DWORD endCharCode; - DWORD startGlyphID; -} CMAP_SegmentedCoverage_group; - -struct cmap_segmented_coverage -{ - WORD format; - WORD reserved; - DWORD length; - DWORD language; - DWORD num_groups; - CMAP_SegmentedCoverage_group groups[1]; -}; - -struct cmap_segment_mapping -{ - WORD format; - WORD length; - WORD language; - WORD seg_count_x2; - WORD search_range; - WORD entry_selector; - WORD range_shift; - WORD end_code[1]; }; enum OPENTYPE_CMAP_TABLE_FORMAT

1 0

Nikolay Sivov : dwrite: Use mark array helper in mark to base attachment handler.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: 81d8a0980b8d9f53fea1c3e4bb57c686adce62bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=81d8a0980b8d9f53fea1c3e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 14:56:41 2020 +0300 dwrite: Use mark array helper in mark to base attachment handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 49 ++++++------------------------------------------- 1 file changed, 6 insertions(+), 43 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 61dcf1aca4..bc87df5913 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4190,42 +4190,15 @@ static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(struct scriptshap if (format == 1) { - const struct ot_gpos_mark_to_base_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); - unsigned int mark_class_count, count, mark_array_offset, base_array_offset; - const struct ot_gpos_mark_array *mark_array; - const struct ot_gpos_base_array *base_array; - float mark_x, mark_y, base_x, base_y; + const struct ot_gpos_mark_to_base_format1 *format1; unsigned int base_index, mark_index; struct glyph_iterator base_iter; - unsigned int base_anchor; - if (!format1) - return FALSE; - - mark_array_offset = subtable_offset + GET_BE_WORD(format1->mark_array); - if (!(count = table_read_be_word(table, mark_array_offset))) - return FALSE; - - mark_array = table_read_ensure(table, mark_array_offset, FIELD_OFFSET(struct ot_gpos_mark_array, records[count])); - if (!mark_array) - return FALSE; - - base_array_offset = subtable_offset + GET_BE_WORD(format1->base_array); - if (!(count = table_read_be_word(table, base_array_offset))) - return FALSE; - - base_array = table_read_ensure(table, base_array_offset, - FIELD_OFFSET(struct ot_gpos_base_array, offsets[count * GET_BE_WORD(format1->mark_class_count)])); - if (!base_array) - return FALSE; - - mark_class_count = GET_BE_WORD(format1->mark_class_count); + if (!(format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)))) return FALSE; mark_index = opentype_layout_is_glyph_covered(table, subtable_offset + GET_BE_WORD(format1->mark_coverage), context->u.pos.glyphs[context->cur]); - - if (mark_index == GLYPH_NOT_COVERED || mark_index >= GET_BE_WORD(mark_array->count)) - return FALSE; + if (mark_index == GLYPH_NOT_COVERED) return FALSE; /* Look back for first base glyph. */ glyph_iterator_init(context, LOOKUP_FLAG_IGNORE_MARKS, context->cur, 1, &base_iter); @@ -4234,20 +4207,10 @@ static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(struct scriptshap base_index = opentype_layout_is_glyph_covered(table, subtable_offset + GET_BE_WORD(format1->base_coverage), context->u.pos.glyphs[base_iter.pos]); - if (base_index == GLYPH_NOT_COVERED || base_index >= GET_BE_WORD(base_array->count)) - return FALSE; + if (base_index == GLYPH_NOT_COVERED) return FALSE; - base_anchor = GET_BE_WORD(base_array->offsets[base_index * mark_class_count + - GET_BE_WORD(mark_array->records[mark_index].mark_class)]); - - opentype_layout_gpos_get_anchor(context, mark_array_offset + - GET_BE_WORD(mark_array->records[mark_index].mark_anchor), context->cur, &mark_x, &mark_y); - opentype_layout_gpos_get_anchor(context, base_array_offset + base_anchor, base_iter.pos, &base_x, &base_y); - - context->offsets[context->cur].advanceOffset = (context->is_rtl ? -1.0f : 1.0f) * (base_x - mark_x); - context->offsets[context->cur].ascenderOffset = base_y - mark_y; - - context->cur++; + return opentype_layout_apply_mark_array(context, subtable_offset, GET_BE_WORD(format1->mark_array), mark_index, + base_index, GET_BE_WORD(format1->base_array), GET_BE_WORD(format1->mark_class_count), base_iter.pos); } else {

1 0

Nikolay Sivov : dwrite: Add missing script tags.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: 0a0872910bb0e0f02a70598222c8a81093e32a18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a0872910bb0e0f02a705982… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 17:28:59 2020 +0300 dwrite: Add missing script tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f3eca12f96..f11388628e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -194,10 +194,10 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Medf */ { 0x6664654d, 265, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','e','d','f') } }, { /* Sogo */ { 0x6f676f53, 142, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','g','o') } }, { /* Sogd */ { 0x64676f53, 141, 8, 0x0020, 1, 1, 0, 0, 0, 1, 1 }, { _OT('s','o','g','d') } }, - { /* Elym */ { 0x6d796c45, 128, 1, 0x0020, 0, 0, 1, 0, 0, 0, 0 } }, - { /* Hmnp */ { 0x706e6d48, 451, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 } }, - { /* Nand */ { 0x646e614e, 311, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, - { /* Wcho */ { 0x6f686357, 283, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 } }, + { /* Elym */ { 0x6d796c45, 128, 1, 0x0020, 0, 0, 1, 0, 0, 0, 0 }, { _OT('e','l','y','m') } }, + { /* Hmnp */ { 0x706e6d48, 451, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('h','m','n','p') } }, + { /* Nand */ { 0x646e614e, 311, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, { _OT('n','a','n','d') } }, + { /* Wcho */ { 0x6f686357, 283, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('w','c','h','o') } }, }; #undef _OT

1 0

Alexandre Julliard : ntdll: Move the process information functions to the Unix library.
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: e9e5c95058df1f409debeb6b05aa222b476d79f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e5c95058df1f409debeb6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 11:35:55 2020 +0200 ntdll: Move the process information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 +- dlls/ntdll/ntdll_misc.h | 7 - dlls/ntdll/process.c | 623 +---------------------------------------- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/process.c | 583 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 11 +- dlls/ntdll/unix/unix_private.h | 4 +- dlls/ntdll/unix/virtual.c | 4 +- dlls/ntdll/unixlib.h | 8 +- 9 files changed, 614 insertions(+), 633 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e5c95058df1f409deb…

1 0