May 2019 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 97529298a1d73eb4268dfca40595a020f17ea7ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=97529298a1d73eb4268dfca4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 22 15:31:56 2019 +0200 urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 156 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 128 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97529298a1d73eb4268d…

1 0

Nikolay Sivov : kernelbase: Remove helpers that are no longer necessary.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 646c7803ec9b2ec1c7eda76eaa82757a4b7a00b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=646c7803ec9b2ec1c7eda76e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 22 12:27:36 2019 +0300 kernelbase: Remove helpers that are no longer necessary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 0ace59d..b81e0ba 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -52,24 +52,6 @@ static WCHAR *heap_strdupAtoW(const char *str) return ret; } -static char *char_next(const char *ptr) -{ - if (!*ptr) return (LPSTR)ptr; - if (IsDBCSLeadByte( ptr[0] ) && ptr[1]) return (LPSTR)(ptr + 2); - return (LPSTR)(ptr + 1); -} - -static char * char_prev(const char *start, const char *ptr) -{ - while (*start && (start < ptr)) - { - const char *next = char_next(start); - if (next >= ptr) break; - start = next; - } - return (char *)start; -} - static SIZE_T strnlenW(const WCHAR *string, SIZE_T maxlen) { SIZE_T i; @@ -958,7 +940,7 @@ BOOL WINAPI PathIsUNCServerShareA(const char *path) seen_slash = TRUE; } - path = char_next(path); + path = CharNextA(path); } } @@ -1015,7 +997,7 @@ BOOL WINAPI PathIsRootA(const char *path) seen_slash = TRUE; } - path = char_next(path); + path = CharNextA(path); } return TRUE; @@ -1090,7 +1072,7 @@ BOOL WINAPI PathRemoveFileSpecA(char *path) if (*path == '\\') filespec++; } - if (!(path = char_next(path))) + if (!(path = CharNextA(path))) break; } @@ -1184,7 +1166,7 @@ LPSTR WINAPI PathAddBackslashA(char *path) { do { - path = char_next(prev); + path = CharNextA(prev); if (*path) prev = path; } while (*path); @@ -1235,7 +1217,7 @@ LPSTR WINAPI PathFindExtensionA(const char *path) lastpoint = NULL; else if (*path == '.') lastpoint = path; - path = char_next(path); + path = CharNextA(path); } } @@ -1664,7 +1646,7 @@ char * WINAPI PathFindFileNameA(const char *path) if ((*path == '\\' || *path == '/' || *path == ':') && path[1] && path[1] != '\\' && path[1] != '/') last_slash = path + 1; - path = char_next(path); + path = CharNextA(path); } return (char *)last_slash; @@ -1703,7 +1685,7 @@ char * WINAPI PathGetArgsA(const char *path) if (*path == '"') seen_quote = !seen_quote; - path = char_next(path); + path = CharNextA(path); } return (char *)path; @@ -1808,7 +1790,7 @@ BOOL WINAPI PathIsFileSpecA(const char *path) { if (*path == '\\' || *path == ':') return FALSE; - path = char_next(path); + path = CharNextA(path); } return TRUE; @@ -1842,7 +1824,7 @@ BOOL WINAPI PathIsUNCServerA(const char *path) { if (*path == '\\') return FALSE; - path = char_next(path); + path = CharNextA(path); } return TRUE; @@ -1870,7 +1852,7 @@ void WINAPI PathRemoveBlanksA(char *path) start = path; while (*path == ' ') - path = char_next(path); + path = CharNextA(path); while (*path) *start++ = *path++; @@ -2003,7 +1985,7 @@ char * WINAPI PathRemoveBackslashA(char *path) if (!path) return NULL; - ptr = char_prev(path, path + strlen(path)); + ptr = CharPrevA(path, path + strlen(path)); if (!PathIsRootA(path) && *ptr == '\\') *ptr = '\0'; @@ -2058,7 +2040,7 @@ BOOL WINAPI PathIsLFNFileSpecA(const char *path) if (name_len > 8) return TRUE; /* DOS names are <= 8 chars */ } - path = char_next(path); + path = CharNextA(path); } return FALSE; /* Valid DOS path */

1 0

Alexandre Julliard : dwrite: Use the same BiDi direction table as usp10.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 01ebf1ade42f8141caae5a593c4e41fa43296c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ebf1ade42f8141caae5a59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 17:06:34 2019 +0200 dwrite: Use the same BiDi direction table as usp10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/bidi.c | 44 +--- dlls/dwrite/direction.c | 575 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 1 + 4 files changed, 580 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01ebf1ade42f8141caae…

1 0

Alexandre Julliard : make_unicode: Store the full BiDi direction type in the table.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: d68f8d7b350012e0e982faf55a7db14dfc9c9c52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d68f8d7b350012e0e982faf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 15:59:49 2019 +0200 make_unicode: Store the full BiDi direction type in the table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 48 +-- dlls/usp10/direction.c | 1100 ++++++++++++++++++++---------------------------- tools/make_unicode | 32 +- 3 files changed, 486 insertions(+), 694 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d68f8d7b350012e0e982…

1 0

Zebediah Figura : setupapi: Implement SetupDiRegisterCoDeviceInstallers().
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: a35a2ec2afc3e6800f38795965c45ecbd5e9cefe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35a2ec2afc3e6800f387959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 11:15:37 2019 -0500 setupapi: Implement SetupDiRegisterCoDeviceInstallers(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 51 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9b83c35..5c6ec55 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -108,6 +108,7 @@ struct driver { WCHAR inf_path[MAX_PATH]; WCHAR manufacturer[LINE_LEN]; + WCHAR mfg_key[LINE_LEN]; WCHAR description[LINE_LEN]; }; @@ -4076,12 +4077,53 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO dev, PSP_DEVINFO_DATA info_d /*********************************************************************** * SetupDiRegisterCoDeviceInstallers (SETUPAPI.@) */ -BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO dev, PSP_DEVINFO_DATA info_data) +BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - FIXME("%p, %p stub\n", dev, info_data); + static const WCHAR coinstallersW[] = {'.','C','o','I','n','s','t','a','l','l','e','r','s',0}; + WCHAR coinst_key[LINE_LEN], coinst_key_ext[LINE_LEN]; + struct device *device; + struct driver *driver; + void *callback_ctx; + HKEY driver_key; + INFCONTEXT ctx; + HINF hinf; + LONG l; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + SetupGetStringFieldW(&ctx, 1, coinst_key, ARRAY_SIZE(coinst_key), NULL); + SetupDiGetActualSectionToInstallW(hinf, coinst_key, coinst_key_ext, ARRAY_SIZE(coinst_key_ext), NULL, NULL); + strcatW(coinst_key_ext, coinstallersW); + + if ((l = create_driver_key(device, &driver_key))) + { + SetLastError(l); + SetupCloseInfFile(hinf); + return FALSE; + } + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + SetupInstallFromInfSectionW(NULL, hinf, coinst_key_ext, SPINST_ALL, driver_key, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + SetupTermDefaultQueueCallback(callback_ctx); + + RegCloseKey(driver_key); + SetupCloseInfFile(hinf); + return TRUE; } /* Check whether the given hardware or compatible ID matches any of the device's @@ -4190,6 +4232,7 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); strcpyW(device->drivers[count - 1].inf_path, path); strcpyW(device->drivers[count - 1].manufacturer, mfg_name); + strcpyW(device->drivers[count - 1].mfg_key, mfg_key_ext); SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, ARRAY_SIZE(device->drivers[count - 1].description), NULL);

1 0

Nikolay Sivov : kernelbase: Add some URL API functions from shlwapi.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 7b2396979ecf6545c8dd827414130e993d9509da URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2396979ecf6545c8dd8274… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 22 12:27:35 2019 +0300 kernelbase: Add some URL API functions from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 26 +- dlls/kernelbase/path.c | 1144 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1157 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b2396979ecf6545c8dd…

1 0

Andrew Eikum : msvcrt: Implement fma and fmaf.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: fa54e895a784038e56a62ef7515429f6610dc2b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa54e895a784038e56a62ef7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 21 16:50:42 2019 -0500 msvcrt: Implement fma and fmaf. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcrt/math.c | 32 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 + dlls/ucrtbase/tests/misc.c | 60 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- include/config.h.in | 6 +++ 10 files changed, 112 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 69d085c..c206e8d 100755 --- a/configure +++ b/configure @@ -631,7 +631,6 @@ RT_LIBS POLL_LIBS DL_LIBS TOOLSEXT -UNWINDFLAGS MSVCRTFLAGS EXCESS_PRECISION_CFLAGS EXTRACFLAGS @@ -19147,6 +19146,8 @@ for ac_func in \ exp2f \ expm1 \ expm1f \ + fma \ + fmaf \ ilogb \ ilogbf \ j0 \ diff --git a/configure.ac b/configure.ac index 0490b53..83a8181 100644 --- a/configure.ac +++ b/configure.ac @@ -2634,6 +2634,8 @@ AC_CHECK_FUNCS(\ exp2f \ expm1 \ expm1f \ + fma \ + fmaf \ ilogb \ ilogbf \ j0 \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 75ecaf1..3a5991f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -241,8 +241,8 @@ @ stub fdiml @ cdecl floor(double) ucrtbase.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) ucrtbase.fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) ucrtbase.fmaf @ stub fmal @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 92ac324..63dc44d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2164,8 +2164,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index af6b0fe..9b7727e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1830,8 +1830,8 @@ @ cdecl fgetws(ptr long ptr) msvcr120.fgetws @ cdecl floor(double) msvcr120.floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) msvcr120.fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) msvcr120.fmaf @ stub fmal @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 049c340..63744e3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -388,6 +388,22 @@ float CDECL MSVCRT_floorf( float x ) } /********************************************************************* + * fmaf (MSVCRT.@) + */ +float CDECL MSVCRT_fmaf( float x, float y, float z ) +{ +#ifdef HAVE_FMAF + float w = fmaf(x, y, z); +#else + float w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + +/********************************************************************* * frexpf (MSVCRT.@) */ float CDECL MSVCRT_frexpf( float x, int *exp ) @@ -864,6 +880,22 @@ double CDECL MSVCRT_floor( double x ) } /********************************************************************* + * fma (MSVCRT.@) + */ +double CDECL MSVCRT_fma( double x, double y, double z ) +{ +#ifdef HAVE_FMA + double w = fma(x, y, z); +#else + double w = x * y + z; +#endif + if ((isinf(x) && y == 0) || (x == 0 && isinf(y))) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(x) && isinf(z) && x != z) *MSVCRT__errno() = MSVCRT_EDOM; + else if (isinf(y) && isinf(z) && y != z) *MSVCRT__errno() = MSVCRT_EDOM; + return w; +} + +/********************************************************************* * fabs (MSVCRT.@) */ double CDECL MSVCRT_fabs( double x ) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 952de55..f464db2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1288,6 +1288,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ cdecl fmod(double double) MSVCRT_fmod @ cdecl -arch=arm,x86_64,arm64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index ddb7938..7559ede 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -64,6 +64,25 @@ static inline float __port_infinity(void) } #define INFINITY __port_infinity() +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline double __port_min_pos_double(void) +{ + static const UINT64 __min_pos_double = 0x10000000000000; + return *(const double *)&__min_pos_double; +} + +static inline double __port_max_double(void) +{ + static const UINT64 __max_double = 0x7FEFFFFFFFFFFFFF; + return *(const double *)&__max_double; +} + #define M_PI_2 1.57079632679489661923 #define FE_TONEAREST 0 @@ -750,6 +769,30 @@ static void test_math_errors(void) const struct { char func[16]; double a; + double b; + double c; + int error; + int exception; + } tests3d[] = { + /* 0 * inf --> EDOM */ + {"fma", INFINITY, 0, 0, EDOM, -1}, + {"fma", 0, INFINITY, 0, EDOM, -1}, + /* inf - inf -> EDOM */ + {"fma", INFINITY, 1, -INFINITY, EDOM, -1}, + {"fma", -INFINITY, 1, INFINITY, EDOM, -1}, + {"fma", 1, INFINITY, -INFINITY, EDOM, -1}, + {"fma", 1, -INFINITY, INFINITY, EDOM, -1}, + /* NaN */ + {"fma", NAN, 0, 0, -1, -1}, + {"fma", 0, NAN, 0, -1, -1}, + {"fma", 0, 0, NAN, -1, -1}, + /* over/underflow */ + {"fma", __port_max_double(), __port_max_double(), __port_max_double(), -1, -1}, + {"fma", __port_min_pos_double(), __port_min_pos_double(), 1, -1, -1}, + }; + const struct { + char func[16]; + double a; long b; int error; int exception; @@ -770,6 +813,7 @@ static void test_math_errors(void) }; double (CDECL *p_funcd)(double); double (CDECL *p_func2d)(double, double); + double (CDECL *p_func3d)(double, double, double); double (CDECL *p_funcdl)(double, long); int i; @@ -808,6 +852,22 @@ static void test_math_errors(void) "%s(%f, %f) got exception arg2 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg2); } + for(i = 0; i < ARRAY_SIZE(tests3d); i++) { + p_func3d = (void*)GetProcAddress(module, tests3d[i].func); + *p_errno() = -1; + exception.type = -1; + p_func3d(tests3d[i].a, tests3d[i].b, tests3d[i].c); + ok(*p_errno() == tests3d[i].error, + "%s(%f, %f, %f) got errno %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, *p_errno()); + ok(exception.type == tests3d[i].exception, + "%s(%f, %f, %f) got exception type %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == tests3d[i].a, + "%s(%f, %f, %f) got exception arg1 %f\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.arg1); + ok(exception.arg2 == tests3d[i].b, + "%s(%f, %f, %f) got exception arg2 %f\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.arg2); + } + for(i = 0; i < ARRAY_SIZE(testsdl); i++) { p_funcdl = (void*)GetProcAddress(module, testsdl[i].func); *p_errno() = -1; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b7f814a..c64fee2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2305,8 +2305,8 @@ @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf -@ stub fma -@ stub fmaf +@ cdecl fma(double double double) MSVCRT_fma +@ cdecl -arch=arm,x86_64,arm64 fmaf(float float float) MSVCRT_fmaf @ stub fmal @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf diff --git a/include/config.h.in b/include/config.h.in index 7998764..774e9ee 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -161,6 +161,12 @@ /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H +/* Define to 1 if you have the `fma' function. */ +#undef HAVE_FMA + +/* Define to 1 if you have the `fmaf' function. */ +#undef HAVE_FMAF + /* Define to 1 if you have the `fnmatch' function. */ #undef HAVE_FNMATCH

1 0

Alexandre Julliard : gdi32: Use the same BiDi direction table as usp10.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: ef07087f47177e847c249d44f3f4918d1fd9a5ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef07087f47177e847c249d44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 17:11:39 2019 +0200 gdi32: Use the same BiDi direction table as usp10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/bidi.c | 56 ++--- dlls/gdi32/direction.c | 575 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 1 + 4 files changed, 596 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef07087f47177e847c24…

1 0

Alexandre Julliard : make_unicode: Add a wctype table in kernel32 for GetStringTypeW().
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: f09dade9cb73f0e8f6cece95af5087d879bdaaec URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09dade9cb73f0e8f6cece95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 10:31:55 2019 +0200 make_unicode: Add a wctype table in kernel32 for GetStringTypeW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 + dlls/kernel32/locale.c | 18 +- dlls/kernel32/wctype.c | 2154 +++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 36 +- 4 files changed, 2201 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f09dade9cb73f0e8f6ce…

1 0

Piotr Caban : libwine: Decompose characters before comparing in wine_compare_string.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 40a1a9e9a242aa694bd28f640f51f66ce9eb99ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a1a9e9a242aa694bd28f64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 21 17:19:48 2019 +0200 libwine: Decompose characters before comparing in wine_compare_string. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 24 +++++++++++----------- libs/port/sortkey.c | 48 ++++++++++++++++++++++++++------------------ 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a8d6e4c..1c632cc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1975,7 +1975,7 @@ static void test_CompareStringA(void) /* \xB9 character lies between a and b */ ret = CompareStringA(lcid, 0, "a", 1, "\xB9", 1); - todo_wine ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be greater than \'a\'\n"); + ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be greater than \'a\'\n"); ret = CompareStringA(lcid, 0, "\xB9", 1, "b", 1); ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be smaller than \'b\'\n"); @@ -2047,14 +2047,14 @@ static void test_CompareStringW(void) ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); todo_wine ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); - todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 3, A_ACUTE_BC, 4); - ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); - todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_NULL_BC, 4); todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_LESS_THAN, got %d\n", ret); @@ -2098,7 +2098,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 3 */ "tr-TR", 0, - {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 4 */ "tr-TR", 0, @@ -2115,7 +2115,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 7 */ "tr-TR", NORM_IGNORECASE, - {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 8 */ "tr-TR", NORM_IGNORECASE, @@ -2123,7 +2123,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 9 */ "tr-TR", NORM_IGNORECASE, - {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 10 */ "tr-TR", NORM_IGNORECASE, @@ -2148,7 +2148,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 15 */ "tr-TR", NORM_LINGUISTIC_CASING, - {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 16 */ "tr-TR", NORM_LINGUISTIC_CASING, @@ -2173,7 +2173,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 21 */ "tr-TR", LINGUISTIC_IGNORECASE, - {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 22 */ "tr-TR", LINGUISTIC_IGNORECASE, @@ -2190,7 +2190,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 25 */ "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, - {'i',0}, {0x130,0}, CSTR_EQUAL, CSTR_LESS_THAN, FALSE + {'i',0}, {0x130,0}, CSTR_EQUAL, CSTR_LESS_THAN, TRUE }, { /* 26 */ "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, @@ -2198,7 +2198,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 27 */ "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, - {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 28 */ "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, @@ -2223,7 +2223,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 33 */ "tr-TR", NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE, - {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 34 */ "tr-TR", NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE, diff --git a/libs/port/sortkey.c b/libs/port/sortkey.c index 7ca1a20..5d83fcd 100644 --- a/libs/port/sortkey.c +++ b/libs/port/sortkey.c @@ -180,9 +180,22 @@ static unsigned int get_weight(WCHAR ch, enum weight type) } } +static void inc_str_pos(const WCHAR **str, int *len, int *dpos, int *dlen) +{ + (*dpos)++; + if (*dpos == *dlen) + { + *dpos = *dlen = 0; + (*str)++; + (*len)--; + } +} + static inline int compare_weights(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2, enum weight type) { + int dpos1 = 0, dpos2 = 0, dlen1 = 0, dlen2 = 0; + WCHAR dstr1[4], dstr2[4]; unsigned int ce1, ce2; /* 32-bit collation element table format: @@ -191,20 +204,21 @@ static inline int compare_weights(int flags, const WCHAR *str1, int len1, */ while (len1 > 0 && len2 > 0) { + if (!dlen1) dlen1 = wine_decompose(0, *str1, dstr1, 4); + if (!dlen2) dlen2 = wine_decompose(0, *str2, dstr2, 4); + if (flags & NORM_IGNORESYMBOLS) { int skip = 0; /* FIXME: not tested */ - if (get_char_typeW(*str1) & (C1_PUNCT | C1_SPACE)) + if (get_char_typeW(dstr1[dpos1]) & (C1_PUNCT | C1_SPACE)) { - str1++; - len1--; + inc_str_pos(&str1, &len1, &dpos1, &dlen1); skip = 1; } - if (get_char_typeW(*str2) & (C1_PUNCT | C1_SPACE)) + if (!dlen2 && get_char_typeW(dstr2[dpos2]) & (C1_PUNCT | C1_SPACE)) { - str2++; - len2--; + inc_str_pos(&str2, &len2, &dpos2, &dlen2); skip = 1; } if (skip) continue; @@ -215,32 +229,28 @@ static inline int compare_weights(int flags, const WCHAR *str1, int len1, */ if (type == UNICODE_WEIGHT && !(flags & SORT_STRINGSORT)) { - if (*str1 == '-' || *str1 == '\'') + if (dstr1[dpos1] == '-' || dstr1[dpos1] == '\'') { - if (*str2 != '-' && *str2 != '\'') + if (dstr2[dpos2] != '-' && dstr2[dpos2] != '\'') { - str1++; - len1--; + inc_str_pos(&str1, &len1, &dpos1, &dlen1); continue; } } - else if (*str2 == '-' || *str2 == '\'') + else if (dstr2[dpos2] == '-' || dstr2[dpos2] == '\'') { - str2++; - len2--; + inc_str_pos(&str2, &len2, &dpos2, &dlen2); continue; } } - ce1 = get_weight(*str1, type); - ce2 = get_weight(*str2, type); + ce1 = get_weight(dstr1[dpos1], type); + ce2 = get_weight(dstr2[dpos2], type); if (ce1 - ce2) return ce1 - ce2; - str1++; - str2++; - len1--; - len2--; + inc_str_pos(&str1, &len1, &dpos1, &dlen1); + inc_str_pos(&str2, &len2, &dpos2, &dlen2); } while (len1 && !*str1) {

1 0