January 2020 - Wine-commits

André Hentschel : ole32: Fix some spec file entries.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: 1a29624d4c5e5ed5871a0d51f826559b8d373dae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a29624d4c5e5ed5871a0d51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:22:14 2020 +0100 ole32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f67527adf6..64394f461d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -283,7 +283,7 @@ @ stub UpdateDCOMSettings @ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) ole32.WdtpInterfacePointer_UserMarshal @ stub WdtpInterfacePointer_UserMarshal64 -@ stdcall WdtpInterfacePointer_UserSize(ptr long ptr long ptr) ole32.WdtpInterfacePointer_UserSize +@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) ole32.WdtpInterfacePointer_UserSize @ stub WdtpInterfacePointer_UserSize64 @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) ole32.WdtpInterfacePointer_UserUnmarshal @ stub WdtpInterfacePointer_UserUnmarshal64 diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 5e0e7030b2..eaf0e6b7f4 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -171,7 +171,7 @@ @ stdcall HWND_UserUnmarshal(ptr ptr ptr) @ stdcall IIDFromString(wstr ptr) @ stub I_RemoteMain -@ stdcall IsAccelerator(long long ptr long) +@ stdcall IsAccelerator(long long ptr ptr) @ stdcall IsEqualGUID(ptr ptr) @ stub IsValidIid @ stdcall IsValidInterface(ptr) @@ -222,9 +222,9 @@ @ stdcall OleQueryCreateFromData(ptr) @ stdcall OleQueryLinkFromData(ptr) @ stdcall OleRegEnumFormatEtc(ptr long ptr) -@ stdcall OleRegEnumVerbs(long ptr) +@ stdcall OleRegEnumVerbs(ptr ptr) @ stdcall OleRegGetMiscStatus(ptr long ptr) -@ stdcall OleRegGetUserType(long long ptr) +@ stdcall OleRegGetUserType(ptr long ptr) @ stdcall OleRun(ptr) @ stdcall OleSave(ptr ptr long) @ stdcall OleSaveToStream(ptr ptr) @@ -275,7 +275,7 @@ @ stdcall StgOpenPropStg(ptr ptr long long ptr) @ stdcall StgOpenStorage(wstr ptr long ptr long ptr) @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) -@ stdcall StgOpenStorageOnILockBytes(ptr ptr long long long ptr) +@ stdcall StgOpenStorageOnILockBytes(ptr ptr long ptr long ptr) @ stdcall StgSetTimes(wstr ptr ptr ptr ) @ stdcall StringFromCLSID(ptr ptr) @ stdcall StringFromGUID2(ptr ptr long) @@ -287,7 +287,7 @@ @ stub UtGetDvtd32Info @ stdcall WdtpInterfacePointer_UserFree(ptr) @ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) -@ stdcall WdtpInterfacePointer_UserSize(ptr long ptr long ptr) +@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) @ stdcall WriteClassStg(ptr ptr) @ stdcall WriteClassStm(ptr ptr)

1 0

Nikolay Sivov : kernel32/tests: Remove GetLongPathName() workarounds.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 05061846c1f2fe0179cd12af8aa1f8986cad29d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05061846c1f2fe0179cd12af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 12:48:28 2020 +0300 kernel32/tests: Remove GetLongPathName() workarounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 363 +++++++++++++++++++-------------------------- 1 file changed, 152 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05061846c1f2fe0179cd…

1 0

Nikolay Sivov : kernel32: Fix spec entries for GetLongPathName().
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 47c691a27c5e8d3ea16f517147fd900d91f590a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c691a27c5e8d3ea16f5171… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 12:48:29 2020 +0300 kernel32: Fix spec entries for GetLongPathName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec | 4 ++-- dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec | 4 ++-- dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec | 4 ++-- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec index 612e491f89..9298909a70 100644 --- a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec +++ b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec @@ -45,8 +45,8 @@ @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW @ stdcall GetLogicalDrives() kernel32.GetLogicalDrives -@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA -@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetLongPathNameA(str ptr long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr ptr long) kernel32.GetLongPathNameW @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW diff --git a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec index 1aba68d18b..878c1db5da 100644 --- a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec +++ b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec @@ -45,8 +45,8 @@ @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW @ stdcall GetLogicalDrives() kernel32.GetLogicalDrives -@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA -@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetLongPathNameA(str ptr long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr ptr long) kernel32.GetLongPathNameW @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW diff --git a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec index 5bf5cb3b55..61fedddd34 100644 --- a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec +++ b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec @@ -47,8 +47,8 @@ @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW @ stdcall GetLogicalDrives() kernel32.GetLogicalDrives -@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA -@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetLongPathNameA(str ptr long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr ptr long) kernel32.GetLongPathNameW @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c115fd3d75..a14bed04be 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -711,10 +711,10 @@ @ stdcall GetLogicalDrives() @ stdcall -import GetLogicalProcessorInformation(ptr ptr) @ stdcall -import GetLogicalProcessorInformationEx(long ptr ptr) -@ stdcall -import GetLongPathNameA (str long long) +@ stdcall -import GetLongPathNameA(str ptr long) # @ stub GetLongPathNameTransactedA # @ stub GetLongPathNameTransactedW -@ stdcall -import GetLongPathNameW (wstr long long) +@ stdcall -import GetLongPathNameW(wstr ptr long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) @ stdcall GetMaximumProcessorCount(long) # @ stub GetMaximumProcessorGroupCount diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index afa3b0192f..f36d4d525c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -549,8 +549,8 @@ @ stdcall GetLogicalDrives() kernel32.GetLogicalDrives @ stdcall GetLogicalProcessorInformation(ptr ptr) @ stdcall GetLogicalProcessorInformationEx(long ptr ptr) -@ stdcall GetLongPathNameA(str long long) -@ stdcall GetLongPathNameW(wstr long long) +@ stdcall GetLongPathNameA(str ptr long) +@ stdcall GetLongPathNameW(wstr ptr long) # @ stub GetMappedFileNameA # @ stub GetMappedFileNameW # @ stub GetMemoryErrorHandlingCapabilities

1 0

Zebediah Figura : user32/tests: Avoid testing that GDI handles are no longer valid.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 388dd4d890c45abb7bcdc0fe04ff38be8c0782c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=388dd4d890c45abb7bcdc0fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 16:10:04 2020 -0600 user32/tests: Avoid testing that GDI handles are no longer valid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4436ece70d..df23bb2894 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1397,7 +1397,6 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( CF_BITMAP, bitmap ); ok( h == bitmap, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - ok( !GetObjectType( bitmap_temp ), "expected free object %p\n", bitmap_temp ); h = SetClipboardData( CF_DSPBITMAP, bitmap2 ); ok( h == bitmap2, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); @@ -1605,9 +1604,6 @@ static void test_handles( HWND hwnd ) ok( is_freed( hmoveable ) || broken( !is_freed( hmoveable )), "expected freed mem %p\n", hmoveable ); ok( is_fixed( empty_fixed ), "expected fixed mem %p\n", empty_fixed ); ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed ); - ok( !GetObjectType( bitmap ), "expected freed handle %p\n", bitmap ); - ok( !GetObjectType( bitmap2 ), "expected freed handle %p\n", bitmap2 ); - ok( !GetObjectType( palette ), "expected freed handle %p\n", palette ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -1896,7 +1892,6 @@ static void test_data_handles(void) ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); - ok( !GetObjectType( bitmap ), "expected deleted %p\n", bitmap ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Zebediah Figura : user32/tests: Fix a dialog test failure on Windows 10.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 83876059597a6e47a595084386f6d19b36a96e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83876059597a6e47a5950843… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 20:01:57 2020 -0600 user32/tests: Fix a dialog test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b72f08816d..2a7d71f67a 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1984,6 +1984,8 @@ static void test_MessageBoxFontTest(void) ncMetrics.cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth); SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, 0, &ncMetrics, 0); + /* The height doesn't match on Windows 10 1709+. */ + ncMetrics.lfMessageFont.lfHeight = lfStaticFont.lfHeight; ok( !memcmp(&lfStaticFont, &ncMetrics.lfMessageFont, FIELD_OFFSET(LOGFONTW, lfFaceName)) && !lstrcmpW(lfStaticFont.lfFaceName, ncMetrics.lfMessageFont.lfFaceName), "dialog doesn't use message box font\n");

1 0

Erich E. Hoover : webservices: Use sscanf to convert strings to doubles.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 6d70b1a66e01315dedf27d65738b8f050552d7ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d70b1a66e01315dedf27d65… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Jan 7 12:11:25 2020 +0100 webservices: Use sscanf to convert strings to doubles. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 5 ++ dlls/webservices/reader.c | 105 +++++++++------------------------ dlls/webservices/tests/reader.c | 3 + dlls/webservices/webservices_private.h | 2 + include/msvcrt/stdio.h | 1 + 5 files changed, 39 insertions(+), 77 deletions(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 6801465f84..9b32369fd4 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -49,6 +50,8 @@ void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } +_locale_t c_locale; + /****************************************************************** * DllMain (webservices.@) */ @@ -59,11 +62,13 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: webservices_instance = hinst; DisableThreadLibraryCalls( hinst ); + c_locale = _create_locale( LC_ALL, "C" ); break; case DLL_PROCESS_DETACH: if (reserved) break; if (winsock_loaded) WSACleanup(); + _free_locale( c_locale ); break; } return TRUE; diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 181739650e..b328bb779e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <assert.h> #include <float.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -3726,15 +3727,13 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) { + BOOL found_sign = FALSE, found_exponent = FALSE, found_digit = FALSE, found_decimal = FALSE; static const unsigned __int64 nan = 0xfff8000000000000; static const unsigned __int64 inf = 0x7ff0000000000000; static const unsigned __int64 inf_min = 0xfff0000000000000; - HRESULT hr = WS_E_INVALID_FORMAT; - const unsigned char *p = str, *q; - int sign = 1, exp_sign = 1, exp = 0, exp_tmp = 0, neg_exp, i, nb_digits, have_digits; - unsigned __int64 val = 0, tmp; - long double exp_val = 1.0, exp_mul = 10.0; - unsigned int fpword = _control87( 0, 0 ); + const char *p = (const char *)str; + double tmp; + ULONG i; while (len && read_isspace( *p )) { p++; len--; } while (len && read_isspace( p[len - 1] )) { len--; } @@ -3756,88 +3755,40 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) return S_OK; } - *ret = 0.0; - if (*p == '-') - { - sign = -1; - p++; len--; - } - else if (*p == '+') { p++; len--; }; - if (!len) return S_OK; - - _control87( _MCW_EM | _RC_NEAR | _PC_64, _MCW_EM | _MCW_RC | _MCW_PC ); - - q = p; - while (len && isdigit( *q )) { q++; len--; } - have_digits = nb_digits = q - p; - for (i = 0; i < nb_digits; i++) + for (i = 0; i < len; i++) { - tmp = val * 10 + p[i] - '0'; - if (val > MAX_UINT64 / 10 || tmp < val) + if (p[i] >= '0' && p[i] <= '9') { - for (; i < nb_digits; i++) exp++; - break; + found_digit = TRUE; + continue; } - val = tmp; - } - - if (len) - { - if (*q == '.') + if (!found_sign && !found_digit && (p[i] == '+' || p[i] == '-')) { - p = ++q; len--; - while (len && isdigit( *q )) { q++; len--; }; - have_digits |= nb_digits = q - p; - for (i = 0; i < nb_digits; i++) - { - tmp = val * 10 + p[i] - '0'; - if (val > MAX_UINT64 / 10 || tmp < val) break; - val = tmp; - exp--; - } + found_sign = TRUE; + continue; } - if (len > 1 && tolower(*q) == 'e') + if (!found_exponent && found_digit && (p[i] == 'e' || p[i] == 'E')) { - if (!have_digits) goto done; - p = ++q; len--; - if (*p == '-') - { - exp_sign = -1; - p++; len--; - } - else if (*p == '+') { p++; len--; }; - - q = p; - while (len && isdigit( *q )) { q++; len--; }; - nb_digits = q - p; - if (!nb_digits || len) goto done; - for (i = 0; i < nb_digits; i++) - { - if (exp_tmp > MAX_INT32 / 10 || (exp_tmp = exp_tmp * 10 + p[i] - '0') < 0) - exp_tmp = MAX_INT32; - } - exp_tmp *= exp_sign; - - if (exp < 0 && exp_tmp < 0 && exp + exp_tmp >= 0) exp = MIN_INT32; - else if (exp > 0 && exp_tmp > 0 && exp + exp_tmp < 0) exp = MAX_INT32; - else exp += exp_tmp; + found_exponent = found_decimal = TRUE; + found_digit = found_sign = FALSE; + continue; + } + if (!found_decimal && p[i] == '.') + { + found_decimal = TRUE; + continue; } + return WS_E_INVALID_FORMAT; } - if (!have_digits || len) goto done; - - if ((neg_exp = exp < 0)) exp = -exp; - for (; exp; exp >>= 1) + if (!found_digit && !found_exponent) { - if (exp & 1) exp_val *= exp_mul; - exp_mul *= exp_mul; + *ret = 0; + return S_OK; } - *ret = sign * (neg_exp ? val / exp_val : val * exp_val); - hr = S_OK; - -done: - _control87( fpword, _MCW_EM | _MCW_RC | _MCW_PC ); - return hr; + if (_snscanf_l( p, len, "%lf", c_locale, &tmp ) != 1) return WS_E_INVALID_FORMAT; + *ret = tmp; + return S_OK; } static HRESULT str_to_float( const unsigned char *str, ULONG len, float *ret ) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 70623052de..96eee2cf77 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3650,7 +3650,10 @@ static void test_double(void) {"<t>-0.0</t>", S_OK, 0x8000000000000000}, {"<t>+0.0</t>", S_OK, 0}, {"<t>-</t>", S_OK, 0}, + {"<t>-.</t>", S_OK, 0}, {"<t>+</t>", S_OK, 0}, + {"<t>+.</t>", S_OK, 0}, + {"<t>.</t>", S_OK, 0}, {"<t>.0</t>", S_OK, 0}, {"<t>0.</t>", S_OK, 0}, {"<t>0</t>", S_OK, 0}, diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b12032060f..6f2b90dad2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,6 +18,8 @@ #include "winhttp.h" +_locale_t c_locale DECLSPEC_HIDDEN; + #define STREAM_BUFSIZE 4096 struct xmlbuf diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 6d0aaeaa6c..fa81f3d536 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -191,6 +191,7 @@ int WINAPIV sprintf_s(char*,size_t,const char*,...); int WINAPIV _scprintf(const char *, ...); int WINAPIV sscanf(const char*,const char*,...); int WINAPIV sscanf_s(const char*,const char*,...); +int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*);

1 0

Piotr Caban : ucrtbase: Fix end pointer setting in parse_double on partial nan/infinity match.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 3fc3d24c3cfb411439bf5773067ce42aa09edb6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc3d24c3cfb411439bf5773… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 15:35:52 2020 +0100 ucrtbase: Fix end pointer setting in parse_double on partial nan/infinity match. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 ++++ dlls/ucrtbase/tests/string.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 78a115550c..c4bd8ab129 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -706,7 +706,11 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(keep) { if (str_match == _infinity) return sign*INFINITY; if (str_match == _nan) return sign*NAN; + } else if(found_sign) { + unget(ctx); } + + return make_double(sign, exp, d, ROUND_ZERO, err); } if(nch == '0') { diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 0bb3feaa2f..c18b5483aa 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -144,6 +144,8 @@ static void test_strtod(void) test_strtod_str("inf42", INFINITY, 3); test_strtod_str("inffoo", INFINITY, 3); test_strtod_str("infini", INFINITY, 3); + test_strtod_str("input", 0, 0); + test_strtod_str("-input", 0, 0); test_strtod_str("NAN", NAN, 3); test_strtod_str("nan", NAN, 3);

1 0

Paul Gofman : user32/tests: Handle results on Win10 in test_Image_StretchMode().
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: ade89071f0530e4eedfd0845b58a396610ed6474 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade89071f0530e4eedfd0845… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jan 7 19:15:40 2020 +0300 user32/tests: Handle results on Win10 in test_Image_StretchMode(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8ce1eb163e..6687ebc4a8 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2813,7 +2813,8 @@ static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO #define compare_bitmap_bits(a, b, c, d, e, f, g) compare_bitmap_bits_(__LINE__, a, b, c, d, e, f, g) static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BITMAPINFO *bmi, - size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, BOOL todo) + size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, + const unsigned char *expected_broken_bits) { unsigned char *result_bits; unsigned int row, column; @@ -2832,9 +2833,9 @@ static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BIT result = get_color_from_bits(result_bits, bmi, row, column); expected = get_color_from_bits(expected_bits, bmi, row, column); - todo_wine_if(todo) - ok_(__FILE__, line)(result == expected, "Colors do not match, " - "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + ok_(__FILE__, line)(result == expected || broken(expected_broken_bits + && result == get_color_from_bits(expected_broken_bits, bmi, row, column)), + "Colors do not match, got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", result, expected, test_index, row, column); } HeapFree(GetProcessHeap(), 0, result_bits); @@ -2849,11 +2850,16 @@ static void test_Image_StretchMode(void) 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, }; - static const unsigned char expected_bits_24[] = + static const unsigned char expected_broken_bits_24[] = { 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, }; + static const unsigned char expected_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + }; #define rgb16(r, g, b) ((WORD)(((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3))) static const WORD test_bits_16[] = { @@ -2907,20 +2913,21 @@ static void test_Image_StretchMode(void) size_t test_bits_size, result_bits_size; const RGBQUAD *bmi_colors; size_t bmi_colors_size; - BOOL todo; + const unsigned char *expected_broken_bits; } tests[] = { {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, - sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, TRUE}, + sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, + /* Broken on Windows before Win10 1607+ */ expected_broken_bits_24}, {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, sizeof(test_bits_1), sizeof(expected_bits_1), colors_bits_1, - sizeof(colors_bits_1), FALSE}, + sizeof(colors_bits_1)}, {4, 4, 2, 2, 8, test_bits_8, expected_bits_8, sizeof(test_bits_8), sizeof(expected_bits_8), colors_bits_8, - sizeof(colors_bits_8), FALSE}, + sizeof(colors_bits_8)}, {4, 4, 2, 2, 16, (const unsigned char *)test_bits_16, (const unsigned char *)expected_bits_16, - sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, FALSE}, + sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0}, }; static const char filename[] = "test.bmp"; BITMAPINFO *bmi, *bmi_output; @@ -2966,7 +2973,7 @@ static void test_Image_StretchMode(void) ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); compare_bitmap_bits(hdc, bitmap_copy, bmi_output, tests[test_index].result_bits_size, - tests[test_index].expected_bits, test_index, tests[test_index].todo); + tests[test_index].expected_bits, test_index, tests[test_index].expected_broken_bits); DeleteObject(bitmap); DeleteObject(bitmap_copy); @@ -2976,7 +2983,7 @@ static void test_Image_StretchMode(void) ok(!!bitmap, "LoadImageA() failed, result %u.\n", GetLastError()); DeleteFileA(filename); compare_bitmap_bits(hdc, bitmap, bmi_output, tests[test_index].result_bits_size, - tests[test_index].expected_bits, test_index, tests[test_index].todo); + tests[test_index].expected_bits, test_index, tests[test_index].expected_broken_bits); DeleteObject(bitmap); } ReleaseDC(0, hdc);

1 0

Jacek Caban : include: Add roerrorapi.h header.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: c1e73583111f83d03898f73c9c2283040dab8638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e73583111f83d03898f73c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 7 20:45:17 2020 +0100 include: Add roerrorapi.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/roerrorapi.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cbad4d604f..8a05f5d01c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -558,6 +558,7 @@ SOURCES = \ rmxfguid.h \ rmxftmpl.x \ roapi.h \ + roerrorapi.h \ roparameterizediid.idl \ row.idl \ rowchg.idl \ diff --git a/include/roerrorapi.h b/include/roerrorapi.h new file mode 100644 index 0000000000..dd9c7f16ec --- /dev/null +++ b/include/roerrorapi.h @@ -0,0 +1,29 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _ROERROR_H +#define _ROERROR_H + +#include <hstring.h> +#include <restrictederrorinfo.h> +#include <rpc.h> + +HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); +BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); + +#endif /* _ROERROR_H */

1 0

Louis Lenders : combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 774aaa1d309dfc9eaa0cd6390890d88387fbae4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=774aaa1d309dfc9eaa0cd639… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 7 20:45:32 2020 +0100 combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46972 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 4 ++-- dlls/combase/combase.spec | 4 ++-- dlls/combase/roapi.c | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index de0a6d8bd9..99f1ca357c 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo @ stub RoCaptureErrorContext @ stub RoFailFastWithErrorContext @ stub RoGetErrorReportingFlags diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index b1ad813fcb..0b390f1f80 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -1,4 +1,4 @@ -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo @ stub IsErrorPropagationEnabled @ stub RoCaptureErrorContext @ stub RoClearError @@ -9,7 +9,7 @@ @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @ stub RoOriginateErrorW -@ stub RoOriginateLanguageException +@ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException @ stub RoReportFailedDelegate @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 93575d5684..f67527adf6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -180,7 +180,7 @@ @ stub GetFuncDescs @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) @ stub HSTRING_UserFree @ stub HSTRING_UserFree64 @ stub HSTRING_UserMarshal @@ -260,7 +260,7 @@ @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @ stub RoOriginateErrorW -@ stub RoOriginateLanguageException +@ stdcall RoOriginateLanguageException(long ptr ptr) @ stub RoParameterizedTypeExtraGetTypeSignature @ stdcall RoRegisterActivationFactories(ptr ptr long ptr) @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index c9fe80f456..94b79ff3cf 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "roapi.h" #include "roparameterizediid.h" +#include "roerrorapi.h" #include "winstring.h" #include "wine/debug.h" @@ -275,6 +276,24 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF return S_OK; } +/*********************************************************************** + * GetRestrictedErrorInfo (combase.@) + */ +HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info) +{ + FIXME( "(%p)\n", info ); + return E_NOTIMPL; +} + +/*********************************************************************** + * RoOriginateLanguageException (combase.@) + */ +BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception) +{ + FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception); + return FALSE; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */

1 0