December 2021 - Wine-Commits

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

Dec. 20, 2021

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 Dec. 20, 2021

Dec. 20, 2021

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

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

Dec. 20, 2021

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

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

Dec. 20, 2021

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

Rémi Bernon : dinput: Convert wide action format back to ansi in ConfigureDevices.
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: wine Branch: master Commit: e5131028b94818e4b5cfc3252ab51cdac62477ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5131028b94818e4b5cfc325… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:17 2021 +0100 dinput: Convert wide action format back to ansi in ConfigureDevices. 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 insertion(+) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 10b96a1e059..b7ec426b2e0 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -840,6 +840,7 @@ static HRESULT WINAPI dinput8_a_ConfigureDevices( IDirectInput8A *iface_a, LPDIC params_w.lprgFormats = &format_w; if (SUCCEEDED(hr)) hr = IDirectInput8_ConfigureDevices( iface_w, callback, &params_w, flags, ref ); + if (SUCCEEDED(hr)) diactionformat_wtoa( &format_w, format_a ); if (!format_w.hInstString) {

1 0

Alex Henrie : quartz: Fix memory leaks on error paths in FilterMapper3_RegisterFilter (cppcheck).
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: wine Branch: master Commit: 8e081d32bd35f5a2acdef10bd541ee039038e5ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e081d32bd35f5a2acdef10b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:56:08 2021 -0700 quartz: Fix memory leaks on error paths in FilterMapper3_RegisterFilter (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 230273891d4..a95f0ca7832 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -894,12 +894,16 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, if (FAILED(hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser))) + { + free(display_name); return hr; + } if (FAILED(hr = IParseDisplayName_ParseDisplayName(parser, NULL, display_name, &eaten, &moniker))) { ERR("Failed to parse display name, hr %#x.\n", hr); IParseDisplayName_Release(parser); + free(display_name); return hr; } @@ -909,6 +913,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, { ERR("Failed to get property bag, hr %#x.\n", hr); IMoniker_Release(moniker); + free(display_name); return hr; }

1 0

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

Dec. 20, 2021

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 Dec. 20, 2021

Dec. 20, 2021

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

Rémi Bernon : dinput: Ignore objects without a collection in init_pid_caps.
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: wine Branch: master Commit: 531297a8b4c3125c92b2bd0d10058bc753939fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=531297a8b4c3125c92b2bd0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:47:18 2021 +0100 dinput: Ignore objects without a collection in init_pid_caps. This makes sure we don't try to set effect_state report id from objects without a collection, causing some false warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 682af063ff1..64ddce3c7b0 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1732,6 +1732,9 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap FIXME( "multiple " #rep " report ids!\n" ); \ } while (0) + if (!instance->wCollectionNumber) + return DIENUM_CONTINUE; + if (instance->wCollectionNumber == effect_state->collection) SET_REPORT_ID( effect_state );

1 0

Alexandre Julliard : c2man: Add support for running on an entire git checkout.
by Alexandre Julliard Dec. 20, 2021

Dec. 20, 2021

Module: tools Branch: master Commit: ba6b317c028ad07db085238993166091e7578737 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ba6b317c028ad07db085238… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 20 10:53:53 2021 +0100 c2man: Add support for running on an entire git checkout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- c2man.pl | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/c2man.pl b/c2man.pl index c736c84..0fe9e78 100755 --- a/c2man.pl +++ b/c2man.pl @@ -95,6 +95,12 @@ sub process_comment($); sub process_extra_comment($); +sub basedir_name($) +{ + (my $file = shift) =~ s/^dlls\/([^\/]*)\/.*/$1/; + return $file +} + # Generate the list of exported entries for the dll sub process_spec_file($) { @@ -106,6 +112,7 @@ sub process_spec_file($) my $spec_details = { + FILE => $spec_name, NAME => $basename, DLL_NAME => $dll_name, DLL_EXT => $dll_ext, @@ -229,6 +236,7 @@ sub process_source_file($) my $source_file = shift; my $source_details = { + FILE => $source_file, CONTRIBUTORS => [ ], DEBUG_CHANNEL => "", }; @@ -1080,7 +1088,7 @@ sub output_comment($) # Write out an index file for each .spec processed sub process_index_files() { - foreach my $spec_file (keys %spec_files) + foreach my $spec_file (sort keys %spec_files) { my $spec_details = $spec_files{$spec_file}[0]; if (defined ($spec_details->{DLL_NAME})) @@ -1129,7 +1137,7 @@ sub output_spec($) } $percent_implemented = int($percent_implemented); my $percent_documented = 0; - if ($spec_details->{NUM_DOCS}) + if ($spec_details->{NUM_FUNCS}) { # Treat forwards and data as documented funcs for statistics $percent_documented = $spec_details->{NUM_DOCS} / $spec_details->{NUM_FUNCS} * 100; @@ -1138,15 +1146,16 @@ sub output_spec($) # Make a list of the contributors to this DLL. my @contributors; + my $files = 0; foreach my $source_file (keys %source_files) { my $source_details = $source_files{$source_file}[0]; - for (@{$source_details->{CONTRIBUTORS}}) - { - push (@contributors, $_); - } + next unless basedir_name($source_details->{FILE}) eq basedir_name($spec_details->{FILE}); + $files++; + push @contributors, @{$source_details->{CONTRIBUTORS}}; } + return unless $files > 0; my %saw; @contributors = grep(!$saw{$_}++, @contributors); # remove dups, from perlfaq4 manpage @@ -2317,6 +2326,18 @@ while(defined($_ = shift @ARGV)) } } +unless (@opt_source_file_list) +{ + # assume we are running from a git checkout + foreach my $f (split /\0/, `git ls-files -c -z`) + { + next unless $f =~ /^dlls\//; + next if $f =~ /\/tests\//; + push @opt_spec_file_list, $f if $f =~ /\.spec$/; + push @opt_source_file_list, $f if $f =~ /\.c$/; + } +} + # Remove duplicate include directories my %htmp; @opt_header_file_list = grep(!$htmp{$_}++, @opt_header_file_list);

1 0