wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Alexandre Julliard : tools: Upgrade the autoconf scripts.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: f6a1b37d132d516cf7577b697553c1a7e2050878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a1b37d132d516cf7577b69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 18 17:23:46 2019 +0100 tools: Upgrade the autoconf scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/config.guess | 679 ++++++++++++++++++++++++++++------------------------- tools/config.sub | 284 +++++++++++----------- tools/install-sh | 397 +++++++++++++++---------------- 3 files changed, 689 insertions(+), 671 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6a1b37d132d516cf757…

1 0

Francois Gouget : testbot/LogUtils: Highlight TestLauncher errors.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: tools Branch: master Commit: b7c2334ea3a741112f75070bde9e2007793ecb6d URL: https://source.winehq.org/git/tools.git/?a=commit;h=b7c2334ea3a741112f75070… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 18 14:12:53 2019 +0100 testbot/LogUtils: Highlight TestLauncher errors. Such as when it cannot parse the subtests list (typically because a missing library prevented the test from running at all). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17a0286..c577426 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -186,6 +186,7 @@ sub GetLogLineCategory($) $Line =~ /^[a-zA-Z.]+:error: / or # TestBot error $Line =~ /^BotError:/ or + $Line =~ /^Error:/ or # X errors $Line =~ /^X Error of failed request: / or $Line =~ / opcode of failed request: /)

1 0

Alexandre Julliard : ntdll: Silence the timezone fixme when the registry is empty.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 238c6be5b81cbfcf8cd147b1cbb25d16803efbe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=238c6be5b81cbfcf8cd147b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 19:38:42 2019 +0100 ntdll: Silence the timezone fixme when the registry is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48300 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 7f79c3e4ff..1d5c4f2b31 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -854,6 +854,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* NtClose(hkey); + if (idx == 1) return; /* registry info not initialized yet */ + FIXME("Can't find matching timezone information in the registry for " "%s, bias %d, std (d/m/y): %u/%02u/%04u, dlt (d/m/y): %u/%02u/%04u\n", tz_name, tzi->Bias,

1 0

Alexandre Julliard : msvcp120/tests: Don't use const pointers to avoid compiler warnings.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 74b3f392ab24378c81ad88cb2d7572e93c1b26f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b3f392ab24378c81ad88cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:50:53 2019 +0100 msvcp120/tests: Don't use const pointers to avoid compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 9c3f22a367..7a382ac6fa 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -115,17 +115,12 @@ struct thiscall_thunk #include "poppack.h" static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); -static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); -static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, - const void *b ); -static void * (WINAPI *call_thiscall_func4)( void *func, void *this, const void *a, - const void *b, const void *c ); -static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d ); -static void * (WINAPI *call_thiscall_func6)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d, const void *e ); -static void * (WINAPI *call_thiscall_func7)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d, const void *e, const void *f ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, void *a ); +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, void *a, void *b ); +static void * (WINAPI *call_thiscall_func4)( void *func, void *this, void *a, void *b, void *c ); +static void * (WINAPI *call_thiscall_func5)( void *func, void *this, void *a, void *b, void *c, void *d ); +static void * (WINAPI *call_thiscall_func6)( void *func, void *this, void *a, void *b, void *c, void *d, void *e ); +static void * (WINAPI *call_thiscall_func7)( void *func, void *this, void *a, void *b, void *c, void *d, void *e, void *f ); static void init_thiscall_thunk(void) { @@ -146,17 +141,12 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ - (const void*)(b)) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c)) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d)) -#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) -#define call_func7(func,_this,a,b,c,d,e,f) call_thiscall_func7(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e),(const void*)(f)) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(void*)(a),(void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(void*)(a),(void*)(b),(void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d)) +#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d),(void*)(e)) +#define call_func7(func,_this,a,b,c,d,e,f) call_thiscall_func7(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d),(void*)(e),(void*)(f)) #else #define init_thiscall_thunk()

1 0

Alexandre Julliard : winmm/tests: Fix a constant conversion warning.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: ef35796376e01688a4dd28fea00782877eeac344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef35796376e01688a4dd28fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:50:40 2019 +0100 winmm/tests: Fix a constant conversion warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a2f2a82880..f9fc5c5aad 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -161,7 +161,7 @@ static char* wave_generate_silence(WAVEFORMATEX* wfx, double duration, DWORD* si for (i=0;i<nb_samples;i++) { if (wfx->wBitsPerSample==8) { for (j = 0; j < wfx->nChannels; j++) - *b++=128; + *b++=(char)128; } else if (wfx->wBitsPerSample==16) { for (j = 0; j < wfx->nChannels; j++) { b[0]=0;

1 0

Alexandre Julliard : oledb32/tests: Fix a constant conversion warning.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: b5157c528d220fea70c6f227831eea008840ed1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5157c528d220fea70c6f227… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:49:56 2019 +0100 oledb32/tests: Fix a constant conversion warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 28401e68c9..8ec64d40ae 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3092,7 +3092,7 @@ static void test_getconversionsize(void) SAFEARRAYBOUND rgsabound[1]; int i4 = 200; WORD i2 = 201; - char i1 = 203; + char i1 = (char)203; FLOAT f4 = 1.0; LONGLONG i8 = 202; DATE dbdate;

1 0

Alexandre Julliard : d3dx9_36/tests: Fix some constant conversion warnings.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 863da013a216bb50b925bbb9e3987b21206fb782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=863da013a216bb50b925bbb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:29:18 2019 +0100 d3dx9_36/tests: Fix some constant conversion warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index da9b80c578..3882bb404a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -7484,9 +7484,9 @@ static void test_weld_vertices(void) {{ 2.0f, 3.0f, 0.f}, {0, 0, 0, 0}}, {{ 0.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 3.0f, 3.0f, 0.f}, {65535, 65535, 65535, 65535}}, + {{ 3.0f, 3.0f, 0.f}, {-1, -1, -1, -1}}, {{ 3.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 1.0f, 0.0f, 0.f}, {65534, 65534, 65534, 65534}}, + {{ 1.0f, 0.0f, 0.f}, {-2, -2, -2, -2}}, }; const DWORD indices22[] = {0, 1, 2, 3, 4, 5}; const DWORD attributes22[] = {0, 0}; @@ -7501,7 +7501,7 @@ static void test_weld_vertices(void) {{ 2.0f, 3.0f, 0.f}, {0, 0, 0, 0}}, {{ 0.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 2.0f, 3.0f, 0.f}, {65535, 65535, 65535, 65535}}, + {{ 2.0f, 3.0f, 0.f}, {-1, -1, -1, -1}}, {{ 3.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, }; const DWORD exp_indices22[] = {0, 1, 2, 3, 4, 2};

1 0

Alexandre Julliard : advapi32/tests: Use debug.h functions.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 4429b9f803de199c4fb8460049d8296baec5a407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4429b9f803de199c4fb84600… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:00:12 2019 +0100 advapi32/tests: Use debug.h functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 95 ++++-------------------------------------- dlls/advapi32/tests/security.c | 16 ++----- dlls/shell32/tests/shlexec.c | 4 +- 3 files changed, 14 insertions(+), 101 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 675426d4a9..e4d4893bd4 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -59,88 +59,11 @@ static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, static BOOL limited_user; - -/* Debugging functions from wine/libs/wine/debug.c */ - -/* allocate some tmp string space */ -/* FIXME: this is not 100% thread-safe */ -static char *get_temp_buffer( int size ) -{ - static char *list[32]; - static UINT pos; - char *ret; - UINT idx; - - idx = ++pos % ARRAY_SIZE(list); - if (list[idx]) - ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); - else - ret = HeapAlloc( GetProcessHeap(), 0, size ); - if (ret) list[idx] = ret; - return ret; -} - -static const char *wine_debugstr_an( const char *str, int n ) -{ - static const char hex[16] = "0123456789abcdef"; - char *dst, *res; - size_t size; - - if (!((ULONG_PTR)str >> 16)) - { - if (!str) return "(null)"; - res = get_temp_buffer( 6 ); - sprintf( res, "#%04x", LOWORD(str) ); - return res; - } - if (n == -1) n = strlen(str); - if (n < 0) n = 0; - size = 10 + min( 300, n * 4 ); - dst = res = get_temp_buffer( size ); - *dst++ = '"'; - while (n-- > 0 && dst <= res + size - 9) - { - unsigned char c = *str++; - switch (c) - { - case '\n': *dst++ = '\\'; *dst++ = 'n'; break; - case '\r': *dst++ = '\\'; *dst++ = 'r'; break; - case '\t': *dst++ = '\\'; *dst++ = 't'; break; - case '"': *dst++ = '\\'; *dst++ = '"'; break; - case '\\': *dst++ = '\\'; *dst++ = '\\'; break; - default: - if (c >= ' ' && c <= 126) - *dst++ = c; - else - { - *dst++ = '\\'; - *dst++ = 'x'; - *dst++ = hex[(c >> 4) & 0x0f]; - *dst++ = hex[c & 0x0f]; - } - } - } - *dst++ = '"'; - if (n > 0) - { - *dst++ = '.'; - *dst++ = '.'; - *dst++ = '.'; - } - *dst++ = 0; - return res; -} - static const char *dbgstr_SYSTEMTIME(const SYSTEMTIME *st) { - static int index; - static char buf[2][64]; - - index %= ARRAY_SIZE(buf); - sprintf(buf[index], "%02d-%02d-%04d %02d:%02d:%02d.%03d", - st->wMonth, st->wDay, st->wYear, - st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); - return buf[index++]; + return wine_dbg_sprintf("%02d-%02d-%04d %02d:%02d:%02d.%03d", + st->wMonth, st->wDay, st->wYear, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); } #define ADVAPI32_GET_PROC(func) \ @@ -263,8 +186,8 @@ static void _test_hkey_main_Value_A(int line, LPCSTR name, LPCSTR string, else { lok(memcmp(value, string, cbData) == 0, "RegQueryValueExA/2 failed: %s/%d != %s/%d\n", - wine_debugstr_an((char*)value, cbData), cbData, - wine_debugstr_an(string, full_byte_len), full_byte_len); + debugstr_an((char*)value, cbData), cbData, + debugstr_an(string, full_byte_len), full_byte_len); lok(*(value+cbData) == 0xbd, "RegQueryValueExA/2 overflowed at offset %u: %02x != bd\n", cbData, *(value+cbData)); } HeapFree(GetProcessHeap(), 0, value); @@ -2089,7 +2012,7 @@ static void test_string_termination(void) ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", ret); ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", - wine_debugstr_an((char*)buffer, outsize), outsize, string); + debugstr_an((char*)buffer, outsize), outsize, string); ok(buffer[insize] == 0xbd, "buffer overflow at %u %02x\n", insize, buffer[insize]); /* RegQueryValueExA adds a trailing '\0' if there is room */ @@ -2099,7 +2022,7 @@ static void test_string_termination(void) ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", ret); ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", - wine_debugstr_an((char*)buffer, outsize), outsize, string); + debugstr_an((char*)buffer, outsize), outsize, string); ok(buffer[insize] == 0, "buffer overflow at %u %02x\n", insize, buffer[insize]); /* RegEnumValueA may return a string with no trailing '\0' */ @@ -2111,7 +2034,7 @@ static void test_string_termination(void) ok(strcmp(name, "stringtest") == 0, "wrong name: %s\n", name); ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", - wine_debugstr_an((char*)buffer, outsize), outsize, string); + debugstr_an((char*)buffer, outsize), outsize, string); ok(buffer[insize] == 0xbd, "buffer overflow at %u %02x\n", insize, buffer[insize]); /* RegEnumValueA adds a trailing '\0' if there is room */ @@ -2123,7 +2046,7 @@ static void test_string_termination(void) ok(strcmp(name, "stringtest") == 0, "wrong name: %s\n", name); ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", - wine_debugstr_an((char*)buffer, outsize), outsize, string); + debugstr_an((char*)buffer, outsize), outsize, string); ok(buffer[insize] == 0, "buffer overflow at %u %02x\n", insize, buffer[insize]); RegDeleteKeyA(subkey, ""); diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index bddcdef6bb..8bcd16cb95 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -140,27 +140,17 @@ static HMODULE hmod; static int myARGC; static char** myARGV; -#define SID_SLOTS 4 -static char debugsid_str[SID_SLOTS][256]; -static int debugsid_index = 0; static const char* debugstr_sid(PSID sid) { LPSTR sidstr; DWORD le = GetLastError(); - char* res = debugsid_str[debugsid_index]; - debugsid_index = (debugsid_index + 1) % SID_SLOTS; + const char *res; if (!ConvertSidToStringSidA(sid, &sidstr)) - sprintf(res, "ConvertSidToStringSidA failed le=%u", GetLastError()); - else if (strlen(sidstr) > sizeof(*debugsid_str) - 1) - { - memcpy(res, sidstr, sizeof(*debugsid_str) - 4); - strcpy(res + sizeof(*debugsid_str) - 4, "..."); - LocalFree(sidstr); - } + res = wine_dbg_sprintf("ConvertSidToStringSidA failed le=%u", GetLastError()); else { - strcpy(res, sidstr); + res = __wine_dbg_strdup(sidstr); LocalFree(sidstr); } /* Restore the last error in case ConvertSidToStringSidA() modified it */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 496006985c..12ef18c1d8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -117,7 +117,7 @@ static char* decodeA(const char* str) return ptr; } -static void WINAPIV WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) +static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { __ms_va_list valist; char buffer[1024]; @@ -351,7 +351,7 @@ static void dump_child_(const char* file, int line) ***/ static char shell_call[2048]; -static void WINAPIV WINETEST_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) +static void WINAPIV __WINE_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) { __ms_va_list valist; char buffer[2048];

1 0

Alexandre Julliard : include: Allow using debug.h in tests.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: c8f338369695d360e021f2cbd82a18b2c0eb1514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8f338369695d360e021f2cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 15:54:38 2019 +0100 include: Allow using debug.h in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/tests/container.c | 29 -------- dlls/kernel32/tests/debugger.c | 2 +- dlls/kernel32/tests/process.c | 2 +- dlls/mshtml/tests/dom.c | 30 +-------- dlls/mshtml/tests/xmlhttprequest.c | 32 +-------- dlls/ole32/tests/ole_server.c | 8 +-- include/wine/debug.h | 4 -- include/wine/test.h | 135 ++----------------------------------- 8 files changed, 14 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8f338369695d360e021…

1 0

Alexandre Julliard : msvcrt/tests: Add some tests for wcstoi64().
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: d1444cb12add39a8ef79f38b1814a8e0e23aa007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1444cb12add39a8ef79f38b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 14:16:48 2019 +0100 msvcrt/tests: Add some tests for wcstoi64(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 95 ++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f4c4657791..1dfa05c744 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3078,17 +3078,33 @@ static void test__stricmp(void) static void test__wcstoi64(void) { - static const WCHAR digit[] = { '9', 0 }; - static const WCHAR space[] = { ' ', 0 }; - static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ - static const WCHAR cjk_1[] = { 0x4e00, 0 }; /* CJK Ideograph, First */ - static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ - static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ - static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ - static const WCHAR superscript1[] = { 0xb9, 0 }; /* SUPERSCRIPT ONE */ - static const WCHAR minus_0x91[] = { '-', 0x0e50, 'x', 0xff19, '1', 0 }; - static const WCHAR plus_071[] = { '+', 0x0e50, 0xff17, '1', 0 }; - static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + static const struct { WCHAR str[24]; __int64 res; unsigned __int64 ures; int base; } tests[] = + { + { L"9", 9, 9, 10 }, + { L" ", 0, 0 }, + { L"-1234", -1234, -1234 }, + { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ + { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ + { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */ + { { 0x0e59 }, 9, 9 }, /* THAI DIGIT NINE */ + { { 0xff19 }, 9, 9 }, /* FULLWIDTH DIGIT NINE */ + { { 0x00b9 }, 0, 0 }, /* SUPERSCRIPT ONE */ + { { '-',0x0e50,'x',0xff19,'1' }, -0x91, -0x91 }, + { { '+',0x0e50,0xff17,'1' }, 071, 071 }, + { { 0xff19,'f',0x0e59,0xff46 }, 0x9f9, 0x9f9, 16 }, + { L"4294967295", 4294967295, 4294967295 }, + { L"4294967296", 4294967296, 4294967296 }, + { L"9223372036854775807", 9223372036854775807, 9223372036854775807 }, + { L"9223372036854775808", _I64_MAX, 9223372036854775808u }, + { L"18446744073709551615", _I64_MAX, _UI64_MAX }, + { L"18446744073709551616", _I64_MAX, _UI64_MAX }, + { L"-4294967295", -4294967295, -4294967295 }, + { L"-4294967296", -4294967296, -4294967296 }, + { L"-9223372036854775807", -9223372036854775807, -9223372036854775807 }, + { L"-9223372036854775808", _I64_MIN, 9223372036854775808u }, + { L"-18446744073709551615", _I64_MIN, 1 }, + { L"-18446744073709551616", _I64_MIN, 1 }, + }; static const WCHAR zeros[] = { 0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xc66, 0xce6, 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 @@ -3104,51 +3120,16 @@ static void test__wcstoi64(void) return; } - res = p_wcstoi64(digit, NULL, 10); - ok(res == 9, "res != 9\n"); - res = p_wcstoi64(space, &endpos, 0); - ok(endpos == space, "endpos != space\n"); - res = p_wcstoi64(stock, &endpos, 10); - ok(res == 0, "res != 0\n"); - ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); - res = p_wcstoi64(cjk_1, NULL, 0); - ok(res == 0, "res != 0\n"); - res = p_wcstoi64(tamil, &endpos, 10); - ok(res == 0, "res != 0\n"); - ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); - res = p_wcstoi64(thai, NULL, 10); - ok(res == 9, "res != 9\n"); - res = p_wcstoi64(fullwidth, NULL, 10); - ok(res == 9, "res != 9\n"); - res = p_wcstoi64(superscript1, NULL, 10); - ok(res == 0, "res != 0\n"); - res = p_wcstoi64(hex, NULL, 16); - ok(res == 0x9f9, "res != 0x9f9\n"); - res = p_wcstoi64(minus_0x91, NULL, 0); - ok(res == -0x91, "res != -0x91\n"); - res = p_wcstoi64(plus_071, NULL, 0); - ok(res == 071, "res != 071\n"); - - ures = p_wcstoui64(digit, NULL, 10); - ok(ures == 9, "ures != 9\n"); - ures = p_wcstoui64(space, &endpos, 0); - ok(endpos == space, "endpos != space\n"); - ures = p_wcstoui64(stock, &endpos, 10); - ok(ures == 0, "ures != 0\n"); - ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); - ures = p_wcstoui64(tamil, &endpos, 10); - ok(ures == 0, "ures != 0\n"); - ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); - ures = p_wcstoui64(thai, NULL, 10); - ok(ures == 9, "ures != 9\n"); - ures = p_wcstoui64(fullwidth, NULL, 10); - ok(ures == 9, "ures != 9\n"); - ures = p_wcstoui64(superscript1, NULL, 10); - ok(ures == 0, "ures != 0\n"); - ures = p_wcstoui64(hex, NULL, 16); - ok(ures == 0x9f9, "ures != 0x9f9\n"); - ures = p_wcstoui64(plus_071, NULL, 0); - ok(ures == 071, "ures != 071\n"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + res = p_wcstoi64( tests[i].str, &endpos, tests[i].base ); + ok( res == tests[i].res, "%u: %s res %s\n", + i, wine_dbgstr_w(tests[i].str), wine_dbgstr_longlong(res) ); + if (!res) ok( endpos == tests[i].str, "%u: wrong endpos %p/%p\n", i, endpos, tests[i].str ); + ures = p_wcstoui64( tests[i].str, &endpos, tests[i].base ); + ok( ures == tests[i].ures, "%u: %s res %s\n", + i, wine_dbgstr_w(tests[i].str), wine_dbgstr_longlong(ures) ); + } /* Test various unicode digits */ for (i = 0; i < ARRAY_SIZE(zeros); ++i) { @@ -3159,8 +3140,6 @@ static void test__wcstoi64(void) res = p_wcstoi64(tmp, NULL, 16); ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); } - - return; } static void test_atoi(void)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019