October 2017 - Wine-commits

Stefan Dösinger : msvcp140: Implement _To_wide.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: c78b268c52d2930cb721d816e921e239fff4a4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78b268c52d2930cb721d816e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 26 14:52:08 2017 +0200 msvcp140: Implement _To_wide. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c5e060be9c390cee20fa1e8fef91f9e74701543) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/locale.c | 10 ++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e05e448..cfaa94a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3732,7 +3732,7 @@ @ cdecl _Thrd_start(ptr ptr ptr) msvcp110._Thrd_start @ cdecl _Thrd_yield() _Thrd_yield @ stub _To_byte -@ stub _To_wide +@ cdecl _To_wide(str ptr) @ cdecl _Tolower(long ptr) _Tolower @ cdecl _Toupper(long ptr) _Toupper @ cdecl _Towlower(long ptr) _Towlower diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 6d1a5f8..b3a4214 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -18,6 +18,10 @@ #include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + #include "wine/test.h" #include "winbase.h" @@ -148,6 +152,8 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -209,6 +215,8 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_To_wide, "_To_wide"); + init_thiscall_thunk(); return TRUE; } @@ -461,6 +469,52 @@ static void test_chore(void) p__Release_chore(&chore); } +static void test_to_wide(void) +{ + /* öäüß€Ÿ.A.B in cp1252, the two . are an undefined value and delete. + * With a different system codepage it will produce different results, so do not hardcode the + * expected output but convert it with MultiByteToWideChar. */ + static const char special_input[] = {0xf6, 0xe4, 0xfc, 0xdf, 0x80, 0x9f, 0x81, 0x41, 0x7f, 0x42, 0}; + static const char *tests[] = {"Testtest", special_input}; + WCHAR dst[MAX_PATH + 4] = {'A', 'B', 'C', 0, 'X', 'X', 'X', 'X', 'X', 'X', 'X'}; + WCHAR compare[MAX_PATH + 4] = {'A', 'B', 'C', 0, 'X', 'X', 'X', 'X', 'X', 'X', 'X'}; + int ret, expected; + unsigned int i; + char longstr[MAX_PATH + 3]; + + ret = p_To_wide(NULL, NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_wide(tests[0], NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_wide(NULL, dst); + ok(!ret, "Got unexpected result %d\n", ret); + ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", wine_dbgstr_w(dst)); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + ret = p_To_wide(tests[i], dst); + expected = MultiByteToWideChar(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare)); + ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", + wine_dbgstr_w(dst), i); + } + + /* Output length is limited to MAX_PATH.*/ + for (i = MAX_PATH - 2; i < MAX_PATH + 2; ++i) + { + memset(longstr, 'A', sizeof(longstr)); + longstr[i] = 0; + memset(dst, 0xff, sizeof(dst)); + memset(compare, 0xff, sizeof(compare)); + + ret = p_To_wide(longstr, dst); + expected = MultiByteToWideChar(CP_ACP, 0, longstr, -1, compare, MAX_PATH); + ok(ret == expected, "Got unexpected result %d, expected %d, length %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, length %u\n", + wine_dbgstr_w(dst), i); + } +} + START_TEST(msvcp140) { if(!init()) return; @@ -470,5 +524,6 @@ START_TEST(msvcp140) test__ContextCallback(); test__TaskEventLogger(); test_chore(); + test_to_wide(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index d2fce47..8847ac2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,6 +11224,16 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif +int __cdecl _To_wide(const char *src, wchar_t *dst) +{ + TRACE("(%s %p)\n", debugstr_a(src), dst); + + if (!src || !dst) + return 0; + + return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, MAX_PATH); +} + DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base(a)std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@")

1 0

Mikhail Paulyshka : msvcp140: Implement _To_byte.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 2d5a21d944340fa81806345e4692ce5a144b60f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5a21d944340fa81806345e4… Author: Mikhail Paulyshka <me(a)mixaill.tk> Date: Mon Jul 10 12:59:02 2017 +0200 msvcp140: Implement _To_byte. Signed-off-by: Mikhail Paulyshka <me(a)mixaill.tk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aaaac6ffecff2b025a78513560b349c506958ee7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/locale.c | 6 ++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index cfaa94a..ec8ae3b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3731,7 +3731,7 @@ @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) msvcp110._Thrd_start @ cdecl _Thrd_yield() _Thrd_yield -@ stub _To_byte +@ cdecl _To_byte(wstr ptr) _To_byte @ cdecl _To_wide(str ptr) @ cdecl _Tolower(long ptr) _Tolower @ cdecl _Toupper(long ptr) _Toupper diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index b3a4214..12aedf5 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -152,6 +152,7 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static HMODULE msvcp; @@ -215,6 +216,7 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); init_thiscall_thunk(); @@ -469,6 +471,52 @@ static void test_chore(void) p__Release_chore(&chore); } +static void test_to_byte(void) +{ + static const WCHAR test_1[] = {'T', 'E', 'S', 'T', 0}; + static const WCHAR test_2[] = {0x9580, 0x9581, 0x9582, 0x9583, 0}; /* some CJK characters */ + static const WCHAR *tests[] = {test_1, test_2}; + + char dst[MAX_PATH + 4] = "ABC\0XXXXXXX"; + char compare[MAX_PATH + 4] = "ABC\0XXXXXXX"; + int ret,expected; + unsigned int i, j; + WCHAR longstr[MAX_PATH + 3]; + + ret = p_To_byte(NULL, NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_byte(tests[0], NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_byte(NULL, dst); + ok(!ret, "Got unexpected result %d\n", ret); + + ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", dst); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + ret = p_To_byte(tests[i], dst); + expected = WideCharToMultiByte(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare), + NULL, NULL); + ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", dst, i); + } + + /* Output length is limited to MAX_PATH.*/ + for (i = MAX_PATH - 2; i < MAX_PATH + 2; ++i) + { + for (j = 0; j < i; j++) + longstr[j] = 'A'; + longstr[i] = 0; + memset(dst, 0xff, sizeof(dst)); + memset(compare, 0xff, sizeof(compare)); + + ret = p_To_byte(longstr, dst); + expected = WideCharToMultiByte(CP_ACP, 0, longstr, -1, compare, MAX_PATH, NULL, NULL); + ok(ret == expected, "Got unexpected result %d, expected %d, length %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, length %u\n", dst, i); + } +} + static void test_to_wide(void) { /* öäüß€Ÿ.A.B in cp1252, the two . are an undefined value and delete. @@ -524,6 +572,7 @@ START_TEST(msvcp140) test__ContextCallback(); test__TaskEventLogger(); test_chore(); + test_to_byte(); test_to_wide(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 8847ac2..cf1f605 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,6 +11224,12 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif +int __cdecl _To_byte(const wchar_t *src, char *dst) +{ + TRACE("(%s %p)\n", debugstr_w(src), dst); + return WideCharToMultiByte(CP_ACP, 0, src, -1, dst, MAX_PATH, NULL, NULL); +} + int __cdecl _To_wide(const char *src, wchar_t *dst) { TRACE("(%s %p)\n", debugstr_a(src), dst);

1 0

Alex Henrie : msvcr120: Add atanh.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 2c5fc3b3d8d5451d45cd1616db929adeeb99e32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5fc3b3d8d5451d45cd1616d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 12 18:05:19 2017 +0200 msvcr120: Add atanh. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 860c1578e6ed130792ff6a9c5e5431ec005472ac) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 + configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 66 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- include/config.h.in | 6 ++ 8 files changed, 88 insertions(+), 12 deletions(-) diff --git a/configure b/configure index eed2c2e..c736fe8 100755 --- a/configure +++ b/configure @@ -17114,6 +17114,8 @@ for ac_func in \ acoshf \ asinh \ asinhf \ + atanh \ + atanhf \ cbrt \ cbrtf \ erf \ diff --git a/configure.ac b/configure.ac index 9e60a76..dd4c0e3 100644 --- a/configure.ac +++ b/configure.ac @@ -2538,6 +2538,8 @@ AC_CHECK_FUNCS(\ acoshf \ asinh \ asinhf \ + atanh \ + atanhf \ cbrt \ cbrtf \ erf \ 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 50fc298..fb78f07 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 @@ -136,9 +136,9 @@ @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f @ cdecl -arch=arm,x86_64 atanf(float) ucrtbase.atanf -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) ucrtbase.atanh +@ cdecl atanhf(float) ucrtbase.atanhf +@ cdecl atanhl(double) ucrtbase.atanhl @ stub cabs @ stub cabsf @ stub cabsl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9e4be38..5177122 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2025,9 +2025,9 @@ @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) MSVCR120_atanh +@ cdecl atanhf(float) MSVCR120_atanhf +@ cdecl atanhl(double) MSVCR120_atanhl @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 09a6dee..0c4adb3 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1691,9 +1691,9 @@ @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) msvcr120.atan2f -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) msvcr120.atanh +@ cdecl atanhf(float) msvcr120.atanhf +@ cdecl atanhl(double) msvcr120.atanhl @ cdecl -private atexit(ptr) msvcr120.atexit @ cdecl atof(str) msvcr120.atof @ cdecl atoi(str) msvcr120.atoi diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 81911de..867ef22 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2943,6 +2943,72 @@ LDOUBLE CDECL MSVCR120_acoshl(LDOUBLE x) } /********************************************************************* + * atanh (MSVCR120.@) + */ +double CDECL MSVCR120_atanh(double x) +{ + double ret; + + if (x > 1 || x < -1) { + MSVCRT_fenv_t env; + + *MSVCRT__errno() = MSVCRT_EDOM; + + /* on Linux atanh returns -NAN in this case */ + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + +#ifdef HAVE_ATANH + ret = atanh(x); +#else + if (-1e-6 < x && x < 1e-6) ret = x + x*x*x/3; + else ret = (log(1+x) - log(1-x)) / 2; +#endif + + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * atanhf (MSVCR120.@) + */ +float CDECL MSVCR120_atanhf(float x) +{ +#ifdef HAVE_ATANHF + double ret; + + if (x > 1 || x < -1) { + MSVCRT_fenv_t env; + + *MSVCRT__errno() = MSVCRT_EDOM; + + MSVCRT_fegetenv(&env); + env.status |= MSVCRT__SW_INVALID; + MSVCRT_fesetenv(&env); + return NAN; + } + + ret = atanhf(x); + + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + return MSVCR120_atanh(x); +#endif +} + +/********************************************************************* + * atanhl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) +{ + return MSVCR120_atanh(x); +} + +/********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) * scalbln (MSVCR120.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c563808..763e037 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2167,9 +2167,9 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf -@ stub atanh -@ stub atanhf -@ stub atanhl +@ cdecl atanh(double) MSVCR120_atanh +@ cdecl atanhf(float) MSVCR120_atanhf +@ cdecl atanhl(double) MSVCR120_atanhl @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol diff --git a/include/config.h.in b/include/config.h.in index 618731e..56295f3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -50,6 +50,12 @@ /* Define to 1 if you have the <asm/user.h> header file. */ #undef HAVE_ASM_USER_H +/* Define to 1 if you have the `atanh' function. */ +#undef HAVE_ATANH + +/* Define to 1 if you have the `atanhf' function. */ +#undef HAVE_ATANHF + /* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H

1 0

Alex Henrie : msvcr120: Add expm1.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 94bf7cc632e8c7c57843fce541e40bcebd9888d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bf7cc632e8c7c57843fce54… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 13 23:14:20 2017 -0600 msvcr120: Add expm1. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79715cce88ef372eb56374f14c4771b748029105) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 58 insertions(+), 12 deletions(-) diff --git a/configure b/configure index c736fe8..44a7d42 100755 --- a/configure +++ b/configure @@ -17122,6 +17122,8 @@ for ac_func in \ erff \ exp2 \ exp2f \ + expm1 \ + expm1f \ lgamma \ lgammaf \ llrint \ diff --git a/configure.ac b/configure.ac index dd4c0e3..be48d24 100644 --- a/configure.ac +++ b/configure.ac @@ -2546,6 +2546,8 @@ AC_CHECK_FUNCS(\ erff \ exp2 \ exp2f \ + expm1 \ + expm1f \ lgamma \ lgammaf \ llrint \ 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 fb78f07..f23782c 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 @@ -231,9 +231,9 @@ @ cdecl exp2f(float) ucrtbase.exp2f @ cdecl exp2l(double) ucrtbase.exp2l @ cdecl -arch=arm,x86_64 expf(float) ucrtbase.expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) ucrtbase.expm1 +@ cdecl expm1f(float) ucrtbase.expm1f +@ cdecl expm1l(double) ucrtbase.expm1l @ cdecl fabs(double) ucrtbase.fabs @ cdecl -arch=arm fabsf(float) ucrtbase.fabsf @ stub fdim diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5177122..26f7ecd 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2134,9 +2134,9 @@ @ cdecl exp2f(float) MSVCR120_exp2f @ cdecl exp2l(double) MSVCR120_exp2l @ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) MSVCR120_expm1 +@ cdecl expm1f(float) MSVCR120_expm1f +@ cdecl expm1l(double) MSVCR120_expm1l @ cdecl fabs(double) MSVCRT_fabs @ cdecl -arch=arm,x86_64 fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0c4adb3..3e9d5fe 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1800,9 +1800,9 @@ @ cdecl exp2f(float) msvcr120.exp2f @ cdecl exp2l(double) msvcr120.exp2l @ cdecl -arch=arm,x86_64 expf(float) msvcr120.expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) msvcr120.expm1 +@ cdecl expm1f(float) msvcr120.expm1f +@ cdecl expm1l(double) msvcr120.expm1l @ cdecl fabs(double) msvcr120.fabs @ cdecl -arch=arm,x86_64 fabsf(float) msvcr120.fabsf @ cdecl fclose(ptr) msvcr120.fclose diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 867ef22..562cdda 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2416,6 +2416,42 @@ LDOUBLE CDECL MSVCR120_exp2l(LDOUBLE x) } /********************************************************************* + * expm1 (MSVCR120.@) + */ +double CDECL MSVCR120_expm1(double x) +{ +#ifdef HAVE_EXPM1 + double ret = expm1(x); +#else + double ret = exp(x) - 1; +#endif + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * expm1f (MSVCR120.@) + */ +float CDECL MSVCR120_expm1f(float x) +{ +#ifdef HAVE_EXPM1F + double ret = expm1f(x); +#else + double ret = exp(x) - 1; +#endif + if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +} + +/********************************************************************* + * expm1l (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_expm1l(LDOUBLE x) +{ + return MSVCR120_expm1(x); +} + +/********************************************************************* * log2 (MSVCR120.@) */ double CDECL MSVCR120_log2(double x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 763e037..d3f496b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2277,9 +2277,9 @@ @ cdecl exp2f(float) MSVCR120_exp2f @ cdecl exp2l(double) MSVCR120_exp2l @ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf -@ stub expm1 -@ stub expm1f -@ stub expm1l +@ cdecl expm1(double) MSVCR120_expm1 +@ cdecl expm1f(float) MSVCR120_expm1f +@ cdecl expm1l(double) MSVCR120_expm1l @ cdecl fabs(double) MSVCRT_fabs @ cdecl -arch=arm fabsf(float) MSVCRT_fabsf @ cdecl fclose(ptr) MSVCRT_fclose diff --git a/include/config.h.in b/include/config.h.in index 56295f3..5b2457e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -147,6 +147,12 @@ /* Define to 1 if you have the `exp2f' function. */ #undef HAVE_EXP2F +/* Define to 1 if you have the `expm1' function. */ +#undef HAVE_EXPM1 + +/* Define to 1 if you have the `expm1f' function. */ +#undef HAVE_EXPM1F + /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE

1 0

Alex Henrie : msvcr120: Add log1p.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 8848e97e1d0760138485b51621b8a3f3eabc7f61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8848e97e1d0760138485b5162… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 17 22:33:51 2017 -0600 msvcr120: Add log1p. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 31b835d0e0124d6f6e3e4f6fc9ad53de6182dee1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 58 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 44a7d42..833b989 100755 --- a/configure +++ b/configure @@ -17130,6 +17130,8 @@ for ac_func in \ llrintf \ llround \ llroundf \ + log1p \ + log1pf \ log2 \ log2f \ lrint \ diff --git a/configure.ac b/configure.ac index be48d24..e5376bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2554,6 +2554,8 @@ AC_CHECK_FUNCS(\ llrintf \ llround \ llroundf \ + log1p \ + log1pf \ log2 \ log2f \ lrint \ 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 f23782c..9a10bb8 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 @@ -270,9 +270,9 @@ @ cdecl log(double) ucrtbase.log @ cdecl log10(double) ucrtbase.log10 @ cdecl -arch=arm,x86_64 log10f(float) ucrtbase.log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) ucrtbase.log1p +@ cdecl log1pf(float) ucrtbase.log1pf +@ cdecl log1pl(double) ucrtbase.log1pl @ cdecl log2(double) ucrtbase.log2 @ cdecl log2f(float) ucrtbase.log2f @ cdecl log2l(double) ucrtbase.log2l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 26f7ecd..7b2c5eb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2259,9 +2259,9 @@ @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) MSVCR120_log1p +@ cdecl log1pf(float) MSVCR120_log1pf +@ cdecl log1pl(double) MSVCR120_log1pl @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3e9d5fe..83b0862 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1922,9 +1922,9 @@ @ cdecl -arch=arm,x86_64 logf(float) msvcr120.logf @ cdecl log10(double) msvcr120.log10 @ cdecl -arch=arm,x86_64 log10f(float) msvcr120.log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) msvcr120.log1p +@ cdecl log1pf(float) msvcr120.log1pf +@ cdecl log1pl(double) msvcr120.log1pl @ cdecl log2(double) msvcr120.log2 @ cdecl log2f(float) msvcr120.log2f @ cdecl log2l(double) msvcr120.log2l diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 562cdda..775fbac 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2452,6 +2452,42 @@ LDOUBLE CDECL MSVCR120_expm1l(LDOUBLE x) } /********************************************************************* + * log1p (MSVCR120.@) + */ +double CDECL MSVCR120_log1p(double x) +{ + if (x < -1) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == -1) *MSVCRT__errno() = MSVCRT_ERANGE; +#ifdef HAVE_LOG1P + return log1p(x); +#else + return log(1 + x); +#endif +} + +/********************************************************************* + * log1pf (MSVCR120.@) + */ +float CDECL MSVCR120_log1pf(float x) +{ + if (x < -1) *MSVCRT__errno() = MSVCRT_EDOM; + else if (x == -1) *MSVCRT__errno() = MSVCRT_ERANGE; +#ifdef HAVE_LOG1PF + return log1pf(x); +#else + return log(1 + x); +#endif +} + +/********************************************************************* + * log1pl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_log1pl(LDOUBLE x) +{ + return MSVCR120_log1p(x); +} + +/********************************************************************* * log2 (MSVCR120.@) */ double CDECL MSVCR120_log2(double x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d3f496b..85d2ed3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2392,9 +2392,9 @@ @ cdecl log(double) MSVCRT_log @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f -@ stub log1p -@ stub log1pf -@ stub log1pl +@ cdecl log1p(double) MSVCR120_log1p +@ cdecl log1pf(float) MSVCR120_log1pf +@ cdecl log1pl(double) MSVCR120_log1pl @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l diff --git a/include/config.h.in b/include/config.h.in index 5b2457e..99906bd 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -507,6 +507,12 @@ /* Define to 1 if you have the `llroundf' function. */ #undef HAVE_LLROUNDF +/* Define to 1 if you have the `log1p' function. */ +#undef HAVE_LOG1P + +/* Define to 1 if you have the `log1pf' function. */ +#undef HAVE_LOG1PF + /* Define to 1 if you have the `log2' function. */ #undef HAVE_LOG2

1 0

Nikolay Sivov : comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 04c5da5629145fd2d22571bddb4e8b64f20dd19f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c5da5629145fd2d22571bdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:50:54 2017 +0300 comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 970029bb9ba33928bb20c5e397d47f023e4a6501) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 13 ++++++------- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f2f7924..a8bcd40 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2367,6 +2367,47 @@ static void test_save(void) RegCloseKey( key ); } +static void test_drawtext_flags(void) +{ + HWND hwnd = NULL; + UINT flags; + + rebuild_toolbar(&hwnd); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + + /* zero mask, flags are retained */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + /* set/remove */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == DT_BOTTOM, "Unexpected draw text flags %#x\n", flags); + ok(flags & DT_BOTTOM, "Expected DT_BOTTOM style, %#x\n", flags); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2411,6 +2452,7 @@ START_TEST(toolbar) test_TB_GET_SET_EXTENDEDSTYLE(); test_noresize(); test_save(); + test_drawtext_flags(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 0c545a2..784745c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4546,17 +4546,16 @@ TOOLBAR_SetDisabledImageList (TOOLBAR_INFO *infoPtr, WPARAM wParam, HIMAGELIST h static LRESULT -TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD flags) { - DWORD dwTemp; + DWORD old_flags; - TRACE("hwnd = %p, dwMask = 0x%08x, dwDTFlags = 0x%08x\n", infoPtr->hwndSelf, (DWORD)wParam, (DWORD)lParam); + TRACE("hwnd = %p, mask = 0x%08x, flags = 0x%08x\n", infoPtr->hwndSelf, mask, flags); - dwTemp = infoPtr->dwDTFlags; - infoPtr->dwDTFlags = - (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam; + old_flags = infoPtr->dwDTFlags; + infoPtr->dwDTFlags = (old_flags & ~mask) | (flags & mask); - return (LRESULT)dwTemp; + return (LRESULT)old_flags; } /* This function differs a bit from what MSDN says it does:

1 0

André Hentschel : wpcap: Fix build with newer pcap versions.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 773cad9f16ecc9aaf751e05cdf2f6f408c582305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773cad9f16ecc9aaf751e05cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 21 15:16:51 2017 +0200 wpcap: Fix build with newer pcap versions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 28173f06932edd85a64a952120d29b9bb1e762ea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wpcap/wpcap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b770067..fe46903 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -19,6 +19,11 @@ */ #include <pcap/pcap.h> + +/* pcap.h might define those: */ +#undef SOCKET +#undef INVALID_SOCKET + #include "winsock2.h" #include "windef.h" #include "winbase.h"

1 0

Austin English : user32: Add LogicalToPhysicalPoint/ PhysicalToLogicalPoint stubs.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: bb87ed485a6861dc0a3b9142b11f2c6f020e2b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb87ed485a6861dc0a3b9142b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 13:20:07 2017 -0500 user32: Add LogicalToPhysicalPoint/PhysicalToLogicalPoint stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3b9e49b4d8815754e5c7b7a0c4f982e6efa0ac62) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec | 2 +- .../ext-ms-win-ntuser-window-l1-1-1.spec | 2 +- dlls/user32/user32.spec | 2 ++ dlls/user32/winpos.c | 24 ++++++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec index 69488d1..4b563ff 100644 --- a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec +++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec @@ -36,7 +36,7 @@ @ stdcall IsWindow(long) user32.IsWindow @ stdcall IsWindowUnicode(long) user32.IsWindowUnicode @ stdcall IsWindowVisible(long) user32.IsWindowVisible -@ stub LogicalToPhysicalPoint +@ stdcall LogicalToPhysicalPoint(long ptr) user32.LogicalToPhysicalPoint @ stdcall MoveWindow(long long long long long long) user32.MoveWindow @ stdcall RemovePropW(long wstr) user32.RemovePropW @ stdcall SetForegroundWindow(long) user32.SetForegroundWindow diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec index 69488d1..4b563ff 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec @@ -36,7 +36,7 @@ @ stdcall IsWindow(long) user32.IsWindow @ stdcall IsWindowUnicode(long) user32.IsWindowUnicode @ stdcall IsWindowVisible(long) user32.IsWindowVisible -@ stub LogicalToPhysicalPoint +@ stdcall LogicalToPhysicalPoint(long ptr) user32.LogicalToPhysicalPoint @ stdcall MoveWindow(long long long long long long) user32.MoveWindow @ stdcall RemovePropW(long wstr) user32.RemovePropW @ stdcall SetForegroundWindow(long) user32.SetForegroundWindow diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 65a5bfe..c5ef0e7 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -488,6 +488,7 @@ @ stub LockWindowStation @ stdcall LockWindowUpdate(long) @ stdcall LockWorkStation() +@ stdcall LogicalToPhysicalPoint(long ptr) @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) @ stub MBToWCSEx @@ -538,6 +539,7 @@ # @ stub PaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) +@ stdcall PhysicalToLogicalPoint(long ptr) @ stub PlaySoundEvent @ stdcall PostMessageA(long long long long) @ stdcall PostMessageW(long long long long) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a6c2ce1..33644ff 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2948,3 +2948,27 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else WINPOS_ShowIconTitle( hwnd, TRUE ); } } + +/*********************************************************************** + * LogicalToPhysicalPoint (USER32.@) + */ +BOOL WINAPI LogicalToPhysicalPoint(HWND hwnd, POINT *point) +{ + static int once; + + if (!once++) + FIXME("(%p %p) stub\n", hwnd, point); + return TRUE; +} + +/*********************************************************************** + * PhysicalToLogicalPoint (USER32.@) + */ +BOOL WINAPI PhysicalToLogicalPoint(HWND hwnd, POINT *point) +{ + static int once; + + if (!once++) + FIXME("(%p %p) stub\n", hwnd, point); + return TRUE; +}

1 0

Akihiro Sagawa : oleaut32: Fix parse error when converting non-ascii string to VT_DATE.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 4c8624fd93cdb5ba9c08b0fd320eaa4b5a23f6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8624fd93cdb5ba9c08b0fd3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 00:00:07 2017 +0900 oleaut32: Fix parse error when converting non-ascii string to VT_DATE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit efc86ec175fa2f67c649299f48ac96d1af9a1fa9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/vartype.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ff495bd..0f39043 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3410,6 +3410,8 @@ static void test_VarDateFromStr(void) SYSTEMTIME st; OLECHAR buff[128]; size_t i; + OLECHAR with_ideographic_spaceW[] = { '6','/','3','0','/','2','0','1','1',0x3000, + '1',':','2','0',':','3','4',0 }; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); @@ -3533,6 +3535,11 @@ static void test_VarDateFromStr(void) DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ + /* test a data with ideographic space */ + out = 0.0; + hres = pVarDateFromStr(with_ideographic_spaceW, lcid, LOCALE_NOUSEROVERRIDE, &out); + EXPECT_DBL(40724.05594907407); + /* test a non-english data string */ DFS("02.01.1970"); EXPECT_MISMATCH; DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index fc5a025..000b66c 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7679,7 +7679,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd dp.dwCount++; strIn--; } - else if (isalpha(*strIn)) + else if (isalphaW(*strIn)) { BOOL bFound = FALSE;

1 0

Zebediah Figura : secur32/tests: Zero-initialize contexts.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: cb528d1f4d442ac89a79701e1c52d51198427689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb528d1f4d442ac89a79701e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 12 16:04:06 2017 -0500 secur32/tests: Zero-initialize contexts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit abd38ab29383292aebc4a91c0b08c6c45b58e1c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 3b661c1..944126e 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -574,7 +574,7 @@ static void testInitializeSecurityContextFlags(void) { SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; - SspiData client; + SspiData client = {0}; SEC_WINNT_AUTH_IDENTITY_A id; ULONG req_attr, ctxt_attr; TimeStamp ttl; @@ -794,7 +794,7 @@ static void testAuth(ULONG data_rep, BOOL fake) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client, server; + SspiData client = {0}, server = {0}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; @@ -923,7 +923,7 @@ static void testSignSeal(void) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client, server; + SspiData client = {0}, server = {0}; SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt; @@ -1340,8 +1340,8 @@ static void test_cred_multiple_use(void) SEC_WINNT_AUTH_IDENTITY_A id; PSecPkgInfoA pkg_info = NULL; CredHandle cred; - CtxtHandle ctxt1; - CtxtHandle ctxt2; + CtxtHandle ctxt1 = {0}; + CtxtHandle ctxt2 = {0}; SecBufferDesc buffer_desc; SecBuffer buffers[1]; ULONG ctxt_attr; @@ -1400,7 +1400,7 @@ static void test_null_auth_data(void) SECURITY_STATUS status; PSecPkgInfoA info; CredHandle cred; - CtxtHandle ctx; + CtxtHandle ctx = {0}; SecBufferDesc buffer_desc; SecBuffer buffers[1]; char user[256];

1 0