wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Francois Gouget : testbot/SetWinLocale: Add an option to show the current locale settings.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: tools Branch: master Commit: ce81ca3bdeb0bc64655cf90329ac0d53b0e7d98e URL: https://source.winehq.org/git/tools.git/?a=commit;h=ce81ca3bdeb0bc64655cf90… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 23 17:29:11 2021 +0100 testbot/SetWinLocale: Add an option to show the current locale settings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 139 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 90c751d..8d2fb5e 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -41,6 +41,13 @@ use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; +my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; +my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; +my $HKCU_DESKTOP = "HKCU\\Control Panel\\Desktop"; +my $HKLM_LANGUAGE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language"; +my $HKLM_LOCALE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"; + # # Error handling and logging @@ -289,7 +296,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptReboot); +my ($OptHostName, $OptShow, $OptReboot); my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); while (@ARGV) { @@ -298,6 +305,10 @@ while (@ARGV) { $Usage = 0; } + elsif ($Arg eq "--show") + { + $OptShow = 1; + } elsif ($Arg eq "--reboot") { if (defined $OptReboot and !$OptReboot) @@ -414,7 +425,7 @@ if (!defined $Usage) } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and - !$OptCountry) + !$OptCountry and !$OptShow) { Error("you must specify at least one locale to change\n"); $Usage = 2; @@ -433,12 +444,14 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } + print "or $name0 [options] --show HOSTNAME\n"; print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; + print " --show Show the locale settings of the specified host and exit.\n"; print " --default LOC Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; @@ -474,6 +487,126 @@ if (defined $Usage) exit 0; } +my $TA = TestAgent->new($OptHostName, $AgentPort); + + +# +# Registry helpers +# + +sub RegGetValues($;$) +{ + my ($Key, $VName) = @_; + + my $Cmd = ["reg.exe", "query", $Key]; + if ($VName) + { + push @$Cmd, ($VName =~ /\*/ ? "/f" : "/v"), $VName; + } + else + { + push @$Cmd, "/ve"; + } + + my $Pid = $TA->Run($Cmd, 0, undef, "reg.out"); + if (!$Pid) + { + FatalError("failed to run @$Cmd\n"); + } + if (!defined $TA->Wait($Pid, 10)) + { + FatalError("@$Cmd timed out: ", $TA->GetLastError(), "\n"); + } + my $RegOut = $TA->GetFileToString("reg.out"); + $TA->Rm("reg.out"); + + my $Values = {}; + foreach my $Line (split /\n/, $RegOut) + { + if ($Line =~ /^\s{4}(.*)\s{4}REG_[A-Z_]+\s{4}(.*)\r$/) + { + my ($VName, $Value) = ($1, $2); + $Value = [split /\\0/, $Value] if ($Value =~ /\\0/); + $Values->{$VName} = $Value; + } + } + return $Values; +} + +sub RegGetValue($;$) +{ + my ($Key, $VName) = @_; + my $Values = RegGetValues($Key, $VName); + return $Values->{defined $VName ? $VName : "(Default)"}; +} + + +# +# Show the host's locale settings +# + +sub GetWinSettings($) +{ + my ($All) = @_; + my $Settings; + + if ($OptLocale or $All) + { + my $Values = RegGetValues($HKCU_INTERNATIONAL, "Locale*"); + map { $Settings->{$_} = $Values->{$_} } ("Locale", "LocaleName"); + } + if ($OptCountry or $All) + { + my $Values = RegGetValues($HKCU_GEO, "N*"); + $Settings->{Country} = $Values->{Nation}; + $Settings->{CountryName} = $Values->{Name}; + } + if ($OptKeyboard or $All) + { + $Settings->{InputMethod} = RegGetValue($HKCU_USER_PROFILE, "InputMethodOverride"); + } + if ($OptMUI or $All) + { + my $Values = RegGetValues($HKCU_DESKTOP, "*PreferredUILanguages*"); + map { $Settings->{$_} = $Values->{$_} } ("PreferredUILanguages", "PreferredUILanguagesPending", "PreviousPreferredUILanguages"); + } + if ($OptSystem or $All) + { + $Settings->{SysLanguage} = RegGetValue($HKLM_LANGUAGE, "Default"); + $Settings->{SysLocale} = RegGetValue($HKLM_LOCALE, "(Default)"); + } + return $Settings; +} + +sub Value2Str($) +{ + my ($Value) = @_; + return !defined $Value ? "<undef>" : + ref($Value) ne "ARRAY" ? $Value : + ("[". join(", ", @$Value) ."]"); +} + +sub ShowWinSettings($) +{ + my ($Settings) = @_; + print "Locale (--locale) = ", Value2Str($Settings->{Locale}), "\n"; + print "LocaleName (--locale) = ", Value2Str($Settings->{LocaleName}), "\n"; + print "Geo:Nation (--country) = ", Value2Str($Settings->{Country}), "\n"; + print "Geo:Name (--country) = ", Value2Str($Settings->{CountryName}), "\n"; + print "InputMethod (--keyboard) = ", Value2Str($Settings->{InputMethod}), "\n"; + print "PreferredUILanguages (--mui) = ", Value2Str($Settings->{PreferredUILanguages}), "\n"; + print " ...Pending (--mui) = ", Value2Str($Settings->{PreferredUILanguagesPending}), "\n"; + print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; + print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; + print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; +} + +if ($OptShow) +{ + ShowWinSettings(GetWinSettings("all")); + exit(0); +} + # # Generate the intl.cpl configuration @@ -526,8 +659,6 @@ push @Config, "</gs:GlobalizationServices>"; # Change the Windows locale using intl.cpl # -my $TA = TestAgent->new($OptHostName, $AgentPort); - Debug(Elapsed($Start), " Sending the configuration file\n"); print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug);

1 0

Francois Gouget : testbot/SetWinLocale: Fix a typo in the usage message.
by Alexandre Julliard 23 Dec '21

23 Dec '21

Module: tools Branch: master Commit: c346b162f1b3a60c6c9685e55d58e9c97d204e5e URL: https://source.winehq.org/git/tools.git/?a=commit;h=c346b162f1b3a60c6c9685e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 23 17:28:53 2021 +0100 testbot/SetWinLocale: Fix a typo in the usage message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index dc969e5..90c751d 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -447,7 +447,7 @@ if (defined $Usage) print " --locale USR Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; - print " . APIs: UserDefaultLCID(), GetThreadLocale().\n"; + print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n";

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 22 Dec '21

22 Dec '21

Module: wine Branch: master Commit: d03984709d87d6eaa0e2e7746f0db5d8fdf81b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d03984709d87d6eaa0e2e774… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 22 22:32:04 2021 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 554 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 210 insertions(+), 344 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d03984709d87d6eaa0e2…

1 0

Rémi Bernon : dinput: Return DIERR_INVALIDPARAM instead of DIERR_INPUTLOST from Acquire.
by Alexandre Julliard 22 Dec '21

22 Dec '21

Module: wine Branch: master Commit: ea93f283b500c59c56664ffdc7ad1d20dd45f659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea93f283b500c59c56664ffd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 22 14:46:16 2021 +0100 dinput: Return DIERR_INVALIDPARAM instead of DIERR_INPUTLOST from Acquire. MSDN states that the function can only return one of DIERR_INVALIDPARAM, DIERR_NOTINITIALIZED, DIERR_OTHERAPPHASPRIO, on error, and DI_OK, or DI_NOEFFECT, on success. Some games will try to call Acquire again in a tight loop and block the main thread if DIERR_INPUTLOST is returned. There's a small chance for this to happen with Resident Evil 2, whenever a joystick is plugged, then quickly unplugged. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 64ddce3c7b0..874eca6646e 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -866,7 +866,7 @@ static HRESULT hid_joystick_acquire( IDirectInputDevice8W *iface ) { impl->device = CreateFileW( impl->device_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, 0 ); - if (impl->device == INVALID_HANDLE_VALUE) return DIERR_INPUTLOST; + if (impl->device == INVALID_HANDLE_VALUE) return DIERR_INVALIDPARAM; } memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) ); @@ -876,7 +876,7 @@ static HRESULT hid_joystick_acquire( IDirectInputDevice8W *iface ) { CloseHandle( impl->device ); impl->device = INVALID_HANDLE_VALUE; - return DIERR_INPUTLOST; + return DIERR_INVALIDPARAM; } IDirectInputDevice8_SendForceFeedbackCommand( iface, DISFFC_RESET );

1 0

Rémi Bernon : dinput: Update internal thread events list on every wake up.
by Alexandre Julliard 22 Dec '21

22 Dec '21

Module: wine Branch: master Commit: ac442a78a1d50fc4f04529e64e5f0debc8df5fb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac442a78a1d50fc4f04529e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 22 14:46:15 2021 +0100 dinput: Update internal thread events list on every wake up. Instead of message notifications only. We have to remove the events from devices that are automatically unacquired whenever a read failed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index cab8886f9db..a62d4d2ea3d 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1311,16 +1311,9 @@ static DWORD WINAPI dinput_thread_proc( void *params ) goto done; } - events_count = 0; EnterCriticalSection( &dinput_hook_crit ); kbd_cnt = list_count( &acquired_keyboard_list ); mice_cnt = list_count( &acquired_mouse_list ); - LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, struct dinput_device, entry ) - { - if (!impl->read_event || !impl->vtbl->read) continue; - if (events_count >= ARRAY_SIZE(events)) break; - events[events_count++] = impl->read_event; - } LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) @@ -1341,8 +1334,20 @@ static DWORD WINAPI dinput_thread_proc( void *params ) SetEvent(finished_event); } + + events_count = 0; + EnterCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, struct dinput_device, entry ) + { + if (!impl->read_event || !impl->vtbl->read) continue; + if (events_count >= ARRAY_SIZE(events)) break; + events[events_count++] = impl->read_event; + } + LeaveCriticalSection( &dinput_hook_crit ); } + if (ret != events_count) ERR("Unexpected termination, ret %#x\n", ret); + done: DestroyWindow( di_em_win ); di_em_win = NULL;

1 0

Huw Davies : winecoreaudio: Actually free the stream.
by Alexandre Julliard 22 Dec '21

22 Dec '21

Module: wine Branch: master Commit: a7f0647dec27a588e2fdfb825c7f2420034f6dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f0647dec27a588e2fdfb82… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 21 15:45:13 2021 +0000 winecoreaudio: Actually free the stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 4bb83a37621..3f694b95a49 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -726,6 +726,7 @@ static NTSTATUS release_stream( void *args ) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &stream->tmp_buffer_size, MEM_RELEASE); free(stream->fmt); + free(stream); params->result = S_OK; return STATUS_SUCCESS; }

1 0

Huw Davies : winecoreaudio: Set the buffer to NULL after freeing.
by Alexandre Julliard 22 Dec '21

22 Dec '21

Module: wine Branch: master Commit: e03611ee599a47593742414540cd01a0ed9623c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e03611ee599a475937424145… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 21 15:45:12 2021 +0000 winecoreaudio: Set the buffer to NULL after freeing. This ensures the subsequent allocation is free to pick a new location. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52202 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 00bd79927ca..4bb83a37621 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1352,8 +1352,11 @@ static NTSTATUS get_render_buffer(void *args) if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < params->frames){ - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_size, MEM_RELEASE); + if(stream->tmp_buffer){ + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){

1 0

Alex Henrie : win32u: Handle memory allocation failures in nulldrv_PolyBezierTo (cppcheck).
by Alexandre Julliard 22 Dec '21

22 Dec '21

Module: wine Branch: master Commit: b498f38e1c41759a2bbe4f1f7bcfd63e302adcd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b498f38e1c41759a2bbe4f1f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 22 13:35:36 2021 +0000 win32u: Handle memory allocation failures in nulldrv_PolyBezierTo (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/painting.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 7939ea878da..648630cf2c0 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -156,7 +156,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) { DC *dc = get_nulldrv_dc( dev ); - POINT *line_pts = NULL, *bzr_pts = NULL, bzr[4]; + POINT *line_pts = NULL, *new_line_pts, *bzr_pts = NULL, bzr[4]; DWORD i; INT num_pts, num_bzr_pts, space, size; @@ -182,6 +182,7 @@ BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types space = count + 300; line_pts = malloc( space * sizeof(POINT) ); + if (!line_pts) return FALSE; num_pts = 1; line_pts[0] = dc->attr->cur_pos; @@ -209,7 +210,14 @@ BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types if (space < size) { space = size * 2; - line_pts = realloc( line_pts, space * sizeof(POINT) ); + new_line_pts = realloc( line_pts, space * sizeof(POINT) ); + if (!new_line_pts) + { + free( bzr_pts ); + free( line_pts ); + return FALSE; + } + line_pts = new_line_pts; } memcpy( &line_pts[num_pts], &bzr_pts[1], (num_bzr_pts - 1) * sizeof(POINT) ); num_pts += num_bzr_pts - 1;

1 0

Zebediah Figura : quartz/tests: Test querying connection state inside of IPin::ReceiveConnection().
by Alexandre Julliard 22 Dec '21

22 Dec '21

Module: wine Branch: master Commit: 15a01af70b06e748e456d0889b328fc91e46838a URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a01af70b06e748e456d088… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 21 21:56:03 2021 -0600 quartz/tests: Test querying connection state inside of IPin::ReceiveConnection(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 10088c033b7..80ee6607279 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -913,6 +913,25 @@ static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int return VFW_S_NO_MORE_ITEMS; } +static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + AM_MEDIA_TYPE mt2; + IPin *peer2; + HRESULT hr; + + hr = IPin_ConnectedTo(peer, &peer2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer2 == &iface->pin.IPin_iface, "Peer didn't match.\n"); + IPin_Release(peer2); + + hr = IPin_ConnectionMediaType(peer, &mt2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, &mt2), "Media types didn't match.\n"); + FreeMediaType(&mt2); + + return S_OK; +} + static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); @@ -976,6 +995,7 @@ static const struct strmbase_sink_ops testsink_ops = .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, + .sink_connect = testsink_connect, .pfnReceive = testsink_Receive, .sink_eos = testsink_eos, .sink_new_segment = testsink_new_segment,

1 0

Zebediah Figura : server: Avoid using the long double type on non-x86 platforms.
by Alexandre Julliard 22 Dec '21

22 Dec '21

Module: wine Branch: master Commit: 674d70a611e0709850b0e7567378fa20b178b4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=674d70a611e0709850b0e756… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 21 21:55:41 2021 -0600 server: Avoid using the long double type on non-x86 platforms. We especially may want to support x86 on ARM, where long double is not an 80-bit type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/trace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/trace.c b/server/trace.c index a1a8726ba71..a48f00258fe 100644 --- a/server/trace.c +++ b/server/trace.c @@ -666,9 +666,11 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) ctx.fp.i386_regs.data_off, ctx.fp.i386_regs.data_sel, ctx.fp.i386_regs.cr0npx ); for (i = 0; i < 8; i++) { - long double reg = 0; - memcpy( &reg, &ctx.fp.i386_regs.regs[10 * i], 10 ); - fprintf( stderr, ",fp.reg%u=%Lg", i, reg ); + unsigned __int64 reg[2]; + memset( reg, 0, sizeof(reg) ); + memcpy( reg, &ctx.fp.i386_regs.regs[10 * i], 10 ); + fprintf( stderr, ",fp.reg%u=", i ); + dump_uint128( "", reg ); } } if (ctx.flags & SERVER_CTX_EXTENDED_REGISTERS)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
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