December 2021 - Wine-commits

Alex Henrie : wpcap: Remove unused variable ptr from build_win32_description (cppcheck).
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: bd7d771433adc65fe554369d79395c8767135493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7d771433adc65fe554369d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:54:51 2021 -0700 wpcap: Remove unused variable ptr from build_win32_description (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 59e8f43f77c..b140deeb3d2 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -240,10 +240,10 @@ static char *build_win32_name( const char *source, const char *adapter_name ) static char *build_win32_description( const struct pcap_interface *unix_dev ) { int len = strlen(unix_dev->name) + 1; - char *ret, *ptr; + char *ret; if (unix_dev->description && unix_dev->description[0]) len += strlen(unix_dev->description) + 1; - if ((ret = ptr = malloc( len ))) + if ((ret = malloc( len ))) { if (unix_dev->description) {

1 0

Floris Renaud : wineconsole: Remove "option" from the man page.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: e3d56549c993c0ff5601ba9cf3f84201b0891b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d56549c993c0ff5601ba9c… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Dec 21 10:33:35 2021 +0100 wineconsole: Remove "option" from the man page. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.man.in b/programs/wineconsole/wineconsole.man.in index 251579c1422..dac4e62f321 100644 --- a/programs/wineconsole/wineconsole.man.in +++ b/programs/wineconsole/wineconsole.man.in @@ -3,11 +3,11 @@ wineconsole \- The Wine console .SH SYNOPSIS .B wineconsole -.RI [ option "] " command +.RI [ command "] " .SH DESCRIPTION .B wineconsole is the Wine console manager, used to run console commands and applications. It allows running the -console either in the current terminal (\fIcurses\fR) or in a newly made window (\fIuser\fR). +console in a newly made window. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org

1 0

Francois Gouget : testbot/SetWinLocale: Accept underscores in the locale names.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: tools Branch: master Commit: 73bd7f01fbefb1d29b32560b6bc52e55e4c38d6f URL: https://source.winehq.org/git/tools.git/?a=commit;h=73bd7f01fbefb1d29b32560… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 21 16:38:29 2021 +0100 testbot/SetWinLocale: Accept underscores in the locale names. Also avoid undefined value errors if the locale value is missing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 7ddbded..4ecc0cb 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -279,14 +279,16 @@ sub CheckValue($$) sub CheckLocale($$) { my ($Option, $Value) = @_; + $Value = CheckValue($Option, $Value); - if ($Value !~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/) - { - Error("'$Value' is not a valid $Option locale\n"); - $Usage = 2; - return undef; - } - return $Value; + return undef if (!defined $Value); + + $Value =~ s/_/-/g; + return $Value if ($Value =~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/); + + Error("'$Value' is not a valid $Option locale\n"); + $Usage = 2; + return undef; } my ($OptHostName, $OptReboot);

1 0

Francois Gouget : testbot/SetWinLocale: Show the intl.cpl XML file in --debug mode.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: tools Branch: master Commit: 5922e16ff817a380bae24b8f981c6d52f1f5a1ad URL: https://source.winehq.org/git/tools.git/?a=commit;h=5922e16ff817a380bae24b8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 21 16:38:47 2021 +0100 testbot/SetWinLocale: Show the intl.cpl XML file in --debug mode. In addition to the --dry-run mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 4ecc0cb..d4ba517 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -786,11 +786,10 @@ $OptHostName = $VM->Hostname if ($VM); # For error messages my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); Debug(Elapsed($Start), " Sending the configuration file\n"); -if ($DryRun) -{ - print STDERR join("\n", "locales.xml:", @Config, ""); -} -elsif (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); + +if (!$DryRun and + !$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) { FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); }

1 0

Francois Gouget : testbot/SetWinLocale: Remove the VM options.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: tools Branch: master Commit: 206c7478dcb4cd1eff43201413637293fb51fc26 URL: https://source.winehq.org/git/tools.git/?a=commit;h=206c7478dcb4cd1eff43201… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 21 16:39:05 2021 +0100 testbot/SetWinLocale: Remove the VM options. The TestBot creates the the missing live snapshots itself so these options were unused. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 327 +++-------------------------------------------- 1 file changed, 21 insertions(+), 306 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=206c7478dcb4cd1eff4…

1 0

Jacek Caban : win32u: Use null driver to handle virtual display devices.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: e63f7b7aa1226e304a84a457029883dfe97a79c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e63f7b7aa1226e304a84a457… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 17 14:57:22 2021 +0100 win32u: Use null driver to handle virtual display devices. All drivers support UpdateDisplayDevices now, so we can avoid a server call by being explicit in the null driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52180 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/driver.c | 1 + dlls/win32u/sysparams.c | 48 ++++++++++++++---------------------------------- 2 files changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 405dbf38e11..39996086c6d 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -774,6 +774,7 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM static void CDECL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) { + manager->add_monitor( NULL, param ); /* use virtual monitor */ } static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e06a63bd4cd..4c65bd9d7f1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -774,6 +774,7 @@ struct device_manager_ctx WCHAR gpu_guid[64]; LUID gpu_luid; HKEY adapter_key; + BOOL virtual_monitor; }; static void link_device( const WCHAR *instance, const WCHAR *class ) @@ -1047,6 +1048,12 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) static const WCHAR default_monitorW[] = {'M','O','N','I','T','O','R','\\','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; + if (!monitor) + { + ctx->virtual_monitor = TRUE; + return; + } + TRACE( "%s %s %s\n", debugstr_w(monitor->name), wine_dbgstr_rect(&monitor->rc_monitor), wine_dbgstr_rect(&monitor->rc_work) ); @@ -1271,6 +1278,12 @@ static BOOL update_display_cache(void) user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); release_display_manager_ctx( &ctx ); + if (ctx.virtual_monitor) + { + clear_display_devices(); + list_add_tail( &monitors, &virtual_monitor.entry ); + return TRUE; + } if (update_display_cache_from_registry()) return TRUE; if (ctx.gpu_count) @@ -1280,20 +1293,6 @@ static BOOL update_display_cache(void) } user_driver->pUpdateDisplayDevices( &device_manager, TRUE, &ctx ); - if (!ctx.gpu_count) - { - static const struct gdi_monitor default_monitor = - { - .rc_work.right = 1024, - .rc_work.bottom = 768, - .rc_monitor.right = 1024, - .rc_monitor.bottom = 768, - .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, - }; - - TRACE( "adding default fake monitor\n"); - add_monitor( &default_monitor, &ctx ); - } release_display_manager_ctx( &ctx ); if (!update_display_cache_from_registry()) @@ -1307,27 +1306,8 @@ static BOOL update_display_cache(void) static BOOL lock_display_devices(void) { - USEROBJECTFLAGS flags; - HWINSTA winstation; - + if (!update_display_cache()) return FALSE; pthread_mutex_lock( &display_lock ); - - /* Report physical monitor information only if window station has visible display surfaces */ - winstation = NtUserGetProcessWindowStation(); - if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && - (flags.dwFlags & WSF_VISIBLE)) - { - pthread_mutex_unlock( &display_lock ); - if (!update_display_cache()) return FALSE; - pthread_mutex_lock( &display_lock ); - } - else - { - clear_display_devices(); - list_add_tail( &monitors, &virtual_monitor.entry ); - last_query_display_time = 0; - } - return TRUE; }

1 0

Michael Stefaniuc : dinput8/tests: Don't test value again if it wasn't touched.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 3ee286937f56186be028bff9f391fb04c4f78a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ee286937f56186be028bff9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 18 12:22:52 2021 +0100 dinput8/tests: Don't test value again if it wasn't touched. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 35d72409af5..82657c2e235 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1730,7 +1730,6 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle status = HidP_SetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, 0, preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status ); - ok( value == 0, "got value %x, expected %#x\n", value, 0 ); value = HidP_MaxUsageListLength( HidP_Feature + 1, 0, preparsed_data ); ok( value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0 );

1 0

Alex Henrie : nsiproxy: Fix memory leaks on error paths in get_ipv6_addr_scope_table (cppcheck).
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: cf7dd52091400c39c3f5718de8258b3ca97f36be URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf7dd52091400c39c3f5718d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:55:31 2021 -0700 nsiproxy: Fix memory leaks on error paths in get_ipv6_addr_scope_table (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 6dd0aaa9b45..0cd81ae86e5 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -235,7 +235,7 @@ static inline MIB_TCP_STATE tcp_state_to_mib_state( int state ) struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { - struct ipv6_addr_scope *table = NULL; + struct ipv6_addr_scope *table = NULL, *new_table; unsigned int table_size = 0, num = 0; #ifdef __linux__ @@ -260,11 +260,12 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = realloc( table, table_size * sizeof(table[0]) ))) + if (!(new_table = realloc( table, table_size * sizeof(table[0]) ))) { fclose( fp ); goto failed; } + table = new_table; } entry = table + num - 1; @@ -292,11 +293,12 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = realloc( table, table_size * sizeof(table[0]) ))) + if (!(new_table = realloc( table, table_size * sizeof(table[0]) ))) { freeifaddrs( addrs ); goto failed; } + table = new_table; } sin6 = (struct sockaddr_in6 *)cur->ifa_addr;

1 0

Alex Henrie : win32u: Fix memory leak on error path in PATH_WidenPath (cppcheck).
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: d45d54ef181289e0bdc53a9f5981625982c99a11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45d54ef181289e0bdc53a9f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 20 07:43:24 2021 +0000 win32u: Fix memory leak on error path in PATH_WidenPath (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/path.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/path.c b/dlls/win32u/path.c index 05123a2f2e4..a87a7ab06c2 100644 --- a/dlls/win32u/path.c +++ b/dlls/win32u/path.c @@ -1616,7 +1616,7 @@ BOOL WINAPI NtGdiFlattenPath( HDC hdc ) static struct gdi_path *PATH_WidenPath(DC *dc) { INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; - struct gdi_path *flat_path, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; + struct gdi_path *flat_path, *pNewPath, **pStrokes = NULL, **new_strokes, *pUpPath, *pDownPath; EXTLOGPEN *elp; BYTE *type; DWORD obj_type, joint, endcap, penType; @@ -1681,12 +1681,14 @@ static struct gdi_path *PATH_WidenPath(DC *dc) case PT_MOVETO: numStrokes++; j = 0; - pStrokes = realloc( pStrokes, numStrokes * sizeof(*pStrokes) ); - if(!pStrokes) + new_strokes = realloc( pStrokes, numStrokes * sizeof(*pStrokes) ); + if (!new_strokes) { free_gdi_path(flat_path); + free(pStrokes); return NULL; } + pStrokes = new_strokes; pStrokes[numStrokes - 1] = alloc_gdi_path(0); /* fall through */ case PT_LINETO:

1 0

Bernhard Übelacker : winedbg: Fix disassemble with end addresses exceeding 32-bit.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: f174f18f2f689f963095ad9ba05f4329b2500a5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f174f18f2f689f963095ad9b… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sat Dec 18 20:07:54 2021 +0100 winedbg: Fix disassemble with end addresses exceeding 32-bit. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 5e01bef5607..0c8e1ee0d19 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -769,7 +769,7 @@ void memory_disassemble(const struct dbg_lvalue* xstart, const struct dbg_lvalue* xend, int instruction_count) { static ADDRESS64 last = {0,0,0}; - int stop = 0; + dbg_lgint_t stop = 0; int i; if (!xstart && !xend)

1 0