December 2021 - Wine-Commits

Zebediah Figura : winex11: Fix the build when XInput2 headers are not present.
by Alexandre Julliard Dec. 22, 2021

Dec. 22, 2021

Module: wine Branch: master Commit: 6ef7cd4e3ae54d6ed09d85a2518e7e64d7f03573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ef7cd4e3ae54d6ed09d85a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 21 20:26:52 2021 -0600 winex11: Fix the build when XInput2 headers are not present. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 155 ++++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 76 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 9e56e080bda..51a6828f10c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -275,7 +275,6 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator thread_data->x_valuator.value = 0; thread_data->y_valuator.value = 0; } -#endif /*********************************************************************** @@ -283,7 +282,6 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator */ static void enable_xinput2(void) { -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; XIDeviceInfo *pointer_info; @@ -330,9 +328,10 @@ static void enable_xinput2(void) data->xi2_current_slave = 0; data->xi2_state = xi_enabled; -#endif } +#endif + /*********************************************************************** * disable_xinput2 */ @@ -371,6 +370,7 @@ static void disable_xinput2(void) */ static BOOL grab_clipping_window( const RECT *clip ) { +#if HAVE_X11_EXTENSIONS_XINPUT2_H static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); Window clip_window; @@ -441,6 +441,10 @@ static BOOL grab_clipping_window( const RECT *clip ) data->clip_hwnd = msg_hwnd; SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, (LPARAM)msg_hwnd ); return TRUE; +#else + WARN( "XInput2 was not available at compile time\n" ); + return FALSE; +#endif } /*********************************************************************** @@ -628,79 +632,6 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x input->u.mi.dy = pt.y; } -static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) -{ - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; - double x_value = 0, y_value = 0, x_scale, y_scale; - const double *values = event->valuators.values; - RECT virtual_rect; - int i; - - if (x->number < 0 || y->number < 0) return FALSE; - if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; - - /* If there is no slave currently detected, no previous motion nor device - * change events were received. Look it up now on the device list in this - * case. - */ - if (!thread_data->xi2_current_slave) - { - XIDeviceInfo *devices = thread_data->xi2_devices; - - for (i = 0; i < thread_data->xi2_device_count; i++) - { - if (devices[i].use != XISlavePointer) continue; - if (devices[i].deviceid != event->deviceid) continue; - if (devices[i].attachment != thread_data->xi2_core_pointer) continue; - thread_data->xi2_current_slave = event->deviceid; - break; - } - } - if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - - virtual_rect = get_virtual_screen_rect(); - - if (x->max <= x->min) x_scale = 1; - else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); - if (y->max <= y->min) y_scale = 1; - else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); - - for (i = 0; i <= max( x->number, y->number ); i++) - { - if (!XIMaskIsSet( event->valuators.mask, i )) continue; - if (i == x->number) - { - x_value = *values; - x->value += x_value * x_scale; - } - if (i == y->number) - { - y_value = *values; - y->value += y_value * y_scale; - } - values++; - } - - input->u.mi.dx = round( x->value ); - input->u.mi.dy = round( y->value ); - - TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy ); - - x->value -= input->u.mi.dx; - y->value -= input->u.mi.dy; - - if (!input->u.mi.dx && !input->u.mi.dy) - { - TRACE( "accumulating motion\n" ); - return FALSE; - } - - return TRUE; -} - - /*********************************************************************** * send_mouse_input * @@ -1887,6 +1818,78 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev ) return TRUE; } +static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; + double x_value = 0, y_value = 0, x_scale, y_scale; + const double *values = event->valuators.values; + RECT virtual_rect; + int i; + + if (x->number < 0 || y->number < 0) return FALSE; + if (!event->valuators.mask_len) return FALSE; + if (thread_data->xi2_state != xi_enabled) return FALSE; + + /* If there is no slave currently detected, no previous motion nor device + * change events were received. Look it up now on the device list in this + * case. + */ + if (!thread_data->xi2_current_slave) + { + XIDeviceInfo *devices = thread_data->xi2_devices; + + for (i = 0; i < thread_data->xi2_device_count; i++) + { + if (devices[i].use != XISlavePointer) continue; + if (devices[i].deviceid != event->deviceid) continue; + if (devices[i].attachment != thread_data->xi2_core_pointer) continue; + thread_data->xi2_current_slave = event->deviceid; + break; + } + } + if (event->deviceid != thread_data->xi2_current_slave) return FALSE; + + virtual_rect = get_virtual_screen_rect(); + + if (x->max <= x->min) x_scale = 1; + else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); + if (y->max <= y->min) y_scale = 1; + else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); + + for (i = 0; i <= max( x->number, y->number ); i++) + { + if (!XIMaskIsSet( event->valuators.mask, i )) continue; + if (i == x->number) + { + x_value = *values; + x->value += x_value * x_scale; + } + if (i == y->number) + { + y_value = *values; + y->value += y_value * y_scale; + } + values++; + } + + input->u.mi.dx = round( x->value ); + input->u.mi.dy = round( y->value ); + + TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy ); + + x->value -= input->u.mi.dx; + y->value -= input->u.mi.dy; + + if (!input->u.mi.dx && !input->u.mi.dy) + { + TRACE( "accumulating motion\n" ); + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * X11DRV_RawMotion */

1 0

Floris Renaud : po: Update Dutch time zones translation.
by Alexandre Julliard Dec. 22, 2021

Dec. 22, 2021

Module: wine Branch: master Commit: 110e68eb9e981b204bb9ca82d1e492e2be2209bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=110e68eb9e981b204bb9ca82… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Dec 22 09:51:58 2021 +0100 po: Update Dutch time zones translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index ee88b224ec4..2abb4cd694d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-01 16:10+0100\n" +"PO-Revision-Date: 2021-12-22 10:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -10554,22 +10554,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, Londen" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "Soedan Standaard Tijd" +msgstr "Zuid-Soedan Standaard Tijd" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Soedan Zomertijd" +msgstr "Zuid-Soedan Zomertijd" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) Jeruzalem" +msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 22, 2021

Dec. 22, 2021

Module: wine Branch: master Commit: b40b8c94fce048ae8123be5f4bb9a4d21de80d3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b40b8c94fce048ae8123be5f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Dec 21 23:33:10 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index e100c0b1674..944bdc80c05 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-25 20:31+0200\n" +"PO-Revision-Date: 2021-12-21 23:32+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10533,22 +10533,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublinas, Edinburgas, Lisabona, Londonas" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "Sudano juostinis laikas" +msgstr "Pietų Sudano juostinis laikas" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Sudano vasaros laikas" +msgstr "Pietų Sudano vasaros laikas" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) Jeruzalė" +msgstr "(UTC+02:00) Džuba" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time"

1 0

Francois Gouget : testbot/SetWinLocale: Add more information to the usage message.
by Alexandre Julliard Dec. 22, 2021

Dec. 22, 2021

Module: tools Branch: master Commit: e6174bc97f313f9a68ff5ac732e36aa24c637d88 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e6174bc97f313f9a68ff5ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 22 17:45:51 2021 +0100 testbot/SetWinLocale: Add more information to the usage message. Document which options require a reboot or log out + log in. Also cross-reference the options with the Windows 10 GUI to help with manual testing; and with the Windows APIs to help match them to the WineTest output. 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, 16 insertions(+) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index c5f164d..67052f0 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -445,11 +445,27 @@ if (defined $Usage) print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; 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 " --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"; + print " Administrative Language Settings -> Change system locale.\n"; + print " . APIs: GetSystemDefaultLCID().\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; + print " . Only takes effect after a log out + log in.\n"; + print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; + print " display language.\n"; + print " . APIs: GetSystemPreferredUILanguages(),\n"; + print " GetUserDefaultUILanguage(), GetThreadUILanguage().\n"; print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; + print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; + print " Override for default input method.\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; + print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; + print " . APIs: GetUserGeoID().\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n";

1 0

Francois Gouget : testbot/SetWinLocale: Reorder the intl.cpl's XML file elements.
by Alexandre Julliard Dec. 22, 2021

Dec. 22, 2021

Module: tools Branch: master Commit: ca35a369c9829a50f3f5f0076f9f961264b27cf9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ca35a369c9829a50f3f5f00… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 22 17:46:24 2021 +0100 testbot/SetWinLocale: Reorder the intl.cpl's XML file elements. They now match the order in the documentation in case it matters. Also removed redundant comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index c4ca7df..dc969e5 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -486,22 +486,9 @@ my @Config = ( " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='true' CopySettingsToSystemAcct='true'/>", " </gs:UserList>", ); -if ($OptLocale) -{ - push @Config, " ", - " <gs:UserLocale>", - " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", - " </gs:UserLocale>"; -} -if ($OptSystem) -{ - push @Config, " ", - " <gs:SystemLocale Name='$OptSystem'/>"; -} if (defined $CountryId) { - push @Config, " ", - " <gs:LocationPreferences>", + push @Config, " <gs:LocationPreferences>", " <gs:GeoID Value='$CountryId'/>", " </gs:LocationPreferences>"; } @@ -511,10 +498,13 @@ if ($OptMUI) " <gs:MUILanguage Value='$OptMUI'/>", " </gs:MUILanguagePreferences>"; } +if ($OptSystem) +{ + push @Config, " <gs:SystemLocale Name='$OptSystem'/>"; +} if ($KeyboardIds) { - push @Config, " ", - " <gs:InputPreferences>"; + push @Config, " <gs:InputPreferences>"; my $Default = " Default='true'"; foreach my $Id (@$KeyboardIds) { @@ -523,6 +513,12 @@ if ($KeyboardIds) } push @Config, " </gs:InputPreferences>"; } +if ($OptLocale) +{ + push @Config, " <gs:UserLocale>", + " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", + " </gs:UserLocale>"; +} push @Config, "</gs:GlobalizationServices>";

1 0

Francois Gouget : testbot/SetWinLocale: Simplify checking for the locale options.
by Alexandre Julliard Dec. 22, 2021

Dec. 22, 2021

Module: tools Branch: master Commit: 90a6b5898731ef4f9fa2b48757715a418381576c URL: https://source.winehq.org/git/tools.git/?a=commit;h=90a6b5898731ef4f9fa2b48… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 22 17:46:02 2021 +0100 testbot/SetWinLocale: Simplify checking for the locale options. They cannot have a defined value that is false. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 67052f0..c4ca7df 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -413,8 +413,8 @@ if (!defined $Usage) $CountryId = $Countries{$OptCountry}; } - if (!defined $OptLocale and !defined $OptSystem and !defined $OptMUI and - !defined $OptKeyboard and !defined $OptCountry) + if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and + !$OptCountry) { Error("you must specify at least one locale to change\n"); $Usage = 2;

1 0

Bernhard Übelacker : msxml3: Fix crashes due to access to invalid context pointer.
by Alexandre Julliard Dec. 21, 2021

Dec. 21, 2021

Module: wine Branch: master Commit: 2ef4cde8ef65800db480588edc0ea3da8f527b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef4cde8ef65800db480588e… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Dec 20 09:33:55 2021 +0100 msxml3: Fix crashes due to access to invalid context pointer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52073 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 721ad54e379..272e438e773 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1329,7 +1329,7 @@ static HRESULT import_loader_onDataAvailable(void *ctxt, char *ptr, DWORD len) inputbuffer = xmlParserInputBufferCreateIO(import_loader_io_read, import_loader_io_close, buffer, XML_CHAR_ENCODING_NONE); - *input = xmlNewIOInputStream(ctxt, inputbuffer, XML_CHAR_ENCODING_NONE); + *input = xmlNewIOInputStream(NULL, inputbuffer, XML_CHAR_ENCODING_NONE); if (!*input) xmlFreeParserInputBuffer(inputbuffer);

1 0

Andrey Gusev : ntdll: Fix a variable name in TRACE() message.
by Alexandre Julliard Dec. 21, 2021

Dec. 21, 2021

Module: wine Branch: master Commit: 93b7c335d6985609380be6b2a526e573725a0bd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93b7c335d6985609380be6b2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 21 17:28:48 2021 +0200 ntdll: Fix a variable name in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d11f3f0f79d..c8f3d83947f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3127,7 +3127,7 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch WCHAR *dllname; HANDLE mapping; - TRACE( "flag %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", + TRACE( "flags %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", flags, load_path, dll_characteristics, name, base ); if (flags & ~valid_flags) return STATUS_INVALID_PARAMETER;

1 0

Paul Gofman : ntdll: Restore FP status words from MSVCRT_JUMP_BUFFER on x64.
by Alexandre Julliard Dec. 21, 2021

Dec. 21, 2021

Module: wine Branch: master Commit: 6b78bcff921826c9b490a88b6759f8c65f17fa3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b78bcff921826c9b490a88b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 21 16:09:25 2021 +0300 ntdll: Restore FP status words from MSVCRT_JUMP_BUFFER on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 7 ++++++- dlls/ntdll/tests/exception.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e0372b111fd..7e77329363c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -64,7 +64,9 @@ struct MSVCRT_JUMP_BUFFER ULONG64 R14; ULONG64 R15; ULONG64 Rip; - ULONG64 Spare; + ULONG MxCsr; + USHORT FpCsr; + USHORT Spare; M128A Xmm6; M128A Xmm7; M128A Xmm8; @@ -1218,6 +1220,9 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->u.s.Xmm13 = jmp->Xmm13; context->u.s.Xmm14 = jmp->Xmm14; context->u.s.Xmm15 = jmp->Xmm15; + context->MxCsr = jmp->MxCsr; + context->u.FltSave.MxCsr = jmp->MxCsr; + context->u.FltSave.ControlWord = jmp->FpCsr; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2bceca204be..4307016f149 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2460,6 +2460,10 @@ static void test_restore_context(void) rec.NumberParameters = 1; rec.ExceptionInformation[0] = (DWORD64)&buf; + ok(buf.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", buf.MxCsr); + ok(buf.FpCsr == 0x27f, "Got unexpected FpCsr %#x.\n", buf.FpCsr); + buf.FpCsr = 0x7f; + buf.MxCsr = 0x3f80; /* uses buf.Rip instead of ctx.Rip */ pRtlRestoreContext(&ctx, &rec); ok(0, "shouldn't be reached\n"); @@ -2487,6 +2491,18 @@ static void test_restore_context(void) "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6, fltsave[i].Part[1], ctx.FltSave.XmmRegisters[i + 6].High); } + ok(ctx.FltSave.ControlWord == 0x7f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); + ok(ctx.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); + ok(ctx.FltSave.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.FltSave.MxCsr); + buf.FpCsr = 0x27f; + buf.MxCsr = 0x1f80; + pRtlRestoreContext(&ctx, &rec); + ok(0, "shouldn't be reached\n"); + } + else if (pass == 5) + { + ok(ctx.FltSave.ControlWord == 0x27f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); + ok(ctx.FltSave.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); } else ok(0, "unexpected pass %d\n", pass);

1 0

Andrey Gusev : schtasks: Fix a typo in FIXME() message.
by Alexandre Julliard Dec. 21, 2021

Dec. 21, 2021

Module: wine Branch: master Commit: 7314b9768780ca97b67fb97338a7dcf2639290f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7314b9768780ca97b67fb973… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 21 16:40:48 2021 +0200 schtasks: Fix a typo in FIXME() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 79f2555522f..340aeaa56fb 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -104,7 +104,7 @@ static BSTR read_file_to_bstr(const WCHAR *file_name) r = ReadFile(file, data, file_size.QuadPart, &read_size, NULL); CloseHandle(file); if (!r) { - FIXME("Read filed\n"); + FIXME("Read failed\n"); HeapFree(GetProcessHeap(), 0, data); return NULL; }

1 0