December 2021 - Wine-commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 22 Dec '21

22 Dec '21

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

Floris Renaud : po: Update Dutch time zones translation.
by Alexandre Julliard 22 Dec '21

22 Dec '21

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

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

22 Dec '21

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

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

22 Dec '21

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: Simplify checking for the locale options.
by Alexandre Julliard 22 Dec '21

22 Dec '21

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

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

22 Dec '21

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

Giovanni Mascellani : wine.inf: Regenerate time zones.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 929face08481845304315a5dcdf5d01a03119a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=929face08481845304315a5d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 21 12:09:18 2021 +0100 wine.inf: Regenerate time zones. Unicode CLDR release 40 and tzdata 2021e were used. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 3 + loader/wine.inf.in | 167 ++++++++++++++++++++++++++--------------- po/ar.po | 206 +++++++++++++++++++++++++++----------------------- po/ast.po | 206 +++++++++++++++++++++++++++----------------------- po/bg.po | 202 ++++++++++++++++++++++++++----------------------- po/ca.po | 206 +++++++++++++++++++++++++++----------------------- po/cs.po | 206 +++++++++++++++++++++++++++----------------------- po/da.po | 206 +++++++++++++++++++++++++++----------------------- po/de.po | 208 ++++++++++++++++++++++++++++----------------------- po/el.po | 202 ++++++++++++++++++++++++++----------------------- po/en.po | 202 ++++++++++++++++++++++++++----------------------- po/en_US.po | 202 ++++++++++++++++++++++++++----------------------- po/eo.po | 206 +++++++++++++++++++++++++++----------------------- po/es.po | 208 ++++++++++++++++++++++++++++----------------------- po/fa.po | 204 +++++++++++++++++++++++++++----------------------- po/fi.po | 208 ++++++++++++++++++++++++++++----------------------- po/fr.po | 206 +++++++++++++++++++++++++++----------------------- po/he.po | 206 +++++++++++++++++++++++++++----------------------- po/hi.po | 202 ++++++++++++++++++++++++++----------------------- po/hr.po | 206 +++++++++++++++++++++++++++----------------------- po/hu.po | 206 +++++++++++++++++++++++++++----------------------- po/it.po | 206 +++++++++++++++++++++++++++----------------------- po/ja.po | 208 ++++++++++++++++++++++++++++----------------------- po/ko.po | 208 ++++++++++++++++++++++++++++----------------------- po/lt.po | 208 ++++++++++++++++++++++++++++----------------------- po/ml.po | 202 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 206 +++++++++++++++++++++++++++----------------------- po/nl.po | 208 ++++++++++++++++++++++++++++----------------------- po/or.po | 202 ++++++++++++++++++++++++++----------------------- po/pa.po | 202 ++++++++++++++++++++++++++----------------------- po/pl.po | 208 ++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 208 ++++++++++++++++++++++++++++----------------------- po/pt_PT.po | 206 +++++++++++++++++++++++++++----------------------- po/rm.po | 202 ++++++++++++++++++++++++++----------------------- po/ro.po | 206 +++++++++++++++++++++++++++----------------------- po/ru.po | 202 ++++++++++++++++++++++++++----------------------- po/si.po | 206 +++++++++++++++++++++++++++----------------------- po/sk.po | 206 +++++++++++++++++++++++++++----------------------- po/sl.po | 206 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 204 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 204 +++++++++++++++++++++++++++----------------------- po/sv.po | 206 +++++++++++++++++++++++++++----------------------- po/ta.po | 202 ++++++++++++++++++++++++++----------------------- po/te.po | 202 ++++++++++++++++++++++++++----------------------- po/th.po | 204 +++++++++++++++++++++++++++----------------------- po/tr.po | 206 +++++++++++++++++++++++++++----------------------- po/uk.po | 206 +++++++++++++++++++++++++++----------------------- po/wa.po | 204 +++++++++++++++++++++++++++----------------------- po/wine.pot | 202 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 206 +++++++++++++++++++++++++++----------------------- po/zh_TW.po | 208 ++++++++++++++++++++++++++++----------------------- 51 files changed, 5505 insertions(+), 4717 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=929face0848184530431…

1 0

Piotr Caban : msvcrt: Don't set _EM_AMBIGOUS flag in _control87 when sse2 is not supported.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 564ede5d328b14a0aedbe88bc372574c243c19f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=564ede5d328b14a0aedbe88b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 21 12:54:58 2021 +0100 msvcrt: Don't set _EM_AMBIGOUS flag in _control87 when sse2 is not supported. Fixes compilation warning. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3af44f83a08..a80f60bb6c1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5677,8 +5677,11 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) __control87_2( newval, mask, &flags, &sse2_cw ); - if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; - flags |= sse2_cw; + if (sse2_supported) + { + if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; + flags |= sse2_cw; + } #else flags = newval; _setfp(&flags, mask, NULL, 0);

1 0

Piotr Caban : msvcrt: Make _setfp* helpers infallible.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: c521ec04c9a501159adf40087523557c616e5ceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c521ec04c9a501159adf4008… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 21 12:55:07 2021 +0100 msvcrt: Make _setfp* helpers infallible. The functions may only fail on unsupported compilers/architectures. It's not really possible to handle errors properly. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a80f60bb6c1..414c948d025 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5167,7 +5167,7 @@ double CDECL modf( double x, double *iptr ) } #if defined(__i386__) || defined(__x86_64__) -static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, +static void _setfp_sse( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { #if defined(__GNUC__) || defined(__clang__) @@ -5256,17 +5256,15 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, if (fpword != old_fpword) __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); - return TRUE; #else FIXME("not implemented\n"); if (cw) *cw = 0; if (sw) *sw = 0; - return FALSE; #endif } #endif -static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, +static void _setfp( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) @@ -5376,16 +5374,15 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, fenv.status_word = newsw; __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); - return TRUE; + return; } if (oldsw != newsw) __asm__ __volatile__( "fnclex" ); if (oldcw != newcw) __asm__ __volatile__( "fldcw %0" : : "m" (newcw) ); - return TRUE; #elif defined(__x86_64__) - return _setfp_sse(cw, cw_mask, sw, sw_mask); + _setfp_sse(cw, cw_mask, sw, sw_mask); #elif defined(__aarch64__) ULONG_PTR old_fpsr = 0, fpsr = 0, old_fpcr = 0, fpcr = 0; unsigned int flags; @@ -5465,7 +5462,6 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); if (old_fpcr != fpcr) __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); - return TRUE; #elif defined(__arm__) && !defined(__SOFTFP__) DWORD old_fpscr, fpscr; unsigned int flags; @@ -5533,12 +5529,10 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, if (old_fpscr != fpscr) __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); - return TRUE; #else FIXME("not implemented\n"); if (cw) *cw = 0; if (sw) *sw = 0; - return FALSE; #endif } @@ -5648,8 +5642,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, if (x86_cw) { *x86_cw = newval; - if (!_setfp(x86_cw, mask, NULL, 0)) - return 0; + _setfp(x86_cw, mask, NULL, 0); } if (!sse2_cw) return 1; @@ -5657,8 +5650,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, if (sse2_supported) { *sse2_cw = newval; - if (!_setfp_sse(sse2_cw, mask, NULL, 0)) - return 0; + _setfp_sse(sse2_cw, mask, NULL, 0); } else *sse2_cw = 0; @@ -6053,17 +6045,12 @@ int CDECL fesetenv(const fenv_t *env) #endif #ifdef __i386__ - if (!_setfp(&x87_cw, mask, &x87_stat, ~0)) - return 1; + _setfp(&x87_cw, mask, &x87_stat, ~0); if (sse2_supported) - { - if (!_setfp_sse(&cw, mask, &stat, ~0)) - return 1; - } + _setfp_sse(&cw, mask, &stat, ~0); return 0; #else - if (!_setfp(&cw, mask, &stat, ~0)) - return 1; + _setfp(&cw, mask, &stat, ~0); return 0; #endif }

1 0

Rémi Bernon : winmm: Instanciate DirectInput8 class lazily using delay imported DLL.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: e9282254c6824c4387d3a6368c7fb8ca44aeef53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9282254c6824c4387d3a636… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 17 16:42:05 2021 +0100 winmm: Instanciate DirectInput8 class lazily using delay imported DLL. Instead of statically importing dinput8 and creating the class at load time, which causes some native hooks to fail loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52222 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 3 ++- dlls/winmm/joystick.c | 11 ++++++++--- dlls/winmm/winemm.h | 1 - dlls/winmm/winmm.c | 2 -- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 5439ae21678..c515a3aba2e 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,7 +1,8 @@ EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm -IMPORTS = uuid user32 advapi32 ole32 msacm32 dinput8 +IMPORTS = uuid user32 advapi32 ole32 msacm32 +DELAYIMPORTS = dinput8 C_SRCS = \ driver.c \ diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5f5683e3e35..5a6e1203513 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -152,11 +152,12 @@ static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *co return DIENUM_CONTINUE; } -void joystick_load( HINSTANCE instance ) +static BOOL WINAPI joystick_load_once( INIT_ONCE *once, void *param, void **context ) { - HRESULT hr = DirectInput8Create( instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, + HRESULT hr = DirectInput8Create( hWinMM32Instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&dinput, NULL ); - if (FAILED(hr)) WARN( "could not create dinput instance, hr %#x\n", hr ); + if (FAILED(hr)) ERR( "Could not create dinput instance, hr %#x\n", hr ); + return TRUE; } void joystick_unload() @@ -177,11 +178,15 @@ void joystick_unload() static void find_joysticks(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + IDirectInputDevice8W *device; HANDLE event; DWORD index; HRESULT hr; + InitOnceExecuteOnce( &init_once, joystick_load_once, NULL, NULL ); + if (!dinput) return; index = 0; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 3459c2a85ef..52cab64b1c5 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -153,7 +153,6 @@ MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DE void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; -void joystick_load( HMODULE instance ) DECLSPEC_HIDDEN; void joystick_unload( void ) DECLSPEC_HIDDEN; /* Global variables */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index aab8bfb51a9..aa2dd50c4c1 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -144,8 +144,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) if (!WINMM_CreateIData(hInstDLL)) return FALSE; - - joystick_load( hInstDLL ); break; case DLL_PROCESS_DETACH: if(fImpLoad)

1 0