May 2021 - Wine-commits - list.winehq.org

Hugh McMaster : reg: Remove two unused string resources.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: e4f3d51fdde4b762d2317ce7b2aa140ac030989b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f3d51fdde4b762d2317ce7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:20 2021 +1000 reg: Remove two unused string resources. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 44 ++++++++++++++++---------------------------- po/ast.po | 42 ++++++++++++++++-------------------------- po/bg.po | 44 ++++++++++++++++---------------------------- po/ca.po | 44 ++++++++++++++++---------------------------- po/cs.po | 44 ++++++++++++++++---------------------------- po/da.po | 44 ++++++++++++++++---------------------------- po/de.po | 44 ++++++++++++++++---------------------------- po/el.po | 42 ++++++++++++++++-------------------------- po/en.po | 44 ++++++++++++++++---------------------------- po/en_US.po | 44 ++++++++++++++++---------------------------- po/eo.po | 44 ++++++++++++++++---------------------------- po/es.po | 42 ++++++++++++++++-------------------------- po/fa.po | 43 ++++++++++++++++--------------------------- po/fi.po | 44 ++++++++++++++++---------------------------- po/fr.po | 46 ++++++++++++++++------------------------------ po/he.po | 44 ++++++++++++++++---------------------------- po/hi.po | 42 ++++++++++++++++-------------------------- po/hr.po | 44 ++++++++++++++++---------------------------- po/hu.po | 44 ++++++++++++++++---------------------------- po/it.po | 44 ++++++++++++++++---------------------------- po/ja.po | 43 ++++++++++++++++--------------------------- po/ko.po | 43 ++++++++++++++++--------------------------- po/lt.po | 42 ++++++++++++++++-------------------------- po/ml.po | 42 ++++++++++++++++-------------------------- po/nb_NO.po | 44 ++++++++++++++++---------------------------- po/nl.po | 44 ++++++++++++++++---------------------------- po/or.po | 42 ++++++++++++++++-------------------------- po/pa.po | 42 ++++++++++++++++-------------------------- po/pl.po | 44 ++++++++++++++++---------------------------- po/pt_BR.po | 44 ++++++++++++++++---------------------------- po/pt_PT.po | 44 ++++++++++++++++---------------------------- po/rm.po | 43 ++++++++++++++++--------------------------- po/ro.po | 44 ++++++++++++++++---------------------------- po/ru.po | 42 ++++++++++++++++-------------------------- po/si.po | 42 ++++++++++++++++-------------------------- po/sk.po | 44 ++++++++++++++++---------------------------- po/sl.po | 44 ++++++++++++++++---------------------------- po/sr_RS(a)cyrillic.po | 44 ++++++++++++++++---------------------------- po/sr_RS(a)latin.po | 44 ++++++++++++++++---------------------------- po/sv.po | 43 ++++++++++++++++--------------------------- po/ta.po | 42 ++++++++++++++++-------------------------- po/te.po | 42 ++++++++++++++++-------------------------- po/th.po | 43 ++++++++++++++++--------------------------- po/tr.po | 42 ++++++++++++++++-------------------------- po/uk.po | 43 ++++++++++++++++--------------------------- po/wa.po | 43 ++++++++++++++++--------------------------- po/wine.pot | 42 ++++++++++++++++-------------------------- po/zh_CN.po | 42 ++++++++++++++++-------------------------- po/zh_TW.po | 44 ++++++++++++++++---------------------------- programs/reg/reg.rc | 2 -- programs/reg/resource.h | 2 -- 51 files changed, 784 insertions(+), 1340 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4f3d51fdde4b762d231…

1 0

Piotr Caban : msvcrt: Import tanh implementation from musl.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 3171dccbef835f85852c50e3dc3f37337e76932c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3171dccbef835f85852c50e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:52 2021 +0200 msvcrt: Import tanh implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 44 +++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 05571a7fe20..6d60a6fa086 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2834,9 +2834,47 @@ double CDECL tan( double x ) */ double CDECL tanh( double x ) { - double ret = unix_funcs->tanh(x); - if (isnan(x)) return math_error(_DOMAIN, "tanh", x, 0, ret); - return ret; + UINT64 ui = *(UINT64*)&x; + UINT32 w; + int sign; + double t; + + /* x = |x| */ + sign = ui >> 63; + ui &= (UINT64)-1 / 2; + x = *(double*)&ui; + w = ui >> 32; + + if (w > 0x3fe193ea) { + /* |x| > log(3)/2 ~= 0.5493 or nan */ + if (w > 0x40340000) { +#if _MSVCR_VER < 140 + if (isnan(x)) + return math_error(_DOMAIN, "tanh", x, 0, x); +#endif + /* |x| > 20 or nan */ + /* note: this branch avoids raising overflow */ + fp_barrier(x + 0x1p120f); + t = 1 - 0 / x; + } else { + t = __expm1(2 * x); + t = 1 - 2 / (t + 2); + } + } else if (w > 0x3fd058ae) { + /* |x| > log(5/3)/2 ~= 0.2554 */ + t = __expm1(2 * x); + t = t / (t + 2); + } else if (w >= 0x00100000) { + /* |x| >= 0x1p-1022, up to 2ulp error in [0.1,0.2554] */ + t = __expm1(-2 * x); + t = -t / (t + 2); + } else { + /* |x| is subnormal */ + /* note: the branch above would not raise underflow in [0x1p-1023,0x1p-1022) */ + fp_barrier((float)x); + t = x; + } + return sign ? -t : t; } diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 918c7e6ed71..ce4a3eed094 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -268,14 +268,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * tanh - */ -static double CDECL unix_tanh( double x ) -{ - return tanh( x ); -} - /********************************************************************* * tanhf */ @@ -335,7 +327,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_tanh, unix_tanhf, unix_tgamma, unix_tgammaf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 0e3074be0c5..a95aae74dea 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -46,7 +46,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - double (CDECL *tanh)(double x); float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x);

1 0

Piotr Caban : msvcrt: Import tanhf implementation from musl.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: bb9f97c4d13151d05ebb6aa24c3e0f6b8cab7bb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb9f97c4d13151d05ebb6aa2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 29 19:13:55 2021 +0200 msvcrt: Import tanhf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6d60a6fa086..0bace98cd7d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1512,9 +1512,43 @@ float CDECL tanf( float x ) */ float CDECL tanhf( float x ) { - float ret = unix_funcs->tanhf(x); - if (!isfinite(x)) return math_error(_DOMAIN, "tanhf", x, 0, ret); - return ret; + UINT32 ui = *(UINT32*)&x; + int sign; + float t; + + /* x = |x| */ + sign = ui >> 31; + ui &= 0x7fffffff; + x = *(float*)&ui; + + if (ui > 0x3f0c9f54) { + /* |x| > log(3)/2 ~= 0.5493 or nan */ + if (ui > 0x41200000) { +#if _MSVCR_VER < 140 + if (isnan(x)) + return math_error(_DOMAIN, "tanhf", x, 0, x); +#endif + /* |x| > 10 */ + fp_barrierf(x + 0x1p120f); + t = 1 + 0 / x; + } else { + t = __expm1f(2 * x); + t = 1 - 2 / (t + 2); + } + } else if (ui > 0x3e82c578) { + /* |x| > log(5/3)/2 ~= 0.2554 */ + t = __expm1f(2 * x); + t = t / (t + 2); + } else if (ui >= 0x00800000) { + /* |x| >= 0x1p-126 */ + t = __expm1f(-2 * x); + t = -t / (t + 2); + } else { + /* |x| is subnormal */ + fp_barrierf(x * x); + t = x; + } + return sign ? -t : t; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index ce4a3eed094..d92203c1ab7 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -268,14 +268,6 @@ static float CDECL unix_powf( float x, float y ) return powf( x, y ); } -/********************************************************************* - * tanhf - */ -static float CDECL unix_tanhf( float x ) -{ - return tanhf( x ); -} - /********************************************************************* * tgamma */ @@ -327,7 +319,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_pow, unix_powf, - unix_tanhf, unix_tgamma, unix_tgammaf, }; diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a95aae74dea..a01ce285106 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -46,7 +46,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); - float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x); };

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 96ab7b4430011153734119b3ef969f363aef0634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96ab7b4430011153734119b3… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat May 29 16:51:39 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Bob <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 633 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 330 insertions(+), 303 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96ab7b44300111537341…

1 0

Rémi Bernon : dinput: Factor out device creation interface queries.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 17958bc8631c574df3cf83343d3a813d2bc81128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17958bc8631c574df3cf8334… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:55 2021 +0200 dinput: Factor out device creation interface queries. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 32 +++++++++++++++----------------- dlls/dinput/dinput_private.h | 2 +- dlls/dinput/joystick_linux.c | 34 ++++------------------------------ dlls/dinput/joystick_linuxinput.c | 34 ++++------------------------------ dlls/dinput/joystick_osx.c | 33 ++++----------------------------- dlls/dinput/keyboard.c | 35 ++++------------------------------- dlls/dinput/mouse.c | 34 ++++------------------------------ 7 files changed, 36 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17958bc8631c574df3cf…

1 0

Rémi Bernon : dinput: Remove the need for ANSI enum_device callback.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: d666aea3607ef3398744b3daec7f266cc25a2cd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d666aea3607ef3398744b3da… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:56 2021 +0200 dinput: Remove the need for ANSI enum_device callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 14 +++++----- dlls/dinput/dinput_private.h | 3 +- dlls/dinput/joystick_linux.c | 58 ++------------------------------------- dlls/dinput/joystick_linuxinput.c | 54 ++---------------------------------- dlls/dinput/joystick_osx.c | 52 ++--------------------------------- dlls/dinput/keyboard.c | 50 ++------------------------------- dlls/dinput/mouse.c | 50 ++------------------------------- 7 files changed, 18 insertions(+), 263 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d666aea3607ef3398744…

1 0

Rémi Bernon : dinput: Prevent a device interface leak when enumerating.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 52aacd2377c68097ea165fdfff188fd6768fcc4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=52aacd2377c68097ea165fdf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:57 2021 +0200 dinput: Prevent a device interface leak when enumerating. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=36263 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 62e70e0535c..c7b932aca44 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -864,8 +864,10 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) { HeapFree(GetProcessHeap(), 0, didevis); + IDirectInputDevice_Release(lpdid); return DI_OK; } + IDirectInputDevice_Release(lpdid); } HeapFree(GetProcessHeap(), 0, didevis); @@ -883,7 +885,11 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + IDirectInputDevice_Release(lpdid); return DI_OK; + } + IDirectInputDevice_Release(lpdid); } }

1 0

Rémi Bernon : dinput: Free axis_map when joystick device is freed.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 5cf67f00d0e4d157fb08ac56cb9d8066c57a7be2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cf67f00d0e4d157fb08ac56… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:58 2021 +0200 dinput: Free axis_map when joystick device is freed. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=36263 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 11 +++++++++++ dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 2 ++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index a68c4df20e6..8ea7850621c 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -534,6 +534,17 @@ HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } + +ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface) +{ + JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); + void *axis_map = This->axis_map; + ULONG res = IDirectInputDevice2WImpl_Release(iface); + if (!res) HeapFree(GetProcessHeap(), 0, axis_map); + return res; +} + + /****************************************************************************** * GetObjectInfo : get object info */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5a88e643e07..3215978c995 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -786,7 +786,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, - IDirectInputDevice2WImpl_Release, + JoystickWGenericImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickLinuxWImpl_GetProperty, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 488e9c04759..2b970271ec3 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1231,7 +1231,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, - IDirectInputDevice2WImpl_Release, + JoystickWGenericImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickWImpl_GetProperty, diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 6d37a476380..27a47b07639 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1484,7 +1484,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, - IDirectInputDevice2WImpl_Release, + JoystickWGenericImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickWImpl_GetProperty, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 78d5d721808..874bf3e69a7 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -59,6 +59,8 @@ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; +ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface); + HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : dinput: Rename wReserved to wReportId in DIDEVICEOBJECTINSTANCE.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 2d629228ddd71d8c308da755c91b667a895dc4f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d629228ddd71d8c308da755… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:23:59 2021 +0200 dinput: Rename wReserved to wReportId in DIDEVICEOBJECTINSTANCE. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 2 +- include/dinput.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 431b812aeb2..390b2f56581 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -92,7 +92,7 @@ static void dideviceobjectinstance_wtoa( const DIDEVICEOBJECTINSTANCEW *in, DIDE out->wUsage = in->wUsage; out->dwDimension = in->dwDimension; out->wExponent = in->wExponent; - out->wReserved = in->wReserved; + out->wReportId = in->wReportId; } static void dideviceinstance_wtoa( const DIDEVICEINSTANCEW *in, DIDEVICEINSTANCEA *out ) diff --git a/include/dinput.h b/include/dinput.h index 2d183bbc944..a073054b388 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -358,7 +358,7 @@ typedef struct DIDEVICEOBJECTINSTANCEA { WORD wUsage; DWORD dwDimension; WORD wExponent; - WORD wReserved; + WORD wReportId; } DIDEVICEOBJECTINSTANCEA, *LPDIDEVICEOBJECTINSTANCEA; typedef const DIDEVICEOBJECTINSTANCEA *LPCDIDEVICEOBJECTINSTANCEA; @@ -377,7 +377,7 @@ typedef struct DIDEVICEOBJECTINSTANCEW { WORD wUsage; DWORD dwDimension; WORD wExponent; - WORD wReserved; + WORD wReportId; } DIDEVICEOBJECTINSTANCEW, *LPDIDEVICEOBJECTINSTANCEW; typedef const DIDEVICEOBJECTINSTANCEW *LPCDIDEVICEOBJECTINSTANCEW;

1 0

Roberto Pungartnik : ntdll: Fix IOCTL_AFD_WINE_SENDMSG irda member misreference.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: c2351cd9b44910a9be03f0c84e7fbb992a783adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2351cd9b44910a9be03f0c8… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat May 29 12:43:54 2021 -0300 ntdll: Fix IOCTL_AFD_WINE_SENDMSG irda member misreference. Signed-off-by: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 6112a1260cb..db65752a031 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -255,10 +255,10 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl memcpy( &win, wsaddr, sizeof(win) ); uaddr->irda.sir_family = AF_IRDA; if (sscanf( win.irdaServiceName, "LSAP-SEL%u", &lsap_sel ) == 1) - uaddr->sir_lsap_sel = lsap_sel; + uaddr->irda.sir_lsap_sel = lsap_sel; else { - uaddr->sir_lsap_sel = LSAP_ANY; + uaddr->irda.sir_lsap_sel = LSAP_ANY; memcpy( uaddr->irda.sir_name, win.irdaServiceName, sizeof(win.irdaServiceName) ); } memcpy( &uaddr->irda.sir_addr, win.irdaDeviceID, sizeof(win.irdaDeviceID) );

1 0