December 2019 - Wine-Commits

Alexandre Julliard : Wine release 5.0-rc3
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: website Branch: master Commit: a77edae7d37cb1807e7684cf6962757aef79cad3 URL: https://source.winehq.org/git/website.git/?a=commit;h=a77edae7d37cb1807e768… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 27 22:47:50 2019 +0100 Wine release 5.0-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019122701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019122701.xml b/news/en/2019122701.xml new file mode 100644 index 00000000..381e4f93 --- /dev/null +++ b/news/en/2019122701.xml @@ -0,0 +1,12 @@ +<news> +<date>December 27, 2019</date> +<title>Wine 5.0-rc3 Released</title> +<body> + The Wine development release 5.0-rc3 is now available. + <a href="{$root}/announce/5.0-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0-rc3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-5.0-rc3 : Alexandre Julliard : Release 5.0-rc3
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: refs/tags/wine-5.0-rc3 Tag: e8078e1feb997a454c6fa4cfa0ab6d3750aeb515 URL: https://source.winehq.org/git/wine.git/?a=tag;h=e8078e1feb997a454c6fa4cfa0a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 27 22:46:04 2019 +0100 Release 5.0-rc3

1 0

Zebediah Figura : user32/tests: Work around failures on Windows 10 version 1607.
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: master Commit: 3305f12844688c255cfb182cc7c6475bed294928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3305f12844688c255cfb182c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 27 10:37:39 2019 -0600 user32/tests: Work around failures on Windows 10 version 1607. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 65 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 5eb5ec9d29..54fec3914d 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -315,7 +315,12 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); conversation = DdeConnect(client_pid, server, topic, NULL); - ok(conversation != NULL, "Expected non-NULL conversation\n"); + if (broken(!conversation)) /* Windows 10 version 1607 */ + { + win_skip("Failed to connect; error %#x.\n", DdeGetLastError(client_pid)); + DdeUninitialize(client_pid); + return; + } ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); @@ -1573,7 +1578,12 @@ static void test_dde_aw_transaction( BOOL client_unicode, BOOL server_unicode ) hsz_server = DdeCreateStringHandleW(dde_inst, TEST_DDE_SERVICE, CP_WINUNICODE); hconv = DdeConnect(dde_inst, hsz_server, 0, NULL); - ok(hconv != 0, "DdeConnect error %x\n", DdeGetLastError(dde_inst)); + if (broken(!hconv)) /* Windows 10 version 1607 */ + { + win_skip("Failed to connect; error %#x.\n", DdeGetLastError(dde_inst)); + DdeUninitialize(dde_inst); + return; + } err = DdeGetLastError(dde_inst); ok(err == DMLERR_NO_ERROR, "wrong dde error %x\n", err); @@ -2352,7 +2362,8 @@ static WCHAR test_cmd_w_to_w[][32] = { { 0x4efa, 0x4efc, 0x0061, 0x4efe, 0 }, /* some Chinese chars */ { 0x0061, 0x0062, 0x0063, 0x9152, 0 }, /* Chinese with latin characters begin */ }; -static const int nb_callbacks = 5 + ARRAY_SIZE(test_cmd_w_to_w); +static int msg_index; +static BOOL unicode_server, unicode_client; static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, @@ -2360,24 +2371,26 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV { DWORD size, rsize; char str[MAX_PATH]; - static int msg_index = 0; static HCONV conversation = 0; static const char test_service [] = "TestDDEService"; static const char test_topic [] = "TestDDETopic"; + trace("type %#x, fmt %#x\n", uType, uFmt); + + ok(msg_index < 5 + ARRAY_SIZE(test_cmd_w_to_w), "Got unexpected message type %#x.\n", uType); msg_index++; switch (uType) { case XTYP_REGISTER: { - ok(msg_index % nb_callbacks == 1, "Expected 1 modulo %u, got %d\n", nb_callbacks, msg_index); + ok(msg_index == 1, "Expected 1, got %d\n", msg_index); return (HDDEDATA)TRUE; } case XTYP_CONNECT: { - ok(msg_index % nb_callbacks == 2, "Expected 2 modulo %u, got %d\n", nb_callbacks, msg_index); + ok(msg_index == 2, "Expected 2, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d, msg_index=%d\n", uFmt, msg_index); ok(hconv == 0, "Expected 0, got %p, msg_index=%d\n", hconv, msg_index); ok(hdata == 0, "Expected 0, got %p, msg_index=%d\n", hdata, msg_index); @@ -2398,7 +2411,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } case XTYP_CONNECT_CONFIRM: { - ok(msg_index % nb_callbacks == 3, "Expected 3 modulo %u, got %d\n", nb_callbacks, msg_index); + ok(msg_index == 3, "Expected 3, got %d\n", msg_index); conversation = hconv; return (HDDEDATA) TRUE; } @@ -2409,7 +2422,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV char test_cmd_w_to_a[64]; WCHAR test_cmd_a_to_w[64]; DWORD size_a, size_w, size_w_to_a, size_a_to_w; - BOOL unicode_server, unicode_client, str_index; + BOOL str_index; ok(uFmt == 0, "Expected 0, got %d\n", uFmt); ok(hconv == conversation, "Expected conversation handle, got %p, msg_index=%d\n", @@ -2429,9 +2442,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV size, rsize, msg_index); trace("msg %u strA \"%s\" strW %s\n", msg_index, buffer, wine_dbgstr_w((WCHAR*)buffer)); - unicode_server = (msg_index / nb_callbacks == 1 || msg_index / nb_callbacks == 2); - unicode_client = (msg_index / nb_callbacks == 1 || msg_index / nb_callbacks == 3); - str_index = msg_index % nb_callbacks - 4; + str_index = msg_index - 4; cmd_w = test_cmd_w_to_w[str_index - 1]; size_a = strlen(test_cmd_a_to_a) + 1; size_w = (lstrlenW(cmd_w) + 1) * sizeof(WCHAR); @@ -2606,7 +2617,12 @@ static void test_end_to_end_client(BOOL type_a) DdeGetLastError(client_pid); hconv = DdeConnect(client_pid, server, topic, NULL); - ok(hconv != NULL, "Expected non-NULL conversation\n"); + if (broken(!hconv)) /* Windows 10 version 1607 */ + { + win_skip("Failed to connect; error %#x.\n", DdeGetLastError(client_pid)); + DdeUninitialize(client_pid); + return; + } ret = DdeGetLastError(client_pid); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %x\n", ret); DdeFreeStringHandle(client_pid, server); @@ -2639,7 +2655,7 @@ static void test_end_to_end_client(BOOL type_a) } -static void test_end_to_end_server(BOOL client_unicode, BOOL server_unicode) +static void test_end_to_end_server(void) { HANDLE client; MSG msg; @@ -2649,11 +2665,12 @@ static void test_end_to_end_server(BOOL client_unicode, BOOL server_unicode) HDDEDATA hdata; static const char test_service[] = "TestDDEService"; - trace("client %s, server %s\n", client_unicode ? "unicode" : "ascii", - server_unicode ? "unicode" : "ascii"); + trace("client %s, server %s\n", unicode_client ? "unicode" : "ascii", + unicode_server ? "unicode" : "ascii"); server_pid = 0; + msg_index = 0; - if (server_unicode) + if (unicode_server) res = DdeInitializeW(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); else res = DdeInitializeA(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); @@ -2665,7 +2682,7 @@ static void test_end_to_end_server(BOOL client_unicode, BOOL server_unicode) hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); ok(hdata == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", hdata); - client = create_process(client_unicode ? "endw" : "enda"); + client = create_process(unicode_client ? "endw" : "enda"); while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { @@ -2709,10 +2726,16 @@ START_TEST(dde) /* Test the combinations of A and W interfaces with A and W data end to end to ensure that data conversions are accurate */ - test_end_to_end_server(FALSE, FALSE); - test_end_to_end_server(TRUE, TRUE); - test_end_to_end_server(FALSE, TRUE); - test_end_to_end_server(TRUE, FALSE); + unicode_client = unicode_server = FALSE; + test_end_to_end_server(); + unicode_client = unicode_server = TRUE; + test_end_to_end_server(); + unicode_client = FALSE; + unicode_server = TRUE; + test_end_to_end_server(); + unicode_client = TRUE; + unicode_server = FALSE; + test_end_to_end_server(); test_dde_aw_transaction( FALSE, TRUE ); test_dde_aw_transaction( TRUE, FALSE );

1 0

Alexandre Julliard : Release 5.0-rc3.
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: master Commit: fa97cbdf14883fb301dcc0a5264369f8ed184182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa97cbdf14883fb301dcc0a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 27 22:46:04 2019 +0100 Release 5.0-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 256 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 ++--- 4 files changed, 134 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa97cbdf14883fb301dc…

1 0

Zebediah Figura : user32/tests: Get rid of some Windows 9x workarounds.
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: master Commit: 986bfcadd71786768abeb0e219da2572462b6e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=986bfcadd71786768abeb0e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 27 10:37:38 2019 -0600 user32/tests: Get rid of some Windows 9x workarounds. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 249 ++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=986bfcadd71786768abe…

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: master Commit: ceeb07c2e7d156dfc40d28a279955ce236187250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceeb07c2e7d156dfc40d28a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 26 22:33:41 2019 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 508 ++++++++++++++++++--------------------------------------------- 1 file changed, 146 insertions(+), 362 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ceeb07c2e7d156dfc40d…

1 0

Dmitry Timoshkov : msscript.ocx/tests: Fix a typo.
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: master Commit: 27146e994776c0d13078ea0b15e04c279a867552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27146e994776c0d13078ea0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 27 17:02:44 2019 +0800 msscript.ocx/tests: Fix a typo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7693f0b51b..d95c43d9b4 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -448,7 +448,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc IActiveScriptSiteWindow *window; IActiveScriptSiteDebug *debug; IServiceProvider *service; - ICanHandleException *canexpection; + ICanHandleException *canexception; LCID lcid; HRESULT hres; @@ -468,7 +468,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteDebug interface: %08x\n", hres); - hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); + hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexception); ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service);

1 0

Alexandre Julliard : ntdll: Fix memory corruption in RtlNormalizeString().
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: master Commit: ddb6f150e1175287574f4561e9661dda97eab330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddb6f150e1175287574f4561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 27 17:58:34 2019 +0100 ntdll: Fix memory corruption in RtlNormalizeString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index e3f562808b..7e85f344dd 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1585,20 +1585,14 @@ NTSTATUS WINAPI RtlNormalizeString( ULONG form, const WCHAR *src, INT src_len, W else { buf_len = src_len * 4; - do + for (;;) { - WCHAR *old_buf = buf; - - if (!buf) buf = RtlAllocateHeap( GetProcessHeap(), 0, buf_len ); - else buf = RtlReAllocateHeap( GetProcessHeap(), 0, buf, buf_len ); - if (!buf) - { - RtlFreeHeap( GetProcessHeap(), 0, old_buf ); - return STATUS_NO_MEMORY; - } + buf = RtlAllocateHeap( GetProcessHeap(), 0, buf_len * sizeof(WCHAR) ); + if (!buf) return STATUS_NO_MEMORY; res = wine_decompose_string( flags, src, src_len, buf, buf_len ); + if (res) break; buf_len *= 2; - } while (!res); + } } if (compose)

1 0

Rémi Bernon : ntdll: Start find_free_area from address_space_start instead of 0.
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: master Commit: 5eca6ffa8b392ac852324a5be3cc88d8e60197a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eca6ffa8b392ac852324a5b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 26 22:27:28 2019 +0100 ntdll: Start find_free_area from address_space_start instead of 0. The search was initiated with base == 0, which returns NULL immediately if MEM_TOP_DOWN is not used. Use address_space_start instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47974 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 953cf58901..5890344f7a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1267,7 +1267,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, if (zero_bits_64) { - if (!(ptr = map_free_area( (void*)0, alloc.limit, size, mask, top_down, VIRTUAL_GetUnixProt(vprot) ))) + if (!(ptr = map_free_area( address_space_start, alloc.limit, size, mask, top_down, VIRTUAL_GetUnixProt(vprot) ))) return STATUS_NO_MEMORY; TRACE( "got mem with map_free_area %p-%p\n", ptr, (char *)ptr + size ); goto done;

1 0

Rémi Bernon : ntdll: Split view search initialization to find_view_inside_range function.
by Alexandre Julliard Dec. 27, 2019

Dec. 27, 2019

Module: wine Branch: master Commit: cec83fede4599b6dc846e32e1de23c55df8de2a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec83fede4599b6dc846e32e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 26 22:27:26 2019 +0100 ntdll: Split view search initialization to find_view_inside_range function. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ded00e3eb7..1fe173825d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -496,17 +496,17 @@ static struct file_view *find_view_range( const void *addr, size_t size ) return NULL; } + /*********************************************************************** - * find_reserved_free_area + * find_view_inside_range * - * Find a free area between views inside the specified range. + * Find first (resp. last, if top_down) view inside a range. * The csVirtual section must be held by caller. - * The range must be inside the preloader reserved range. */ -static void *find_reserved_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +static struct wine_rb_entry *find_view_inside_range( void **base_ptr, void **end_ptr, int top_down ) { struct wine_rb_entry *first = NULL, *ptr = views_tree.root; - void *start; + void *base = *base_ptr, *end = *end_ptr; /* find the first (resp. last) view inside the range */ while (ptr) @@ -529,6 +529,24 @@ static void *find_reserved_free_area( void *base, void *end, size_t size, size_t } } + *base_ptr = base; + *end_ptr = end; + return first; +} + + +/*********************************************************************** + * find_reserved_free_area + * + * Find a free area between views inside the specified range. + * The csVirtual section must be held by caller. + * The range must be inside the preloader reserved range. + */ +static void *find_reserved_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +{ + struct wine_rb_entry *first = find_view_inside_range( &base, &end, top_down ); + void *start; + if (top_down) { start = ROUND_ADDR( (char *)end - size, mask );

1 0