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

Rémi Bernon : hid: Use nameless unions.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 9f193d5d41cf19434c9e6c4da32d1be2c73d02b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f193d5d41cf19434c9e6c4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:33 2021 +0200 hid: Use nameless unions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index c4d162695a9..131a02af4eb 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -21,7 +21,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -275,14 +274,14 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT value->UsagePage != UsagePage) continue; - if (value->IsRange && value->u.Range.UsageMin <= Usage && Usage <= value->u.Range.UsageMax) + if (value->IsRange && value->Range.UsageMin <= Usage && Usage <= value->Range.UsageMax) { *element = elems[report->elementIdx + i]; - element->valueStartBit += value->BitSize * (Usage - value->u.Range.UsageMin); + element->valueStartBit += value->BitSize * (Usage - value->Range.UsageMin); element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize: 1; return HIDP_STATUS_SUCCESS; } - else if (value->u.NotRange.Usage == Usage) + else if (value->NotRange.Usage == Usage) { *element = elems[report->elementIdx + i]; element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize : 1; @@ -453,7 +452,7 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH { if (uCount == *UsageLength) return HIDP_STATUS_BUFFER_TOO_SMALL; - UsageList[uCount] = element->caps.button.u.Range.UsageMin + k; + UsageList[uCount] = element->caps.button.Range.UsageMin + k; uCount++; } } @@ -612,8 +611,8 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag (UsagePage == 0 || elems[report[i].elementIdx + j].caps.button.UsagePage == UsagePage)) { if (elems[report[i].elementIdx + j].caps.button.IsRange) - count += (elems[report[i].elementIdx + j].caps.button.u.Range.UsageMax - - elems[report[i].elementIdx + j].caps.button.u.Range.UsageMin) + 1; + count += (elems[report[i].elementIdx + j].caps.button.Range.UsageMax - + elems[report[i].elementIdx + j].caps.button.Range.UsageMin) + 1; else count++; } @@ -740,10 +739,10 @@ NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, (LinkCollection == 0 || LinkCollection == elems[report[j].elementIdx + i].caps.button.LinkCollection) && (Usage == 0 || ( (!elems[report[j].elementIdx + i].caps.button.IsRange && - Usage == elems[report[j].elementIdx + i].caps.button.u.NotRange.Usage)) || + Usage == elems[report[j].elementIdx + i].caps.button.NotRange.Usage)) || (elems[report[j].elementIdx + i].caps.button.IsRange && - Usage >= elems[report[j].elementIdx + i].caps.button.u.Range.UsageMin && - Usage <= elems[report[j].elementIdx + i].caps.button.u.Range.UsageMax))) + Usage >= elems[report[j].elementIdx + i].caps.button.Range.UsageMin && + Usage <= elems[report[j].elementIdx + i].caps.button.Range.UsageMax))) { ButtonCaps[u++] = elems[report[j].elementIdx + i].caps.button; } @@ -808,7 +807,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, if (elems[report[j].elementIdx + i].ElementType == ValueElement && (UsagePage == 0 || UsagePage == elems[report[j].elementIdx + i].caps.value.UsagePage) && (LinkCollection == 0 || LinkCollection == elems[report[j].elementIdx + i].caps.value.LinkCollection) && - (Usage == 0 || Usage == elems[report[j].elementIdx + i].caps.value.u.NotRange.Usage)) + (Usage == 0 || Usage == elems[report[j].elementIdx + i].caps.value.NotRange.Usage)) { ValueCaps[u++] = elems[report[j].elementIdx + i].caps.value; } @@ -877,7 +876,7 @@ NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollect { if (uCount < *UsageLength) { - ButtonList[uCount].Usage = element->caps.button.u.Range.UsageMin + k; + ButtonList[uCount].Usage = element->caps.button.Range.UsageMin + k; ButtonList[uCount].UsagePage = element->caps.button.UsagePage; } uCount++; @@ -960,8 +959,8 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U { if (uCount < *DataLength) { - DataList[uCount].DataIndex = element->caps.button.u.Range.DataIndexMin + k; - DataList[uCount].u.On = v; + DataList[uCount].DataIndex = element->caps.button.Range.DataIndexMin + k; + DataList[uCount].On = v; } uCount++; } @@ -976,8 +975,8 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U element->valueStartBit, element->bitCount, &v); if (rc != HIDP_STATUS_SUCCESS) return rc; - DataList[uCount].DataIndex = element->caps.value.u.NotRange.DataIndex; - DataList[uCount].u.RawValue = v; + DataList[uCount].DataIndex = element->caps.value.NotRange.DataIndex; + DataList[uCount].RawValue = v; } uCount++; }

1 0

Rémi Bernon : user32: Use nameless unions in rawinput.c.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 3f3d4453838cf0b606374511826e27b4eccc8cae URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3d4453838cf0b606374511… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:34 2021 +0200 user32: Use nameless unions in rawinput.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 41d627c62c2..4f9a63cfb88 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -21,8 +21,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -203,9 +201,9 @@ static void find_devices(void) WARN("Failed to get attributes.\n"); device->info.dwType = RIM_TYPEHID; - device->info.u.hid.dwVendorId = attr.VendorID; - device->info.u.hid.dwProductId = attr.ProductID; - device->info.u.hid.dwVersionNumber = attr.VersionNumber; + device->info.hid.dwVendorId = attr.VendorID; + device->info.hid.dwProductId = attr.ProductID; + device->info.hid.dwVersionNumber = attr.VersionNumber; if (!HidD_GetPreparsedData(device->file, &device->data)) WARN("Failed to get preparsed data.\n"); @@ -213,8 +211,8 @@ static void find_devices(void) if (!HidP_GetCaps(device->data, &caps)) WARN("Failed to get caps.\n"); - device->info.u.hid.usUsagePage = caps.UsagePage; - device->info.u.hid.usUsage = caps.Usage; + device->info.hid.usUsagePage = caps.UsagePage; + device->info.hid.usUsage = caps.Usage; } SetupDiDestroyDeviceInfoList(set); @@ -229,7 +227,7 @@ static void find_devices(void) continue; device->info.dwType = RIM_TYPEMOUSE; - device->info.u.mouse = mouse_info; + device->info.mouse = mouse_info; } SetupDiDestroyDeviceInfoList(set); @@ -244,7 +242,7 @@ static void find_devices(void) continue; device->info.dwType = RIM_TYPEKEYBOARD; - device->info.u.keyboard = keyboard_info; + device->info.keyboard = keyboard_info; } SetupDiDestroyDeviceInfoList(set); @@ -276,8 +274,8 @@ BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage) if (!(device = find_device_from_handle(handle))) return FALSE; if (device->info.dwType != RIM_TYPEHID) return FALSE; - *usage_page = device->info.u.hid.usUsagePage; - *usage = device->info.u.hid.usUsage; + *usage_page = device->info.hid.usUsagePage; + *usage = device->info.hid.usUsage; return TRUE; } @@ -317,36 +315,36 @@ BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_ms rawinput->header.wParam = 0; rawinput->data.mouse.usFlags = MOUSE_MOVE_RELATIVE; - rawinput->data.mouse.u.s.usButtonFlags = 0; - rawinput->data.mouse.u.s.usButtonData = 0; + rawinput->data.mouse.usButtonFlags = 0; + rawinput->data.mouse.usButtonData = 0; for (i = 1; i < ARRAY_SIZE(button_flags); ++i) { if (msg_data->flags & (1 << i)) - rawinput->data.mouse.u.s.usButtonFlags |= button_flags[i]; + rawinput->data.mouse.usButtonFlags |= button_flags[i]; } if (msg_data->flags & MOUSEEVENTF_WHEEL) { - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_WHEEL; - rawinput->data.mouse.u.s.usButtonData = msg_data->rawinput.mouse.data; + rawinput->data.mouse.usButtonFlags |= RI_MOUSE_WHEEL; + rawinput->data.mouse.usButtonData = msg_data->rawinput.mouse.data; } if (msg_data->flags & MOUSEEVENTF_HWHEEL) { - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_HORIZONTAL_WHEEL; - rawinput->data.mouse.u.s.usButtonData = msg_data->rawinput.mouse.data; + rawinput->data.mouse.usButtonFlags |= RI_MOUSE_HORIZONTAL_WHEEL; + rawinput->data.mouse.usButtonData = msg_data->rawinput.mouse.data; } if (msg_data->flags & MOUSEEVENTF_XDOWN) { if (msg_data->rawinput.mouse.data == XBUTTON1) - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_BUTTON_4_DOWN; + rawinput->data.mouse.usButtonFlags |= RI_MOUSE_BUTTON_4_DOWN; else if (msg_data->rawinput.mouse.data == XBUTTON2) - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_BUTTON_5_DOWN; + rawinput->data.mouse.usButtonFlags |= RI_MOUSE_BUTTON_5_DOWN; } if (msg_data->flags & MOUSEEVENTF_XUP) { if (msg_data->rawinput.mouse.data == XBUTTON1) - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_BUTTON_4_UP; + rawinput->data.mouse.usButtonFlags |= RI_MOUSE_BUTTON_4_UP; else if (msg_data->rawinput.mouse.data == XBUTTON2) - rawinput->data.mouse.u.s.usButtonFlags |= RI_MOUSE_BUTTON_5_UP; + rawinput->data.mouse.usButtonFlags |= RI_MOUSE_BUTTON_5_UP; } rawinput->data.mouse.ulRawButtons = 0;

1 0

Rémi Bernon : hidclass.sys: Factor HIDP_BUTTON_CAPS with HIDP_VALUE_CAPS.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: dc7547a84b9d9f32010d94853b47059111425bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc7547a84b9d9f32010d9485… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:35 2021 +0200 hidclass.sys: Factor HIDP_BUTTON_CAPS with HIDP_VALUE_CAPS. Buttons are really just values with BitSize == 1, and having a union for that makes the code more complicated than it needs. We'll simplify the code a lot using HIDP_VALUE_CAPS everywhere, as the two structure types are compatible. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 66 ++++++++-------- dlls/hidclass.sys/descriptor.c | 176 ++++++++++++++++++++--------------------- dlls/user32/rawinput.c | 2 + include/wine/hid.h | 43 +++++++++- 4 files changed, 162 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc7547a84b9d9f32010d…

1 0

Hugh McMaster : reg: Prompt the user to confirm whether they want to overwrite existing values when copying a key.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: aeeda123b1185e6d6f6c975354fe567c4573502e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeeda123b1185e6d6f6c9753… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 3 23:32:26 2021 +1000 reg: Prompt the user to confirm whether they want to overwrite existing values when copying a key. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48000 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 68 +++++++++++++++++++++++------------------- po/ast.po | 68 +++++++++++++++++++++++------------------- po/bg.po | 69 +++++++++++++++++++++++------------------- po/ca.po | 68 +++++++++++++++++++++++------------------- po/cs.po | 68 +++++++++++++++++++++++------------------- po/da.po | 68 +++++++++++++++++++++++------------------- po/de.po | 68 +++++++++++++++++++++++------------------- po/el.po | 69 +++++++++++++++++++++++------------------- po/en.po | 68 +++++++++++++++++++++++------------------- po/en_US.po | 68 +++++++++++++++++++++++------------------- po/eo.po | 68 +++++++++++++++++++++++------------------- po/es.po | 68 +++++++++++++++++++++++------------------- po/fa.po | 70 ++++++++++++++++++++++++------------------- po/fi.po | 68 +++++++++++++++++++++++------------------- po/fr.po | 68 +++++++++++++++++++++++------------------- po/he.po | 69 +++++++++++++++++++++++------------------- po/hi.po | 66 ++++++++++++++++++++++------------------- po/hr.po | 68 +++++++++++++++++++++++------------------- po/hu.po | 68 +++++++++++++++++++++++------------------- po/it.po | 68 +++++++++++++++++++++++------------------- po/ja.po | 68 +++++++++++++++++++++++------------------- po/ko.po | 68 +++++++++++++++++++++++------------------- po/lt.po | 68 +++++++++++++++++++++++------------------- po/ml.po | 66 ++++++++++++++++++++++------------------- po/nb_NO.po | 68 +++++++++++++++++++++++------------------- po/nl.po | 68 +++++++++++++++++++++++------------------- po/or.po | 66 ++++++++++++++++++++++------------------- po/pa.po | 66 ++++++++++++++++++++++------------------- po/pl.po | 68 +++++++++++++++++++++++------------------- po/pt_BR.po | 68 +++++++++++++++++++++++------------------- po/pt_PT.po | 68 +++++++++++++++++++++++------------------- po/rm.po | 66 ++++++++++++++++++++++------------------- po/ro.po | 68 +++++++++++++++++++++++------------------- po/ru.po | 68 +++++++++++++++++++++++------------------- po/si.po | 68 +++++++++++++++++++++++------------------- po/sk.po | 72 +++++++++++++++++++++++++------------------- po/sl.po | 68 +++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 69 +++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 69 +++++++++++++++++++++++------------------- po/sv.po | 68 +++++++++++++++++++++++------------------- po/ta.po | 66 ++++++++++++++++++++++------------------- po/te.po | 66 ++++++++++++++++++++++------------------- po/th.po | 74 ++++++++++++++++++++++++++------------------- po/tr.po | 68 +++++++++++++++++++++++------------------- po/uk.po | 68 +++++++++++++++++++++++------------------- po/wa.po | 66 ++++++++++++++++++++++------------------- po/wine.pot | 66 ++++++++++++++++++++++------------------- po/zh_CN.po | 68 +++++++++++++++++++++++------------------- po/zh_TW.po | 68 +++++++++++++++++++++++------------------- programs/reg/copy.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++-- programs/reg/reg.rc | 5 +++- programs/reg/resource.h | 3 ++ 52 files changed, 1944 insertions(+), 1474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aeeda123b1185e6d6f6c…

1 0

Piotr Caban : msvcrt: Import frexp implementation from musl.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 81c58e7d492047e1c5c84734d121f28e771abde3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81c58e7d492047e1c5c84734… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 3 16:28:52 2021 +0200 msvcrt: Import frexp 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 | 22 ++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 596361c6729..50a3d820275 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3494,10 +3494,28 @@ double CDECL fabs( double x ) /********************************************************************* * frexp (MSVCRT.@) + * + * Copied from musl: src/math/frexp.c */ -double CDECL frexp( double x, int *exp ) +double CDECL frexp( double x, int *e ) { - return unix_funcs->frexp( x, exp ); + UINT64 ux = *(UINT64*)&x; + int ee = ux >> 52 & 0x7ff; + + if (!ee) { + if (x) { + x = frexp(x * 0x1p64, e); + *e -= 64; + } else *e = 0; + return x; + } else if (ee == 0x7ff) { + return x; + } + + *e = ee - 0x3fe; + ux &= 0x800fffffffffffffull; + ux |= 0x3fe0000000000000ull; + return *(double*)&ux; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 25ebcac1736..87b118f475d 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -94,14 +94,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * frexp - */ -static double CDECL unix_frexp( double x, int *exp ) -{ - return frexp( x, exp ); -} - /********************************************************************* * frexpf */ @@ -281,7 +273,6 @@ static const struct unix_funcs funcs = unix_exp2, unix_exp2f, unix_fmaf, - unix_frexp, unix_frexpf, unix_hypot, unix_hypotf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 202f8da44cd..787393b47b8 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -28,7 +28,6 @@ struct unix_funcs double (CDECL *exp2)(double x); float (CDECL *exp2f)(float x); float (CDECL *fmaf)(float x, float y, float z); - double (CDECL *frexp)(double x, int *exp); float (CDECL *frexpf)(float x, int *exp); double (CDECL *hypot)(double x, double y); float (CDECL *hypotf)(float x, float y);

1 0

Piotr Caban : msvcrt: Import frexpf implementation from musl.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 411b6f58426f86623bc21dcd98c848b45286abee URL: https://source.winehq.org/git/wine.git/?a=commit;h=411b6f58426f86623bc21dcd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 3 16:28:56 2021 +0200 msvcrt: Import frexpf 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 | 22 ++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 50a3d820275..edc5f6363d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1611,10 +1611,28 @@ float CDECL floorf( float x ) /********************************************************************* * frexpf (MSVCRT.@) + * + * Copied from musl: src/math/frexpf.c */ -float CDECL frexpf( float x, int *exp ) +float CDECL frexpf( float x, int *e ) { - return unix_funcs->frexpf( x, exp ); + UINT32 ux = *(UINT32*)&x; + int ee = ux >> 23 & 0xff; + + if (!ee) { + if (x) { + x = frexpf(x * 0x1p64, e); + *e -= 64; + } else *e = 0; + return x; + } else if (ee == 0xff) { + return x; + } + + *e = ee - 0x7e; + ux &= 0x807ffffful; + ux |= 0x3f000000ul; + return *(float*)&ux; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 87b118f475d..742244bb287 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -94,14 +94,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * frexpf - */ -static float CDECL unix_frexpf( float x, int *exp ) -{ - return frexpf( x, exp ); -} - /********************************************************************* * hypot */ @@ -273,7 +265,6 @@ static const struct unix_funcs funcs = unix_exp2, unix_exp2f, unix_fmaf, - unix_frexpf, unix_hypot, unix_hypotf, unix_lgamma, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 787393b47b8..9e44c49b691 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -28,7 +28,6 @@ struct unix_funcs double (CDECL *exp2)(double x); float (CDECL *exp2f)(float x); float (CDECL *fmaf)(float x, float y, float z); - float (CDECL *frexpf)(float x, int *exp); double (CDECL *hypot)(double x, double y); float (CDECL *hypotf)(float x, float y); double (CDECL *lgamma)(double x);

1 0

Piotr Caban : msvcrt: Import _hypot implementation from musl.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: e55d341c177befba78fc4d72e1959cf9b057d248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e55d341c177befba78fc4d72… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 3 16:28:58 2021 +0200 msvcrt: Import _hypot 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 | 58 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 -------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index edc5f6363d3..4d53f51e2f7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3198,13 +3198,67 @@ double CDECL _logb(double x) return __ilogb(x); } +static void sq(double *hi, double *lo, double x) +{ + double xh, xl, xc; + + xc = x * (0x1p27 + 1); + xh = x - xc + xc; + xl = x - xh; + *hi = x * x; + *lo = xh * xh - *hi + 2 * xh * xl + xl * xl; +} + /********************************************************************* * _hypot (MSVCRT.@) + * + * Copied from musl: src/math/hypot.c */ double CDECL _hypot(double x, double y) { - /* FIXME: errno handling */ - return unix_funcs->hypot( x, y ); + UINT64 ux = *(UINT64*)&x, uy = *(UINT64*)&y, ut; + double hx, lx, hy, ly, z; + int ex, ey; + + /* arrange |x| >= |y| */ + ux &= -1ULL >> 1; + uy &= -1ULL >> 1; + if (ux < uy) { + ut = ux; + ux = uy; + uy = ut; + } + + /* special cases */ + ex = ux >> 52; + ey = uy >> 52; + x = *(double*)&ux; + y = *(double*)&uy; + /* note: hypot(inf,nan) == inf */ + if (ey == 0x7ff) + return y; + if (ex == 0x7ff || uy == 0) + return x; + /* note: hypot(x,y) ~= x + y*y/x/2 with inexact for small y/x */ + /* 64 difference is enough for ld80 double_t */ + if (ex - ey > 64) + return x + y; + + /* precise sqrt argument in nearest rounding mode without overflow */ + /* xh*xh must not overflow and xl*xl must not underflow in sq */ + z = 1; + if (ex > 0x3ff + 510) { + z = 0x1p700; + x *= 0x1p-700; + y *= 0x1p-700; + } else if (ey < 0x3ff - 450) { + z = 0x1p-700; + x *= 0x1p700; + y *= 0x1p700; + } + sq(&hx, &lx, x); + sq(&hy, &ly, y); + return z * sqrt(ly + lx + hy + hx); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 742244bb287..dff51ee8fd4 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -94,14 +94,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * hypot - */ -static double CDECL unix_hypot(double x, double y) -{ - return hypot( x, y ); -} - /********************************************************************* * hypotf */ @@ -265,7 +257,6 @@ static const struct unix_funcs funcs = unix_exp2, unix_exp2f, unix_fmaf, - unix_hypot, unix_hypotf, unix_lgamma, unix_lgammaf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 9e44c49b691..2429bd0556d 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -28,7 +28,6 @@ struct unix_funcs double (CDECL *exp2)(double x); float (CDECL *exp2f)(float x); float (CDECL *fmaf)(float x, float y, float z); - double (CDECL *hypot)(double x, double y); float (CDECL *hypotf)(float x, float y); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x);

1 0

Piotr Caban : msvcrt: Import _hypotf implementation from musl.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: d86207c1d7c16042ecc4bc36daa8d2e1b667a793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86207c1d7c16042ecc4bc36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 3 16:29:01 2021 +0200 msvcrt: Import _hypotf 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 | 33 +++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4d53f51e2f7..a3ebc48d1f7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3263,11 +3263,40 @@ double CDECL _hypot(double x, double y) /********************************************************************* * _hypotf (MSVCRT.@) + * + * Copied from musl: src/math/hypotf.c */ float CDECL _hypotf(float x, float y) { - /* FIXME: errno handling */ - return unix_funcs->hypotf( x, y ); + UINT32 ux = *(UINT32*)&x, uy = *(UINT32*)&y, ut; + float z; + + ux &= -1U >> 1; + uy &= -1U >> 1; + if (ux < uy) { + ut = ux; + ux = uy; + uy = ut; + } + + x = *(float*)&ux; + y = *(float*)&uy; + if (uy == 0xff << 23) + return y; + if (ux >= 0xff << 23 || uy == 0 || ux - uy >= 25 << 23) + return x + y; + + z = 1; + if (ux >= (0x7f + 60) << 23) { + z = 0x1p90f; + x *= 0x1p-90f; + y *= 0x1p-90f; + } else if (uy < (0x7f - 60) << 23) { + z = 0x1p-90f; + x *= 0x1p90f; + y *= 0x1p90f; + } + return z * sqrtf((double)x * x + (double)y * y); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index dff51ee8fd4..c52491d3b65 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -94,14 +94,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * hypotf - */ -static float CDECL unix_hypotf(float x, float y) -{ - return hypotf( x, y ); -} - /********************************************************************* * lgamma */ @@ -257,7 +249,6 @@ static const struct unix_funcs funcs = unix_exp2, unix_exp2f, unix_fmaf, - unix_hypotf, unix_lgamma, unix_lgammaf, unix_log, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 2429bd0556d..8e229ab7014 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -28,7 +28,6 @@ struct unix_funcs double (CDECL *exp2)(double x); float (CDECL *exp2f)(float x); float (CDECL *fmaf)(float x, float y, float z); - float (CDECL *hypotf)(float x, float y); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); double (CDECL *log)(double x);

1 0

Francois Gouget : user32/tests: Use wine_{push,pop}_context() to simplify test_synthesized().
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: c59cd906333412491473285370f1f15d04b3e9c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c59cd9063334124914732853… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 3 19:35:17 2021 +0200 user32/tests: Use wine_{push,pop}_context() to simplify test_synthesized(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 88 +++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 37 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index d75e8fc3c32..75d8334b729 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -714,10 +714,11 @@ static void test_synthesized(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { + winetest_push_context("%d", i); r = OpenClipboard(NULL); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); r = EmptyClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); switch (tests[i].format) { @@ -744,45 +745,50 @@ static void test_synthesized(void) } count = CountClipboardFormats(); - ok( count == 1, "%u: count %u\n", i, count ); + ok( count == 1, "count %u\n", count ); r = CloseClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); count = CountClipboardFormats(); for (j = 0; tests[i].expected[j]; j++) { r = IsClipboardFormatAvailable( tests[i].expected[j] ); - ok( r, "%u: %04x not available\n", i, tests[i].expected[j] ); + ok( r, "%04x not available\n", tests[i].expected[j] ); } - ok( count == j, "%u: count %u instead of %u\n", i, count, j ); + ok( count == j, "count %u instead of %u\n", count, j ); r = OpenClipboard( hwnd ); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); cf = 0; for (j = 0; tests[i].expected[j]; j++) { + winetest_push_context("%d", j); cf = EnumClipboardFormats( cf ); - ok(cf == tests[i].expected[j], "%u.%u: got %04x instead of %04x\n", - i, j, cf, tests[i].expected[j] ); - if (cf != tests[i].expected[j]) break; + ok(cf == tests[i].expected[j], "got %04x instead of %04x\n", + cf, tests[i].expected[j] ); + if (cf != tests[i].expected[j]) + { + winetest_pop_context(); + break; + } old_seq = GetClipboardSequenceNumber(); data = GetClipboardData( cf ); ok(data != NULL || broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ - "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); + "couldn't get data, cf %04x err %d\n", cf, GetLastError()); seq = GetClipboardSequenceNumber(); - ok(seq == old_seq, "sequence changed (test %d %d)\n", i, cf); + ok(seq == old_seq, "sequence changed (test %d)\n", cf); switch (cf) { case CF_LOCALE: { UINT *ptr = GlobalLock( data ); DWORD layout = LOWORD( GetKeyboardLayout(0) ); - ok( GlobalSize( data ) == sizeof(*ptr), "%u: size %lu\n", i, GlobalSize( data )); + ok( GlobalSize( data ) == sizeof(*ptr), "size %lu\n", GlobalSize( data )); ok( *ptr == layout || broken( *ptr == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )), - "%u: CF_LOCALE %04x/%04x\n", i, *ptr, layout ); + "CF_LOCALE %04x/%04x\n", *ptr, layout ); GlobalUnlock( data ); break; } @@ -794,82 +800,90 @@ static void test_synthesized(void) ok( GlobalSize( data ) == 10 * sizeof(WCHAR), "wrong len %ld\n", GlobalSize( data )); break; } + winetest_pop_context(); } if (!tests[i].expected[j]) { cf = EnumClipboardFormats( cf ); - ok(cf == 0, "%u: cf %04x\n", i, cf); + ok(cf == 0, "cf %04x\n", cf); } /* now with delayed rendering */ r = EmptyClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); SetClipboardData( tests[i].format, 0 ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); count = CountClipboardFormats(); - ok( count == 1, "%u: count %u\n", i, count ); + ok( count == 1, "count %u\n", count ); r = CloseClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); count = CountClipboardFormats(); for (j = 0; tests[i].expected[j]; j++) { r = IsClipboardFormatAvailable( tests[i].expected[j] ); - ok( r, "%u: %04x not available\n", i, tests[i].expected[j] ); + ok( r, "%04x not available\n", tests[i].expected[j] ); } - ok( count == j, "%u: count %u instead of %u\n", i, count, j ); + ok( count == j, "count %u instead of %u\n", count, j ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); r = OpenClipboard(NULL); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); cf = 0; for (j = 0; tests[i].expected[j]; j++) { + winetest_push_context("%d", j); cf = EnumClipboardFormats( cf ); - ok(cf == tests[i].expected[j], "%u.%u: got %04x instead of %04x\n", - i, j, cf, tests[i].expected[j] ); - if (cf != tests[i].expected[j]) break; + ok(cf == tests[i].expected[j], "got %04x instead of %04x\n", + cf, tests[i].expected[j] ); + if (cf != tests[i].expected[j]) + { + winetest_pop_context(); + break; + } rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); data = GetClipboardData( cf ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); if (cf == CF_LOCALE) { - ok(data != NULL, "%u: CF_LOCALE no data\n", i); - ok( !rendered, "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + ok(data != NULL, "CF_LOCALE no data\n"); + ok( !rendered, "formats %08x have been rendered\n", rendered ); } else { - ok(!data, "%u: format %04x got data %p\n", i, cf, data); + ok(!data, "format %04x got data %p\n", cf, data); ok( rendered == (1 << tests[i].format), - "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + "formats %08x have been rendered\n", rendered ); /* try to render a second time */ data = GetClipboardData( cf ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); ok( rendered == (1 << tests[i].format), - "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + "formats %08x have been rendered\n", rendered ); } + winetest_pop_context(); } if (!tests[i].expected[j]) { cf = EnumClipboardFormats( cf ); - ok(cf == 0, "%u: cf %04x\n", i, cf); + ok(cf == 0, "cf %04x\n", cf); } r = CloseClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); + winetest_pop_context(); } r = OpenClipboard(NULL);

1 0

Francois Gouget : user32/tests: Use winetest contexts to simplify test_string().
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 76a027b75d0fe2b387dfeeb22e5e1134cf03be91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a027b75d0fe2b387dfeeb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 3 19:35:57 2021 +0200 user32/tests: Use winetest contexts to simplify test_string(). This ensures all traces have the relevant context information, in particular the OpenClipboard() checks, and simplifies the ok() calls. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 75d8334b729..d4389f40a46 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2061,6 +2061,7 @@ static void test_string_data(void) #ifdef _WIN64 if (!test_data[i].strA[0] && test_data[i].len < sizeof(WCHAR)) continue; #endif + winetest_push_context("%d", i); r = OpenClipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); r = EmptyClipboard(); @@ -2073,7 +2074,7 @@ static void test_string_data(void) memcpy( bufferA, test_data[i].strA, test_data[i].len ); bufferA[test_data[i].len - 1] = 0; ok( !memcmp( data, bufferA, test_data[i].len ), - "%u: wrong data %.*s\n", i, test_data[i].len, (char *)data ); + "wrong data %.*s\n", test_data[i].len, (char *)data ); } else { @@ -2082,12 +2083,13 @@ static void test_string_data(void) memcpy( bufferW, test_data[i].strW, test_data[i].len ); bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; ok( !memcmp( data, bufferW, test_data[i].len ), - "%u: wrong data %s\n", i, wine_dbgstr_wn( data, (test_data[i].len + 1) / sizeof(WCHAR) )); + "wrong data %s\n", wine_dbgstr_wn( data, (test_data[i].len + 1) / sizeof(WCHAR) )); } r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); sprintf( cmd, "string_data %u", i ); run_process( cmd ); + winetest_pop_context(); } } @@ -2099,53 +2101,55 @@ static void test_string_data_process( int i ) char bufferA[12]; WCHAR bufferW[12]; + winetest_push_context("%d", i); r = OpenClipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); if (test_data[i].strA[0]) { data = GetClipboardData( CF_TEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); - ok( len == test_data[i].len, "%u: wrong size %u / %u\n", i, len, test_data[i].len ); + ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); memcpy( bufferA, test_data[i].strA, test_data[i].len ); bufferA[test_data[i].len - 1] = 0; - ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data ); + ok( !memcmp( data, bufferA, len ), "wrong data %.*s\n", len, (char *)data ); data = GetClipboardData( CF_UNICODETEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); len2 = MultiByteToWideChar( CP_ACP, 0, bufferA, test_data[i].len, bufferW, ARRAY_SIZE(bufferW) ); - ok( len == len2 * sizeof(WCHAR), "%u: wrong size %u / %u\n", i, len, len2 ); - ok( !memcmp( data, bufferW, len ), "%u: wrong data %s\n", i, wine_dbgstr_wn( data, len2 )); + ok( len == len2 * sizeof(WCHAR), "wrong size %u / %u\n", len, len2 ); + ok( !memcmp( data, bufferW, len ), "wrong data %s\n", wine_dbgstr_wn( data, len2 )); } else { data = GetClipboardData( CF_UNICODETEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); - ok( len == test_data[i].len, "%u: wrong size %u / %u\n", i, len, test_data[i].len ); + ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); memcpy( bufferW, test_data[i].strW, test_data[i].len ); bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; ok( !memcmp( data, bufferW, len ), - "%u: wrong data %s\n", i, wine_dbgstr_wn( data, (len + 1) / sizeof(WCHAR) )); + "wrong data %s\n", wine_dbgstr_wn( data, (len + 1) / sizeof(WCHAR) )); data = GetClipboardData( CF_TEXT ); if (test_data[i].len >= sizeof(WCHAR)) { - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); len2 = WideCharToMultiByte( CP_ACP, 0, bufferW, test_data[i].len / sizeof(WCHAR), bufferA, ARRAY_SIZE(bufferA), NULL, NULL ); bufferA[len2 - 1] = 0; - ok( len == len2, "%u: wrong size %u / %u\n", i, len, len2 ); - ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data ); + ok( len == len2, "wrong size %u / %u\n", len, len2 ); + ok( !memcmp( data, bufferA, len ), "wrong data %.*s\n", len, (char *)data ); } else { - ok( !data, "%u: got data for empty string\n", i ); - ok( IsClipboardFormatAvailable( CF_TEXT ), "%u: text not available\n", i ); + ok( !data, "got data for empty string\n" ); + ok( IsClipboardFormatAvailable( CF_TEXT ), "text not available\n" ); } } r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + winetest_pop_context(); } START_TEST(clipboard)

1 0