November 2010 - Wine-Commits

Eric Pouech : msvcrt: Implemented _i64to[aw]_s.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: beca1d73a89a2ca8abb0d52e8448b9d9328b25ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=beca1d73a89a2ca8abb0d52e8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 22:00:01 2010 +0100 msvcrt: Implemented _i64to[aw]_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/string.c | 156 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 164 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4d26904..28243de 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -731,9 +731,9 @@ @ cdecl _hypot(double double) msvcrt._hypot @ cdecl _hypotf(float float) msvcrt._hypotf @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa -@ stub _i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) msvcrt._i64toa_s @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow -@ stub _i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm @ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a65a89d..9206b93 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -578,9 +578,9 @@ @ cdecl _hypot(double double) msvcrt._hypot @ cdecl _hypotf(float float) msvcrt._hypotf @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa -@ stub _i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) msvcrt._i64toa_s @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow -@ stub _i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm @ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 64332f5..c58637d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -566,9 +566,9 @@ @ cdecl _hypot(double double) msvcrt._hypot @ cdecl _hypotf(float float) msvcrt._hypotf @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa -@ stub _i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) msvcrt._i64toa_s @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow -@ stub _i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm @ cdecl _initterm_e(ptr ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 00ba5ea..c73a132 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -515,9 +515,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -# stub _i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) _i64toa_s @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -# stub _i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) _i64tow_s @ cdecl _initterm(ptr ptr) # stub _initterm_e @ stub _inp #(long) -i386 diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d807c14..11ad5a0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -972,6 +972,162 @@ int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix) return 0; } +/********************************************************************* + * _i64toa_s (MSVCRT.@) + */ +int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix) +{ + unsigned __int64 val; + unsigned int digit; + int is_negative; + char buffer[65], *pos; + size_t len; + + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix >= 2) || !MSVCRT_CHECK_PMT(radix <= 36)) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = 1; + val = -value; + } + else + { + is_negative = 0; + val = value; + } + + pos = buffer + 64; + *pos = '\0'; + + do + { + digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) + *--pos = '-'; + + len = buffer + 65 - pos; + if (len > size) + { + size_t i; + char *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. Don't copy the negative sign if present. */ + + if (is_negative) + { + p++; + size--; + } + + for (pos = buffer + 63, i = 0; i < size; i++) + *p++ = *pos--; + + str[0] = '\0'; + MSVCRT_INVALID_PMT("str[size] is too small"); + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len); + return 0; +} + +/********************************************************************* + * _i64tow_s (MSVCRT.@) + */ +int CDECL _i64tow_s(__int64 value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) +{ + unsigned __int64 val; + unsigned int digit; + int is_negative; + MSVCRT_wchar_t buffer[65], *pos; + size_t len; + + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix >= 2) || !MSVCRT_CHECK_PMT(radix <= 36)) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = 1; + val = -value; + } + else + { + is_negative = 0; + val = value; + } + + pos = buffer + 64; + *pos = '\0'; + + do + { + digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) + *--pos = '-'; + + len = buffer + 65 - pos; + if (len > size) + { + size_t i; + MSVCRT_wchar_t *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. Don't copy the negative sign if present. */ + + if (is_negative) + { + p++; + size--; + } + + for (pos = buffer + 63, i = 0; i < size; i++) + *p++ = *pos--; + + MSVCRT_INVALID_PMT("str[size] is too small"); + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len * sizeof(MSVCRT_wchar_t)); + return 0; +} + #define I10_OUTPUT_MAX_PREC 21 /* Internal structure used by $I10_OUTPUT */ struct _I10_OUTPUT_DATA {

1 0

Greg Geldorp : ws2_32/tests: NT4 and Win2000 print IPv6 addresses a little bit differently.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: b53edc6dcc30cdae2900c37dfc79ec56c166668f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53edc6dcc30cdae2900c37df… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Tue Nov 16 11:13:07 2010 +0100 ws2_32/tests: NT4 and Win2000 print IPv6 addresses a little bit differently. --- dlls/ws2_32/tests/sock.c | 69 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 57 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fd61e78..6843846 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1350,8 +1350,13 @@ static void test_WSAAddressToStringA(void) CHAR expect6_1[] = "::1"; CHAR expect6_2[] = "20ab::1"; CHAR expect6_3[] = "[20ab::2001]:33274"; + CHAR expect6_3_nt[] = "20ab::2001(a)33274"; + CHAR expect6_3_w2k[] = "20ab::2001"; CHAR expect6_3_2[] = "[20ab::2001%4660]:33274"; + CHAR expect6_3_2_nt[] = "4660/20ab::2001(a)33274"; + CHAR expect6_3_2_w2k[] = "20ab::2001%4660"; CHAR expect6_3_3[] = "20ab::2001%4660"; + CHAR expect6_3_3_nt[] = "4660/20ab::2001"; len = 0; @@ -1454,8 +1459,14 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !strcmp( address6, expect6_3 ), "Expected: %s, got: %s\n", expect6_3, address6 ); - ok( len == sizeof(expect6_3), "Got size %d\n", len); + ok( !strcmp( address6, expect6_3 ) || + broken( !strcmp( address6, expect6_3_nt ) ) || /* NT4 */ + broken( !strcmp( address6, expect6_3_w2k ) ), /* Win2000 */ + "Expected: %s, got: %s\n", expect6_3, address6 ); + ok( len == sizeof(expect6_3) || + broken( len == sizeof(expect6_3_nt) ) || /* NT4 */ + broken( len == sizeof(expect6_3_w2k) ), /* Win2000 */ + "Got size %d\n", len); /* Test IPv6 address, port number and scope_id */ len = sizeof(address6); @@ -1467,8 +1478,14 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !strcmp( address6, expect6_3_2 ), "Expected: %s, got: %s\n", expect6_3_2, address6 ); - ok( len == sizeof(expect6_3_2), "Got size %d\n", len); + ok( !strcmp( address6, expect6_3_2 ) || + broken( !strcmp( address6, expect6_3_2_nt ) ) || /* NT4 */ + broken( !strcmp( address6, expect6_3_2_w2k ) ), /* Win2000 */ + "Expected: %s, got: %s\n", expect6_3_2, address6 ); + ok( len == sizeof(expect6_3_2) || + broken( len == sizeof(expect6_3_2_nt) ) || /* NT4 */ + broken( len == sizeof(expect6_3_2_w2k) ), /* Win2000 */ + "Got size %d\n", len); /* Test IPv6 address and scope_id */ len = sizeof(address6); @@ -1480,8 +1497,12 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !strcmp( address6, expect6_3_3 ), "Expected: %s, got: %s\n", expect6_3_3, address6 ); - ok( len == sizeof(expect6_3_3), "Got size %d\n", len); + ok( !strcmp( address6, expect6_3_3 ) || + broken( !strcmp( address6, expect6_3_3_nt ) ), /* NT4 */ + "Expected: %s, got: %s\n", expect6_3_3, address6 ); + ok( len == sizeof(expect6_3_3) || + broken( len == sizeof(expect6_3_3_nt) ), /* NT4 */ + "Got size %d\n", len); end: if (v6 != INVALID_SOCKET) @@ -1513,8 +1534,13 @@ static void test_WSAAddressToStringW(void) WCHAR expect6_1[] = {':',':','1',0}; WCHAR expect6_2[] = {'2','0','a','b',':',':','1',0}; WCHAR expect6_3[] = {'[','2','0','a','b',':',':','2','0','0','1',']',':','3','3','2','7','4',0}; + WCHAR expect6_3_nt[] = {'2','0','a','b',':',':','2','0','0','1','@','3','3','2','7','4',0}; + WCHAR expect6_3_w2k[] = {'2','0','a','b',':',':','2','0','0','1',0}; WCHAR expect6_3_2[] = {'[','2','0','a','b',':',':','2','0','0','1','%','4','6','6','0',']',':','3','3','2','7','4',0}; + WCHAR expect6_3_2_nt[] = {'4','6','6','0','/','2','0','a','b',':',':','2','0','0','1','@','3','3','2','7','4',0}; + WCHAR expect6_3_2_w2k[] = {'2','0','a','b',':',':','2','0','0','1','%','4','6','6','0',0}; WCHAR expect6_3_3[] = {'2','0','a','b',':',':','2','0','0','1','%','6','5','5','3','4',0}; + WCHAR expect6_3_3_nt[] = {'6','5','5','3','4','/','2','0','a','b',':',':','2','0','0','1',0}; len = 0; @@ -1619,8 +1645,15 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3 ), "Wrong string returned\n" ); - ok( len == sizeof(expect6_3)/sizeof(WCHAR), "Got %d\n", len); + ok( !lstrcmpW( address6, expect6_3 ) || + broken( !lstrcmpW( address6, expect6_3_nt ) ) || /* NT4 */ + broken( !lstrcmpW( address6, expect6_3_w2k ) ), /* Win2000 */ + "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3), + wine_dbgstr_w(address6) ); + ok( len == sizeof(expect6_3)/sizeof(WCHAR) || + broken(len == sizeof(expect6_3_nt)/sizeof(WCHAR) ) || /* NT4 */ + broken(len == sizeof(expect6_3_w2k)/sizeof(WCHAR) ), /* Win2000 */ + "Got %d\n", len); /* Test IPv6 address, port number and scope_id */ len = sizeof(address6)/sizeof(WCHAR); @@ -1632,8 +1665,15 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3_2 ), "Wrong string returned\n" ); - ok( len == sizeof(expect6_3_2)/sizeof(WCHAR), "Got %d\n", len); + ok( !lstrcmpW( address6, expect6_3_2 ) || + broken( !lstrcmpW( address6, expect6_3_2_nt ) ) || /* NT4 */ + broken( !lstrcmpW( address6, expect6_3_2_w2k ) ), /* Win2000 */ + "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3_2), + wine_dbgstr_w(address6) ); + ok( len == sizeof(expect6_3_2)/sizeof(WCHAR) || + broken( len == sizeof(expect6_3_2_nt)/sizeof(WCHAR) ) || /* NT4 */ + broken( len == sizeof(expect6_3_2_w2k)/sizeof(WCHAR) ), /* Win2000 */ + "Got %d\n", len); /* Test IPv6 address and scope_id */ len = sizeof(address6)/sizeof(WCHAR); @@ -1645,8 +1685,13 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3_3 ), "Wrong string returned\n" ); - ok( len == sizeof(expect6_3_3)/sizeof(WCHAR), "Got %d\n", len); + ok( !lstrcmpW( address6, expect6_3_3 ) || + broken( !lstrcmpW( address6, expect6_3_3_nt ) ), /* NT4 */ + "Expected: %s, got: %s\n", wine_dbgstr_w(expect6_3_3), + wine_dbgstr_w(address6) ); + ok( len == sizeof(expect6_3_3)/sizeof(WCHAR) || + broken( len == sizeof(expect6_3_3_nt)/sizeof(WCHAR) ), /* NT4 */ + "Got %d\n", len); end: if (v6 != INVALID_SOCKET)

1 0

Eric Pouech : msvcrt: Implemented _ltoa_s.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 28884a8faacc2cd832e7db86abc1c072ef51e97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=28884a8faacc2cd832e7db86a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 21:59:55 2010 +0100 msvcrt: Implemented _ltoa_s. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 30 ++++++++++++++++++++++++------ 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 08942ae..4d26904 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -862,9 +862,9 @@ @ cdecl _lseek(long long long) msvcrt._lseek @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64 @ cdecl _ltoa(long ptr long) msvcrt._ltoa -@ stub _ltoa_s +@ cdecl _ltoa_s(long ptr long long) msvcrt._ltoa_s @ cdecl _ltow(long ptr long) msvcrt._ltow -@ stub _ltow_s +@ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _makepath_s(ptr long str str str str) msvcrt._makepath_s @ cdecl _malloc_crt(long) msvcrt.malloc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2052fde..a65a89d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -708,9 +708,9 @@ @ cdecl _lseek(long long long) msvcrt._lseek @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64 @ cdecl _ltoa(long ptr long) msvcrt._ltoa -@ stub _ltoa_s +@ cdecl _ltoa_s(long ptr long long) msvcrt._ltoa_s @ cdecl _ltow(long ptr long) msvcrt._ltow -@ stub _ltow_s +@ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _makepath_s(ptr long str str str str) msvcrt._makepath_s @ cdecl _malloc_crt(long) msvcrt.malloc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2fde5eb..64332f5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -696,9 +696,9 @@ @ cdecl _lseek(long long long) msvcrt._lseek @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64 @ cdecl _ltoa(long ptr long) msvcrt._ltoa -@ stub _ltoa_s +@ cdecl _ltoa_s(long ptr long long) msvcrt._ltoa_s @ cdecl _ltow(long ptr long) msvcrt._ltow -@ stub _ltow_s +@ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _makepath_s(ptr long str str str str) msvcrt._makepath_s @ cdecl _malloc_crt(long) msvcrt.malloc diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9602f3d..00ba5ea 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -639,9 +639,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -# stub _ltoa_s +@ cdecl _ltoa_s(long ptr long long) ntdll._ltoa_s @ cdecl _ltow(long ptr long) ntdll._ltow -# stub _ltow_s +@ cdecl _ltow_s(long ptr long long) ntdll._ltow_s @ cdecl _makepath(ptr str str str str) @ cdecl _makepath_s(ptr long str str str str) # stub _malloc_dbg diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d657fc3..d807c14 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -709,11 +709,12 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas } /********************************************************************* - * _itoa_s (MSVCRT.@) + * _ltoa_s (MSVCRT.@) */ -int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) +int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) { - unsigned int val, digit; + MSVCRT_ulong val; + unsigned int digit; int is_negative; char buffer[33], *pos; size_t len; @@ -786,11 +787,12 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* - * _itow_s (MSVCRT.@) + * _ltow_s (MSVCRT.@) */ -int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) +int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) { - unsigned int val, digit; + MSVCRT_ulong val; + unsigned int digit; int is_negative; MSVCRT_wchar_t buffer[33], *pos; size_t len; @@ -863,6 +865,22 @@ int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itoa_s (MSVCRT.@) + */ +int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) +{ + return _ltoa_s(value, str, size, radix); +} + +/********************************************************************* + * _itow_s (MSVCRT.@) + */ +int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) +{ + return _ltow_s(value, str, size, radix); +} + +/********************************************************************* * _ui64toa_s (MSVCRT.@) */ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str,

1 0

Eric Pouech : wineconsole: Properly manage window position (in wineconsole) from within wineserver.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 544dbb518eef48ea26ae43816494ebe5d328170a URL: http://source.winehq.org/git/wine.git/?a=commit;h=544dbb518eef48ea26ae43816… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 21:35:55 2010 +0100 wineconsole: Properly manage window position (in wineconsole) from within wineserver. --- programs/wineconsole/curses.c | 15 +++---- programs/wineconsole/user.c | 65 +++++++++++++------------------ programs/wineconsole/winecon_private.h | 1 - programs/wineconsole/wineconsole.c | 58 ++++++++++------------------ 4 files changed, 54 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=544dbb518eef48ea26ae4…

1 0

Gerald Pfeifer : msxml3: Remove practically unused variable from XDR_to_XSD_doc.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 7fe77b63695604238fe8853da5fbaa89dda0f1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe77b63695604238fe8853da… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Nov 16 02:18:54 2010 +0100 msxml3: Remove practically unused variable from XDR_to_XSD_doc. --- dlls/msxml3/xdr.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/xdr.c b/dlls/msxml3/xdr.c index c7f012b..3f1bad5 100644 --- a/dlls/msxml3/xdr.c +++ b/dlls/msxml3/xdr.c @@ -820,11 +820,10 @@ static xmlNodePtr XDR_E_Schema(xmlNodePtr xdr, xmlNodePtr parent, xmlChar const* xmlDocPtr XDR_to_XSD_doc(xmlDocPtr xdr_doc, xmlChar const* nsURI) { xmlDocPtr xsd_doc = xmlNewDoc(NULL); - xmlNodePtr root; TRACE("(%p)\n", xdr_doc); - root = XDR_E_Schema(get_schema((xmlNodePtr)xdr_doc), (xmlNodePtr)xsd_doc, nsURI); + XDR_E_Schema(get_schema((xmlNodePtr)xdr_doc), (xmlNodePtr)xsd_doc, nsURI); return xsd_doc; }

1 0

Eric Pouech : wineconsole: In curses mode, map some box drawing attributes to ACS characters.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 4a1d9c3b55efb1638eb6a6ecb8cd1e38dfd135aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1d9c3b55efb1638eb6a6ecb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 21:36:14 2010 +0100 wineconsole: In curses mode, map some box drawing attributes to ACS characters. --- programs/wineconsole/curses.c | 75 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 71 insertions(+), 4 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 35c5907..172ac47 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -124,6 +124,7 @@ MAKE_FUNCPTR(wgetch) MAKE_FUNCPTR(mouseinterval) MAKE_FUNCPTR(mousemask) #endif +MAKE_FUNCPTR(acs_map) #undef MAKE_FUNCPTR @@ -187,6 +188,7 @@ static BOOL WCCURSES_bind_libcurses(void) LOAD_FUNCPTR(mouseinterval) LOAD_FUNCPTR(mousemask) #endif + LOAD_FUNCPTR(acs_map) #undef LOAD_FUNCPTR @@ -235,6 +237,7 @@ sym_not_found: #define waddchnstr p_waddchnstr #define wmove p_wmove #define wgetch p_wgetch +#define acs_map (*p_acs_map) /****************************************************************** * WCCURSES_ResizeScreenBuffer @@ -358,16 +361,80 @@ static void WCCURSES_Refresh(const struct inner_data* data, int tp, int bm) int y; CHAR_INFO* cell; DWORD attr; - char ch; for (y = tp; y <= bm; y++) { cell = &data->cells[y * data->curcfg.sb_width]; for (x = 0; x < data->curcfg.sb_width; x++) { - WideCharToMultiByte(CP_UNIXCP, 0, &cell[x].Char.UnicodeChar, 1, - &ch, 1, NULL, NULL); - attr = ((BYTE)ch < 32) ? 32 : (BYTE)ch; + /* check for some mapping to ACS characters (drawing boxes, arrows) */ + if ((cell[x].Char.UnicodeChar >= 0x2500 && cell[x].Char.UnicodeChar <= 0x257F) || + (cell[x].Char.UnicodeChar >= 0x2190 && cell[x].Char.UnicodeChar <= 0x21FF)) + { + /* FIXME: we're also mapping heavy and lines item to single lines + * (that's ugly, but that's better than crap) + * Moreover, as the ACS_ macros refer to values in array acs_map[], we + * cannot simply build static tables for the mapping (FIXME: this could be done + * at load time) + */ + switch (cell[x].Char.UnicodeChar) + { + case 0x2190: case 0x219E: case 0x21A2: case 0x21A4: + case 0x21BC: case 0x21BD: case 0x21D0: case 0x21E6: attr = ACS_LARROW; break; + case 0x2191: case 0x219F: case 0x21A3: case 0x21A5: + case 0x21BE: case 0x21BF: case 0x21D1: case 0x21E7: attr = ACS_UARROW; break; + case 0x2192: case 0x21A0: case 0x21A6: case 0x21C0: + case 0x21C1: case 0x21D2: case 0x21E8: attr = ACS_RARROW; break; + case 0x2193: case 0x21A1: case 0x21A7: case 0x21C2: + case 0x21C3: case 0x21D3: case 0x21E9: attr = ACS_DARROW; break; + + case 0x2500: case 0x2501: case 0x257C: case 0x257E: attr = ACS_HLINE; break; + case 0x2502: case 0x2503: case 0x257D: case 0x257F: attr = ACS_VLINE; break; + case 0x250C: case 0x250D: case 0x250E: case 0x250F: attr = ACS_ULCORNER; break; + case 0x2510: case 0x2511: case 0x2512: case 0x2513: attr = ACS_URCORNER; break; + case 0x2514: case 0x2515: case 0x2516: case 0x2517: attr = ACS_LLCORNER; break; + case 0x2518: case 0x2519: case 0x251A: case 0x251B: attr = ACS_LRCORNER; break; + case 0x251C: case 0x251D: case 0x251E: case 0x251F: + case 0x2520: case 0x2521: case 0x2522: case 0x2523: attr = ACS_LTEE; break; + case 0x2524: case 0x2525: case 0x2526: case 0x2527: + case 0x2528: case 0x2529: case 0x252A: case 0x252B: attr = ACS_RTEE; break; + + case 0x252C: case 0x252D: case 0x252E: case 0x252F: + case 0x2530: case 0x2531: case 0x2532: case 0x2533: attr = ACS_TTEE; break; + case 0x2534: case 0x2535: case 0x2536: case 0x2537: + case 0x2538: case 0x2539: case 0x253A: case 0x253B: attr = ACS_BTEE; break; + + case 0x253C: case 0x253D: case 0x253E: case 0x253F: + case 0x2540: case 0x2541: case 0x2542: case 0x2543: + case 0x2544: case 0x2545: case 0x2546: case 0x2547: + case 0x2548: case 0x2549: case 0x254A: case 0x254B: attr = ACS_PLUS; break; + + case 0x2550: attr = ACS_HLINE; break; + case 0x2551: attr = ACS_VLINE; break; + case 0x2552: case 0x2553: case 0x2554: attr = ACS_ULCORNER; break; + case 0x2555: case 0x2556: case 0x2557: attr = ACS_URCORNER; break; + case 0x2558: case 0x2559: case 0x255A: attr = ACS_LLCORNER; break; + case 0x255B: case 0x255C: case 0x255D: attr = ACS_LRCORNER; break; + case 0x255E: case 0x255F: case 0x2560: attr = ACS_LTEE; break; + case 0x2561: case 0x2562: case 0x2563: attr = ACS_RTEE; break; + case 0x2564: case 0x2565: case 0x2566: attr = ACS_TTEE; break; + case 0x2567: case 0x2568: case 0x2569: attr = ACS_BTEE; break; + case 0x256A: case 0x256B: case 0x256C: attr = ACS_PLUS; break; + default: + WINE_FIXME("Unmapped special character (%x)\n", cell[x].Char.UnicodeChar); + attr = ' '; + } + } + else + { + char ch[2]; + + if (WideCharToMultiByte(CP_UNIXCP, 0, &cell[x].Char.UnicodeChar, 1, + ch, sizeof(ch), NULL, NULL) == 1) + attr = ((BYTE)ch[0] < 32) ? 32 : (BYTE)ch[0]; + else + attr = 32; + } if (cell[x].Attributes & FOREGROUND_RED) attr |= COLOR_PAIR(COLOR_RED); if (cell[x].Attributes & FOREGROUND_BLUE) attr |= COLOR_PAIR(COLOR_BLUE);

1 0

Eric Pouech : wineconsole: Added support for curses window resizing.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: e39a48faf1ef47ccf580a8aefd7e7188aec8faa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39a48faf1ef47ccf580a8aef… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 21:36:08 2010 +0100 wineconsole: Added support for curses window resizing. --- programs/wineconsole/curses.c | 56 ++++++++++++++++++++++++++++------------ 1 files changed, 39 insertions(+), 17 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 5038bce..35c5907 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -25,8 +25,6 @@ * functions which can be implemented as macros) * - finish buffer scrolling (mainly, need to decide of a nice way for * requesting the UP/DOWN operations - * - Resizing (unix) terminal does not change (Win32) console size. - * - Initial console size comes from registry and not from terminal size. */ #include "config.h" @@ -80,6 +78,7 @@ struct inner_data_curse int allow_scroll; }; +static CRITICAL_SECTION WCCURSES_CritSect; static void *nc_handle = NULL; @@ -416,6 +415,18 @@ static void WCCURSES_SetFont(struct inner_data* data, const WCHAR* font, } /****************************************************************** + * WCCURSES_Resize + * + */ +static void WCCURSES_Resize(struct inner_data* data) +{ + int width, height; + + getmaxyx(stdscr, height, width); + WINECON_ResizeWithContainer(data, width, height); +} + +/****************************************************************** * WCCURSES_ScrollV * * @@ -767,7 +778,12 @@ static unsigned WCCURSES_FillCode(struct inner_data* data, INPUT_RECORD* ir, int case KEY_MOUSE: numEvent = WCCURSES_FillMouse(ir); break; - +#ifdef KEY_RESIZE + case KEY_RESIZE: + WCCURSES_Resize(data); + break; +#endif + case KEY_MOVE: case KEY_NEXT: case KEY_OPEN: @@ -785,9 +801,6 @@ static unsigned WCCURSES_FillCode(struct inner_data* data, INPUT_RECORD* ir, int case KEY_SCOMMAND: case KEY_SCOPY: case KEY_SCREATE: -#ifdef KEY_RESIZE - case KEY_RESIZE: -#endif goto notFound; case KEY_SDC: @@ -872,16 +885,20 @@ static DWORD CALLBACK input_thread( void *arg ) if (pfd[1].revents & (POLLHUP|POLLERR)) break; if (!(pfd[0].revents & POLLIN)) continue; - if ((inchar = wgetch(stdscr)) == ERR) continue; - - WINE_TRACE("Got o%o (0x%x)\n", inchar,inchar); + /* we're called from input thread (not main thread), so force unique access */ + EnterCriticalSection(&WCCURSES_CritSect); + if ((inchar = wgetch(stdscr)) != ERR) + { + WINE_TRACE("Got o%o (0x%x)\n", inchar,inchar); - if (inchar >= KEY_MIN && inchar <= KEY_MAX) - numEvent = WCCURSES_FillCode(data, ir, inchar); - else - numEvent = WCCURSES_FillSimpleChar(ir, inchar); + if (inchar >= KEY_MIN && inchar <= KEY_MAX) + numEvent = WCCURSES_FillCode(data, ir, inchar); + else + numEvent = WCCURSES_FillSimpleChar(ir, inchar); - if (numEvent) WriteConsoleInputW(data->hConIn, ir, numEvent, &n); + if (numEvent) WriteConsoleInputW(data->hConIn, ir, numEvent, &n); + } + LeaveCriticalSection(&WCCURSES_CritSect); } close( PRIVATE(data)->sync_pipe[0] ); return 0; @@ -924,14 +941,19 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) */ static int WCCURSES_MainLoop(struct inner_data* data) { - DWORD id; + DWORD id; + BOOL cont = TRUE; + + WCCURSES_Resize(data); if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 0; PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); - while (WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) + while (cont && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) { - if (!WINECON_GrabChanges(data)) break; + EnterCriticalSection(&WCCURSES_CritSect); + cont = WINECON_GrabChanges(data); + LeaveCriticalSection(&WCCURSES_CritSect); } close( PRIVATE(data)->sync_pipe[1] );

1 0

Michael Stefaniuc : msxml3/tests: Remove redundant NULL check before SysFreeString (smatch).
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: fa4c8c090095be078f730cb0086a901efa46e452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4c8c090095be078f730cb00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 15 21:42:45 2010 +0100 msxml3/tests: Remove redundant NULL check before SysFreeString (smatch). --- dlls/msxml3/tests/domdoc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 07821b8..3f912fc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7537,7 +7537,7 @@ static void test_XDR_schemas(void) ok(err != NULL, "domdoc_validate() should always set err\n"); ole_expect(IXMLDOMParseError_get_reason(err, &bstr), S_FALSE); ok(IXMLDOMParseError_get_reason(err, &bstr) == S_FALSE, "got error: %s\n", wine_dbgstr_w(bstr)); - if (bstr) SysFreeString(bstr); + SysFreeString(bstr); IXMLDOMParseError_Release(err); /* load the next doc */ @@ -7563,7 +7563,7 @@ static void test_XDR_schemas(void) ok(err != NULL, "domdoc_validate() should always set err\n"); ole_expect(IXMLDOMParseError_get_reason(err, &bstr), S_FALSE); ok(IXMLDOMParseError_get_reason(err, &bstr) == S_FALSE, "got error: %s\n", wine_dbgstr_w(bstr)); - if (bstr) SysFreeString(bstr); + SysFreeString(bstr); IXMLDOMParseError_Release(err); /* load the next doc */ @@ -7587,7 +7587,7 @@ static void test_XDR_schemas(void) ole_expect(IXMLDOMDocument2_validate(doc, &err), S_FALSE); ok(err != NULL, "domdoc_validate() should always set err\n"); todo_wine ok(IXMLDOMParseError_get_reason(err, &bstr) == S_OK, "got error: %s\n", wine_dbgstr_w(bstr)); - if (bstr) SysFreeString(bstr); + SysFreeString(bstr); IXMLDOMParseError_Release(err); /* load the next doc */ @@ -7611,7 +7611,7 @@ static void test_XDR_schemas(void) ole_expect(IXMLDOMDocument2_validate(doc, &err), S_FALSE); ok(err != NULL, "domdoc_validate() should always set err\n"); todo_wine ok(IXMLDOMParseError_get_reason(err, &bstr) == S_OK, "got error: %s\n", wine_dbgstr_w(bstr)); - if (bstr) SysFreeString(bstr); + SysFreeString(bstr); IXMLDOMParseError_Release(err); IXMLDOMDocument2_Release(doc); @@ -7966,7 +7966,7 @@ static void test_get_dataType(void) ole_expect(IXMLDOMParseError_get_errorCode(err, &l), S_FALSE); ole_expect(IXMLDOMParseError_get_reason(err, &bstr), S_FALSE); ok(l == 0, "got %08x : %s\n", l, wine_dbgstr_w(bstr)); - if (bstr) SysFreeString(bstr); + SysFreeString(bstr); IXMLDOMParseError_Release(err); /* check the data types again */

1 0

Hans Leidekker : msi: Components don't require a key path.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 6d13e2fd4b796b14082cc3605df8ed9696c4aa6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d13e2fd4b796b14082cc3605… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 16 09:07:23 2010 +0100 msi: Components don't require a key path. --- dlls/msi/action.c | 3 +-- dlls/msi/classes.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5328193..511d82b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3245,8 +3245,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) '>','=',' ','%','i',' ','O','R','D','E','R',' ','B','Y',' ', '`','D','i','s','k','I','d','`',0}; - file = get_loaded_file(package, comp->KeyPath); - if (!file) + if (!comp->KeyPath || !(file = get_loaded_file(package, comp->KeyPath))) continue; row = MSI_QueryGetRecord(package->db, query, file->Sequence); diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 9305e04..d11f48b 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -850,8 +850,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) } feature->Action = feature->ActionRequest; - file = get_loaded_file( package, comp->KeyPath ); - if (!file) + if (!comp->KeyPath || !(file = get_loaded_file( package, comp->KeyPath ))) { TRACE("COM server not provided, skipping class %s\n", debugstr_w(cls->clsid)); continue;

1 0

Juan Lang : winhttp: Verify revocation status of certificate chain.
by Alexandre Julliard Nov. 16, 2010

Nov. 16, 2010

Module: wine Branch: master Commit: 55aae25d35bbaa82617674addde9c08cbed15ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55aae25d35bbaa82617674add… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 14:41:57 2009 -0800 winhttp: Verify revocation status of certificate chain. --- dlls/winhttp/net.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d4aa31f..38fd2cb 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -273,7 +273,8 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, TRACE("verifying %s\n", debugstr_w( server )); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, 0, + if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, + CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, NULL, &chain ))) { if (chain->TrustStatus.dwErrorStatus)

1 0