wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Rémi Bernon : dinput: Keep action names when converting back to ansi.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: dd1f3434d6ef5f1e7357fcfe29c209d2def907a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1f3434d6ef5f1e7357fcfe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:15 2021 +0100 dinput: Keep action names when converting back to ansi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52198 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 3c7b6ced169..a773dacbec5 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -150,7 +150,6 @@ static void diactionformat_wtoa( const DIACTIONFORMATW *in, DIACTIONFORMATA *out out->rgoAction[i].guidInstance = in->rgoAction[i].guidInstance; out->rgoAction[i].dwObjID = in->rgoAction[i].dwObjID; out->rgoAction[i].dwHow = in->rgoAction[i].dwHow; - out->rgoAction[i].lptszActionName = 0; } out->guidActionMap = in->guidActionMap;

1 0

Francois Gouget : winetest: Send the tests output to stdout when given "-o -".
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 2da7e5de237deb3281e7469bd55cfaf710e4ee22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da7e5de237deb3281e7469b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 20 11:46:18 2021 +0100 winetest: Send the tests output to stdout when given "-o -". This makes it easier to use WineTest with tools that capture stdout, such as the TestBot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7ced565447b..0c431a903d7 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1051,7 +1051,8 @@ run_tests (char *logname, char *outdir) sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; - logfile = CreateFileA( logname, GENERIC_READ|GENERIC_WRITE, + logfile = strcmp(logname, "-") == 0 ? GetStdHandle( STD_OUTPUT_HANDLE ) : + CreateFileA( logname, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, &sa, CREATE_ALWAYS, 0, NULL ); @@ -1175,7 +1176,7 @@ run_tests (char *logname, char *outdir) report (R_DELTA, 0, "Running: Done"); report (R_STATUS, "Cleaning up - %u failures", failures); - CloseHandle( logfile ); + if (strcmp(logname, "-") != 0) CloseHandle( logfile ); logfile = 0; if (newdir) remove_dir (tempdir);

1 0

Eric Pouech : cmd: Don't crash on 'if exist' without parameter.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 535da77552deb74198f0fe8fedae3bbab5115ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535da77552deb74198f0fe8f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 20 10:29:01 2021 +0100 cmd: Don't crash on 'if exist' without parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51598 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d0a954d90fa..d14e69e072a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2811,8 +2811,9 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); int len = lstrlenW(param); + if (!len) goto syntax_err; /* FindFirstFile does not like a directory path ending in '\', append a '.' */ - if (len && param[len-1] == '\\') lstrcatW(param, L"."); + if (param[len-1] == '\\') lstrcatW(param, L"."); hff = FindFirstFileW(param, &fd); *test = (hff != INVALID_HANDLE_VALUE );

1 0

Eric Pouech : kernelbase: Don't hardcode magic constants.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: wine Branch: master Commit: 488a00c3be2e4ef0dd0c945ac96e0f1a49c449f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=488a00c3be2e4ef0dd0c945a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 18 09:13:12 2021 +0100 kernelbase: Don't hardcode magic constants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 0e4a3eb9b6b..12187b92e5c 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -33,6 +33,7 @@ #include "kernelbase.h" #include "wine/debug.h" +#include "wine/condrv.h" WINE_DEFAULT_DEBUG_CHANNEL(process); @@ -189,7 +190,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename RtlFreeUnicodeString( &newdirW ); if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; - if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = (HANDLE)1; /* KERNEL32_CONSOLE_ALLOC */ + if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = CONSOLE_HANDLE_ALLOC; else if (!(flags & DETACHED_PROCESS)) params->ConsoleHandle = NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle; if (startup->dwFlags & STARTF_USESTDHANDLES)

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

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

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

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

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

Alexandre Julliard : wine_release: Run c2man.pl directly.
by Alexandre Julliard 20 Dec '21

20 Dec '21

Module: tools Branch: master Commit: 0eed6f3a9b0d5ae7058c2ba37ba84b7addc5e21f URL: https://source.winehq.org/git/tools.git/?a=commit;h=0eed6f3a9b0d5ae7058c2ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 20 10:54:07 2021 +0100 wine_release: Run c2man.pl directly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- wine_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine_release b/wine_release index b6a27bd..1ef8b7e 100755 --- a/wine_release +++ b/wine_release @@ -69,7 +69,7 @@ then groff -man -T html -P -l -k -K utf8 $f | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/$lang/docs/`basename $name .$lang.UTF-8`.template done - make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI + $tools_dir/c2man.pl -Th -Iinclude -o documentation/html && rm -rf ../WineAPI && mv documentation/html ../WineAPI cd .. rm -rf wine-$version

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
57
Older →

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 December 2021