wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Austin English : winecfg: Recommend against overriding secur32.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 53cc1da18f3683197fa5e62c2f7d4f9d3ef39c51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cc1da18f3683197fa5e62c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 2 05:23:07 2018 +0200 winecfg: Recommend against overriding secur32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45344 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/libraries.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 22e9435..ee60978 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -64,6 +64,7 @@ static const char * const builtin_only[] = "ntoskrnl.exe", "opengl32", "sane.ds", + "secur32", "twain_32", "unicows", "user32",

1 0

Marcus Meissner : shell32: Set size in characters in MENUITEMINFOW struct.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: aba4789b0eface4636a723dacfdee19124248ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba4789b0eface4636a723da… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 29 17:23:26 2018 +0200 shell32: Set size in characters in MENUITEMINFOW struct. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 4548bf3..40306d6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1236,7 +1236,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, info.cbSize = sizeof info; info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_DATA | MIIM_ID; info.dwTypeData = string; - info.cch = sizeof string; + info.cch = ARRAY_SIZE(string); string[0] = 0; GetMenuItemInfoW( hmenu, i, TRUE, &info );

1 0

Marcus Meissner : comctl32: Treeview item gets characters not bytes passed in.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 7e0de24a7585da7000517151e080cae6ec6aa003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0de24a7585da7000517151… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 29 17:29:39 2018 +0200 comctl32: Treeview item gets characters not bytes passed in. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b0b8325..bbef651 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4694,7 +4694,7 @@ static INT TREEVIEW_ProcessLetterKeys(TREEVIEW_INFO *infoPtr, WPARAM charCode, L item.mask = TVIF_TEXT; item.hItem = idx; item.pszText = buffer; - item.cchTextMax = sizeof(buffer); + item.cchTextMax = ARRAY_SIZE(buffer); TREEVIEW_GetItemT( infoPtr, &item, TRUE ); /* check for a match */

1 0

Marcus Meissner : comctl32/tests: Header item struct gets characters not bytes.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 6e437acf1c9a2e50800e1c0c7f534169ce69b0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e437acf1c9a2e50800e1c0c… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 29 17:34:55 2018 +0200 comctl32/tests: Header item struct gets characters not bytes. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e9b715e..c118f02 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5490,7 +5490,7 @@ static void test_header_notification2(void) memset(&itemW, 0, sizeof(itemW)); itemW.mask = HDI_WIDTH | HDI_ORDER | HDI_TEXT; itemW.pszText = buffer; - itemW.cchTextMax = sizeof(buffer); + itemW.cchTextMax = ARRAY_SIZE(buffer); ret = SendMessageW(header, HDM_GETITEMW, 0, (LPARAM)&itemW); expect(1, ret);

1 0

André Hentschel : dbghelp: Recompute location after fixing it.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: 3d482d3f9f0a3ffa69540af87594b3c1dc46e07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d482d3f9f0a3ffa69540af8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 2 15:52:42 2018 +0200 dbghelp: Recompute location after fixing it. Fix a assertion raised by every exception with newer clang versions (>3.7) at least on ARM64: ../../../dlls/dbghelp/dwarf.c:1641: void dwarf2_parse_variable(dwarf2_subprogram_t *, struct symt_block *, dwarf2_debug_info_t *): Assertion `subpgm->func' failed. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1a75a79..dc3ec29 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -942,6 +942,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); loc->offset = (unsigned long)ptr; + compute_location(&lctx, loc, NULL, frame); } } return TRUE;

1 0

Piotr Caban : inetcpl.cpl: Add partial support for writing DefaultConnectionSettings registry setting.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: wine Branch: master Commit: b57d794796476f5de7cc49c99972d32662ee09c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b57d794796476f5de7cc49c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 28 16:02:45 2018 +0200 inetcpl.cpl: Add partial support for writing DefaultConnectionSettings registry setting. IE 10+ saves connection information in this key. .NET 4.6.2 is using the key to read proxy settings. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 83 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index bd21b2d..925182a 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -26,6 +26,7 @@ #include "inetcpl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -36,9 +37,65 @@ static const WCHAR internet_settings[] = {'S','o','f','t','w','a','r','e','\\', 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; static const WCHAR proxy_enable[] = {'P','r','o','x','y','E','n','a','b','l','e',0}; static const WCHAR proxy_server[] = {'P','r','o','x','y','S','e','r','v','e','r',0}; +static const WCHAR connections[] = {'C','o','n','n','e','c','t','i','o','n','s',0}; +static const WCHAR default_connection_settings[] = {'D','e','f','a','u','l','t', + 'C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0}; static BOOL initdialog_done; +#define CONNECTION_SETTINGS_VERSION 0x46 +#define MANUAL_PROXY 0x2 + +typedef struct { + DWORD version; + DWORD id; + DWORD flags; + BYTE data[1]; + /* DWORD proxy_server_len; */ + /* UTF8 proxy_server[proxy_server_len]; */ + /* DWORD bypass_list_len; */ + /* UTF8 bypass_list[bypass_list_len]; */ + /* DWORD configuration_script_len; */ + /* UTF8 configuration_script[configuration_script_len]; */ + /* DWORD unk[8]; set to 0 */ +} connection_settings; + +static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_server, + connection_settings **ret) +{ + DWORD size = FIELD_OFFSET(connection_settings, data), pos; + DWORD proxy_server_len; + + size += sizeof(DWORD); + if(proxy_server) + { + proxy_server_len = WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, + NULL, 0, NULL, NULL); + if(!proxy_server_len) return 0; + proxy_server_len--; + } + else + proxy_server_len = 0; + size += proxy_server_len; + size += sizeof(DWORD)*10; + + *ret = heap_alloc_zero(size); + if(!*ret) return 0; + + (*ret)->version = CONNECTION_SETTINGS_VERSION; + (*ret)->flags = 1; + if(manual_proxy) (*ret)->flags |= MANUAL_PROXY; + ((DWORD*)(*ret)->data)[0] = proxy_server_len; + pos = sizeof(DWORD); + if(proxy_server_len) + { + WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, + (char*)(*ret)->data+pos, proxy_server_len, NULL, NULL); + pos += proxy_server_len; + } + return size; +} + static void connections_on_initdialog(HWND hwnd) { DWORD type, size, enabled; @@ -110,11 +167,12 @@ static INT_PTR connections_on_command(HWND hwnd, WPARAM wparam) static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) { + connection_settings *default_connection; WCHAR addr[INTERNET_MAX_URL_LENGTH]; PSHNOTIFY *psn = (PSHNOTIFY*)lparam; - DWORD addr_len, port_len, enabled; + DWORD addr_len, port_len, enabled, size; LRESULT res; - HKEY hkey; + HKEY hkey, con; if(psn->hdr.code != PSN_APPLY) return FALSE; @@ -156,8 +214,29 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } + if(res) + { + RegCloseKey(hkey); + return FALSE; + } TRACE("ProxtServer set to %s\n", wine_dbgstr_w(addr)); + + res = RegCreateKeyExW(hkey, connections, 0, NULL, 0, KEY_WRITE, NULL, &con, NULL); RegCloseKey(hkey); + if(res) + return FALSE; + + size = create_connection_settings(enabled, addr, &default_connection); + if(!size) + { + RegCloseKey(con); + return FALSE; + } + + res = RegSetValueExW(con, default_connection_settings, 0, REG_BINARY, + (BYTE*)default_connection, size); + heap_free(default_connection); + RegCloseKey(con); return !res; }

1 0

Piotr Caban : inetcpl.cpl: Add proxy server settings dialog.
by Alexandre Julliard 03 Jul '18

03 Jul '18

1 0

Francois Gouget : dissect: Raise the Windows 10 failed tests limit for 1709.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: tools Branch: master Commit: 75094084bbe9856b1f7bc3648fa4021ffa5bacc6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=75094084bbe9856b1f7bc36… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 1 22:45:45 2018 +0200 dissect: Raise the Windows 10 failed tests limit for 1709. Windows 10 1709 has so many new test failures that its WineTest reports get rejected. But developers cannot fix test failures they are not aware of, resulting in slow progress. So temporarily increase the Windows 10 limit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index 4db4f85..24d5621 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -368,6 +368,8 @@ foreach my $entry (@idmatch) last; } } +# Give a little slack to the Windows 10 1709. +$maxfailedtests += 20 if ($version eq "win10"); if ($prediluvian and not $acceptprediluvianwin) {

1 0

Francois Gouget : testbot/WineRunTask: Fix the WineTest suite command.
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: tools Branch: master Commit: 2a44b307be628933989676183214a5d6bf56919e URL: https://source.winehq.org/git/tools.git/?a=commit;h=2a44b307be6289339896761… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 1 22:42:07 2018 +0200 testbot/WineRunTask: Fix the WineTest suite command. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index fb29663..0f2a093 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -461,7 +461,7 @@ elsif ($Step->Type eq "suite") if (defined($WebHostName)) { my $StepTask = 100 * $StepNo + $TaskNo; - $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\""; + $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\" "; } my $Info = $VM->Description ? $VM->Description : ""; if ($VM->Details)

1 0

Józef Kucia : tests: Get rid of create_texture().
by Alexandre Julliard 03 Jul '18

03 Jul '18

Module: vkd3d Branch: master Commit: a0800de4ed16e5d345f6728d066abe8093163f06 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0800de4ed16e5d345f6728… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 28 11:05:55 2018 +0200 tests: Get rid of create_texture(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 80 ++++++++++++++++++++++++------------------------ tests/vkd3d_d3d12_test.h | 1 - 2 files changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a0800de4ed16e5d345f…

1 0

Jump to page:

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-commits July 2018