March 2021 - Wine-Commits - list.winehq.org

Arkadiusz Hiler : dinput: Implement DIPROP_APPDATA.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 8d206333fd50347cb45a8db72ecb191aa787ddb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d206333fd50347cb45a8db7… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Mar 8 14:36:11 2021 +0200 dinput: Implement DIPROP_APPDATA. This fixes not working analog inputs on game controllers in Slay the Spire. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++ dlls/dinput8/tests/device.c | 147 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d206333fd50347cb45a…

1 0

Jacek Caban : jscript: Improve prop_get and prop_put debug traces.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 492b65df1f764219790c83ffb3f1dbebfaace5e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=492b65df1f764219790c83ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 15:00:04 2021 +0100 jscript: Improve prop_get and prop_put debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5829cebe55b..efe8741f3c1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -502,7 +502,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) return hres; } - TRACE("%s ret %s\n", debugstr_w(prop->name), debugstr_jsval(*r)); + TRACE("%p.%s ret %s\n", This, debugstr_w(prop->name), debugstr_jsval(*r)); return hres; } @@ -559,7 +559,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return E_FAIL; } - TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_jsval(val)); + TRACE("%p.%s = %s\n", This, debugstr_w(prop->name), debugstr_jsval(val)); hres = jsval_copy(val, &prop->u.val); if(FAILED(hres))

1 0

Hans Leidekker : secur32: Add a helper to read TLS record size.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 37b29862b36364c6fee143de5eb816bcae514279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b29862b36364c6fee143de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:25 2021 +0100 secur32: Add a helper to read TLS record size. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d47c4d79258..3a34007a8cb 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -772,6 +772,13 @@ static void dump_buffer_desc(SecBufferDesc *desc) } } +#define HEADER_SIZE_TLS 5 + +static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) +{ + return (buf[header_size - 2] << 8) | buf[header_size - 1]; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -870,9 +877,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ptr = buffer->pvBuffer; expected_size = 0; - while (buffer->cbBuffer > expected_size + 5) + while (buffer->cbBuffer > expected_size + HEADER_SIZE_TLS) { - record_size = 5 + ((ptr[3] << 8) | ptr[4]); + record_size = HEADER_SIZE_TLS + read_record_size(ptr, HEADER_SIZE_TLS); if (buffer->cbBuffer < expected_size + record_size) break; @@ -1035,7 +1042,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( mac_size, message_size, block_size); /* These are defined by the TLS RFC */ - stream_sizes->cbHeader = 5; + stream_sizes->cbHeader = HEADER_SIZE_TLS; stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ stream_sizes->cbMaximumMessage = message_size; stream_sizes->cbBuffers = 4; @@ -1360,7 +1367,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle buffer = &message->pBuffers[idx]; buf_ptr = buffer->pvBuffer; - expected_size = 5 + ((buf_ptr[3] << 8) | buf_ptr[4]); + expected_size = HEADER_SIZE_TLS + read_record_size(buf_ptr, HEADER_SIZE_TLS); if(buffer->cbBuffer < expected_size) { TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); @@ -1377,7 +1384,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle return SEC_E_INCOMPLETE_MESSAGE; } - data_size = expected_size - 5; + data_size = expected_size - HEADER_SIZE_TLS; data = heap_alloc(data_size); init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); @@ -1412,21 +1419,21 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle TRACE("Received %ld bytes\n", received); - memcpy(buf_ptr + 5, data, received); + memcpy(buf_ptr + HEADER_SIZE_TLS, data, received); heap_free(data); schan_decrypt_fill_buffer(message, SECBUFFER_DATA, - buf_ptr + 5, received); + buf_ptr + HEADER_SIZE_TLS, received); schan_decrypt_fill_buffer(message, SECBUFFER_STREAM_TRAILER, - buf_ptr + 5 + received, buffer->cbBuffer - 5 - received); + buf_ptr + HEADER_SIZE_TLS + received, buffer->cbBuffer - HEADER_SIZE_TLS - received); if(buffer->cbBuffer > expected_size) schan_decrypt_fill_buffer(message, SECBUFFER_EXTRA, buf_ptr + expected_size, buffer->cbBuffer - expected_size); buffer->BufferType = SECBUFFER_STREAM_HEADER; - buffer->cbBuffer = 5; + buffer->cbBuffer = HEADER_SIZE_TLS; return status; }

1 0

Hans Leidekker : include: Add missing SECBUFFER defines.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 4be05213943d8b522d47e3706614175f531197d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be05213943d8b522d47e370… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:24 2021 +0100 include: Add missing SECBUFFER defines. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sspi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sspi.h b/include/sspi.h index e7371f129de..1cd1e6e0035 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -201,7 +201,9 @@ typedef struct _SecBuffer #define SECBUFFER_MECHLIST_SIGNATURE 12 #define SECBUFFER_TARGET 13 #define SECBUFFER_CHANNEL_BINDINGS 14 +#define SECBUFFER_ALERT 17 #define SECBUFFER_APPLICATION_PROTOCOLS 18 +#define SECBUFFER_DTLS_MTU 24 #define SECBUFFER_ATTRMASK 0xf0000000 #define SECBUFFER_READONLY 0x80000000

1 0

Hans Leidekker : secur32: Add DTLS support.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: f93284dfa44b060436c6a0617b51280abb3f24fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f93284dfa44b060436c6a061… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 10 15:50:26 2021 +0100 secur32: Add DTLS support. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 89 ++++++++++++++++++++++++++---------------- dlls/secur32/schannel_gnutls.c | 39 +++++++++++++++++- 2 files changed, 92 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f93284dfa44b060436c6…

1 0

Francois Gouget : winetest: Avoid duplicating the extract_test_proc() cleanup code.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: e9a0eeff41675597e8ccd7daa7d62681c5a32d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a0eeff41675597e8ccd7da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 10 18:15:58 2021 +0100 winetest: Avoid duplicating the extract_test_proc() cleanup code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 54 ++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1731850bfdb..408e1b3c706 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -890,6 +890,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP DWORD err; HANDLE actctx; ULONG_PTR cookie; + BOOL run; if (aborting) return TRUE; @@ -941,50 +942,39 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP else dll = 0; } + run = TRUE; if (!dll) { xprintf (" %s=dll is missing\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) - { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); - } - return TRUE; + run = FALSE; } - if(is_stub_dll(dllname)) + else { - FreeLibrary(dll); - xprintf (" %s=dll is a stub\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) + if (is_stub_dll(dllname)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=dll is a stub\n", dllname); + run = FALSE; } - return TRUE; - } - if (is_native_dll(dll)) - { - FreeLibrary(dll); - xprintf (" %s=load error Configured as native\n", dllname); - nr_native_dlls++; - if (actctx != INVALID_HANDLE_VALUE) + else if (is_native_dll(dll)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=load error Configured as native\n", dllname); + nr_native_dlls++; + run = FALSE; } - return TRUE; + FreeLibrary(dll); } - FreeLibrary(dll); - if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ))) + if (run) { - xprintf (" %s=%s\n", dllname, get_file_version(filename)); - nr_of_tests += wine_tests[nr_of_files].subtest_count; - nr_of_files++; - } - else - { - xprintf (" %s=load error %u\n", dllname, err); + err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); + if (!err) + { + xprintf (" %s=%s\n", dllname, get_file_version(filename)); + nr_of_tests += wine_tests[nr_of_files].subtest_count; + nr_of_files++; + } + else + xprintf (" %s=load error %u\n", dllname, err); } if (actctx != INVALID_HANDLE_VALUE)

1 0

Alexandre Julliard : user32/tests: Remove todo from a test that seems to succeed reliably now.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 0d017b12cf27d86607d25a114ab044601434b1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d017b12cf27d86607d25a11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 10 20:44:47 2021 +0100 user32/tests: Remove todo from a test that seems to succeed reliably now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eecccb70001..dbb5f4ce5b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3075,7 +3075,6 @@ todo_wine old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); -todo_wine ok( GetFocus() == child, "Focus should be on child %p, not %p\n", child, GetFocus() ); SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc);

1 0

Aaro Altonen : kernelbase: Add 'Bonaire, Sint Eustatius and Saba' to geoinfodata.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: a7d0198418d6a82e460db4d422d65469edb2fc04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d0198418d6a82e460db4d4… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed Mar 10 15:25:09 2021 +0100 kernelbase: Add 'Bonaire, Sint Eustatius and Saba' to geoinfodata. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 24e8cd3f338..951a8a54a86 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -533,6 +533,7 @@ static const struct geoinfo geoinfodata[] = { 161832015, L"BL", L"BLM", 10039880, 652 }, /* Saint Barthélemy */ { 161832256, L"UM", L"UMI", 27114, 581 }, /* U.S. Minor Outlying Islands */ { 161832257, L"XX", L"XX", 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ + { 161832258, L"BG", L"BES", 10039880, 535 }, /* Bonaire, Sint Eustatius and Saba */ }; /* NLS normalization file */

1 0

Nikolay Sivov : winegstreamer: Remove attributes pointer from static registration data.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 773329e3bb0a60b6e6d81878cb1e3d66637977ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=773329e3bb0a60b6e6d81878… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 10 14:04:44 2021 +0300 winegstreamer: Remove attributes pointer from static registration data. We should store actual key/value pairs in there, if we ever needed this part of registration information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 602fa631a43..68278838458 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -458,7 +458,6 @@ static const struct mft const GUID **input_types; const UINT32 output_types_count; const GUID **output_types; - IMFAttributes *attributes; } mfts[] = { @@ -472,7 +471,6 @@ mfts[] = audio_converter_supported_types, ARRAY_SIZE(audio_converter_supported_types), audio_converter_supported_types, - NULL }, }; @@ -498,7 +496,7 @@ HRESULT mfplat_DllRegisterServer(void) } hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, - input_types, cur->output_types_count, output_types, cur->attributes); + input_types, cur->output_types_count, output_types, NULL); if (FAILED(hr)) {

1 0

Gabriel Ivăncescu : jscript: Check for null instance prototype.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 580413032c61bc142078d08efb1d1167fe385a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580413032c61bc142078d08e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 5 18:59:41 2021 +0200 jscript: Check for null instance prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/lang.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index efe8741f3c1..f3eba68b9a4 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1853,7 +1853,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built return hres; } - if(is_object_instance(val)) + if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); jsval_release(val); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 753b4ee595e..211ae2f0373 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1864,6 +1864,21 @@ ok(tmp === "VT_DISPATCH", "getVT(Object(nullDisp) = " + tmp); tmp = Object(nullDisp).toString(); ok(tmp === "[object Object]", "Object(nullDisp).toString() = " + tmp); +function testNullPrototype() { + this.x = 13; +} +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); +testNullPrototype.prototype.y = 10; +ok("y" in tmp, "tmp does not have 'y' property"); +tmp = new testNullPrototype(); +ok(tmp.y === 10, "tmp.y !== 10"); +testNullPrototype.prototype = nullDisp; +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); + function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon();

1 0