March 2013 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Sync spec files.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 4237b8506357e7d7e561aae89a722cf41fc433ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4237b8506357e7d7e561aae89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:13:57 2013 +0100 msvcrt: Sync spec files. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 93bddbf..efba85a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1509,7 +1509,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l -@ stub _wcstoul_l +@ cdecl _wcstoul_l(wstr ptr long ptr) msvcrt._wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s @@ -1607,7 +1607,7 @@ @ stub _wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol -@ stub _wtol_l +@ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime32(wstr ptr) msvcrt._wutime32 @ cdecl _wutime64(wstr ptr) msvcrt._wutime64 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7f6b0d9..3718eae 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1872,7 +1872,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l -@ stub _wcstoul_l +@ cdecl _wcstoul_l(wstr ptr long ptr) msvcrt._wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s @@ -1969,7 +1969,7 @@ @ stub _wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol -@ stub _wtol_l +@ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime32(wstr ptr) msvcrt._wutime32 @ cdecl _wutime64(wstr ptr) msvcrt._wutime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a2e2929..0d6b8f8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1169,7 +1169,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l -@ stub _wcstoul_l +@ cdecl _wcstoul_l(wstr ptr long ptr) msvcrt._wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s @@ -1270,7 +1270,7 @@ @ stub _wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol -@ stub _wtol_l +@ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime32(wstr ptr) msvcrt._wutime32 @ cdecl _wutime64(wstr ptr) msvcrt._wutime64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 998349f..0aa1ed4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1163,7 +1163,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l -@ stub _wcstoul_l +@ cdecl _wcstoul_l(wstr ptr long ptr) msvcrt._wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s @@ -1261,7 +1261,7 @@ @ stub _wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol -@ stub _wtol_l +@ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime32(wstr ptr) msvcrt._wutime32 @ cdecl _wutime64(wstr ptr) msvcrt._wutime64

1 0

Piotr Caban : msvcrt: Don't forward strncpy to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: b6265562728787500d7d6762cdbad7473d408165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6265562728787500d7d6762c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:34 2013 +0100 msvcrt: Don't forward strncpy to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cd756e4..278932e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1424,7 +1424,7 @@ @ cdecl strncat(str str long) ntdll.strncat @ cdecl strncat_s(str long str long) MSVCRT_strncat_s @ cdecl strncmp(str str long) MSVCRT_strncmp -@ cdecl strncpy(ptr str long) ntdll.strncpy +@ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(str long) MSVCRT_strnlen @ cdecl strpbrk(str str) ntdll.strpbrk diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index bf33644..6049dce 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -572,6 +572,19 @@ int CDECL MSVCRT__strnicoll( const char* str1, const char* str2, MSVCRT_size_t c } /********************************************************************* + * strncpy (MSVCRT.@) + */ +char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len) +{ + MSVCRT_size_t i; + + for(i=0; i<len; i++) + if((dst[i] = src[i]) == '\0') break; + + return dst; +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src )

1 0

Piotr Caban : msvcrt: Don't forward strncmp to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: e66e95045924a9d37202925fbb29b466ce0b9881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66e95045924a9d37202925fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:19 2013 +0100 msvcrt: Don't forward strncmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6b11ba4..cd756e4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1423,7 +1423,7 @@ @ cdecl strlen(str) ntdll.strlen @ cdecl strncat(str str long) ntdll.strncat @ cdecl strncat_s(str long str long) MSVCRT_strncat_s -@ cdecl strncmp(str str long) ntdll.strncmp +@ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) ntdll.strncpy @ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(str long) MSVCRT_strnlen diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6d56cc0..bf33644 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1583,6 +1583,14 @@ char* __cdecl MSVCRT_strchr(const char *str, int c) } /********************************************************************* + * strncmp (MSVCRT.@) + */ +int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len) +{ + return strncmp(str1, str2, len); +} + +/********************************************************************* * _strnicmp_l (MSVCRT.@) */ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2,

1 0

Piotr Caban : msvcrt: Don't forward memset to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 1278080901b72eafd9613b4076d89c2078746293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1278080901b72eafd9613b407… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:59 2013 +0100 msvcrt: Don't forward memset to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7b27220..be94008 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1368,7 +1368,7 @@ @ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) ntdll.memmove @ cdecl memmove_s(ptr long ptr long) -@ cdecl memset(ptr long long) ntdll.memset +@ cdecl memset(ptr long long) MSVCRT_memset @ cdecl mktime(ptr) MSVCRT_mktime @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 0002ff0..f7c2118 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1567,6 +1567,14 @@ void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) } /********************************************************************* + * memset (MSVCRT.@) + */ +void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) +{ + return memset(dst, c, n); +} + +/********************************************************************* * _strnicmp_l (MSVCRT.@) */ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2,

1 0

Piotr Caban : msvcrt: Don't forward atoi to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 15b40e7b9c3740d0cb5da2f7d82058ee53adb812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b40e7b9c3740d0cb5da2f7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:49 2013 +0100 msvcrt: Don't forward atoi to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 36e1510..7b27220 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1249,7 +1249,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) ntdll.atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 1b2dea8..0002ff0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -861,7 +861,7 @@ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) /********************************************************************* * _atoi_l (MSVCRT.@) */ -int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) +int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); @@ -876,6 +876,14 @@ int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) } /********************************************************************* + * atoi (MSVCRT.@) + */ +int __cdecl MSVCRT_atoi(const char *str) +{ + return MSVCRT__atoi_l(str, NULL); +} + +/********************************************************************* * _strtoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Don't forward _wcsicmp to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 0ffc970aa483792ec1b080ad01beea34f688dd55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffc970aa483792ec1b080ad0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:06 2013 +0100 msvcrt: Don't forward _wcsicmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 99072aa..b648f88 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1098,7 +1098,7 @@ @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) # stub _wcsftime_l(ptr long wstr ptr ptr) -@ cdecl _wcsicmp(wstr wstr) ntdll._wcsicmp +@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp # stub _wcsicmp_l(wstr wstr ptr) @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll # stub _wcsicoll_l(wstr wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ba53084..fe0b6ac 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -70,6 +70,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) } /********************************************************************* + * _wcsicmp (MSVCRT.@) + */ +INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) +{ + return strcmpiW( str1, str2 ); +} + +/********************************************************************* * _wcsicoll (MSVCRT.@) */ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 )

1 0

Jacek Caban : secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 79c5d5cc176727a45505db73734b87ba214a8c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c5d5cc176727a45505db737… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:48 2013 +0100 secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS tests. --- dlls/secur32/tests/schannel.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7d4c532..5076767 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -166,6 +166,31 @@ static void test_strength(PCredHandle handle) trace("strength %d - %d\n", strength.dwMinimumCipherStrength, strength.dwMaximumCipherStrength); } +static void test_supported_protocols(CredHandle *handle, unsigned exprots) +{ + SecPkgCred_SupportedProtocols protocols; + SECURITY_STATUS status; + + status = pQueryCredentialsAttributesA(handle, SECPKG_ATTR_SUPPORTED_PROTOCOLS, &protocols); + ok(status == SEC_E_OK, "QueryCredentialsAttributes failed: %08x\n", status); + + if(exprots) + ok(protocols.grbitProtocol == exprots, "protocols.grbitProtocol = %x, expected %x\n", protocols.grbitProtocol, exprots); + + trace("Supported protocols:\n"); + +#define X(flag, name) do { if(protocols.grbitProtocol & flag) { trace(name "\n"); protocols.grbitProtocol &= ~flag; } }while(0) + X(SP_PROT_SSL2_CLIENT, "SSL 2 client"); + X(SP_PROT_SSL3_CLIENT, "SSL 3 client"); + X(SP_PROT_TLS1_0_CLIENT, "TLS 1.0 client"); + X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); + X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); +#undef X + + if(protocols.grbitProtocol) + trace("Unknown flags: %x\n", protocols.grbitProtocol); +} + static void testAcquireSecurityContext(void) { BOOL has_schannel = FALSE; @@ -261,8 +286,13 @@ static void testAcquireSecurityContext(void) st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, NULL); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); - if(st == SEC_E_OK) + if(st == SEC_E_OK) { + st = pQueryCredentialsAttributesA(&cred, SECPKG_ATTR_SUPPORTED_PROTOCOLS, NULL); + ok(st == SEC_E_INTERNAL_ERROR, "QueryCredentialsAttributes failed: %08x, expected SEC_E_INTERNAL_ERROR\n", st); + + test_supported_protocols(&cred, 0); pFreeCredentialsHandle(&cred); + } memset(&cred, 0, sizeof(cred)); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &exp); @@ -650,6 +680,8 @@ static void test_communication(void) ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); if (status != SEC_E_OK) return; + test_supported_protocols(&cred_handle, SP_PROT_SSL3_CLIENT); + /* Initialize the connection */ init_buffers(&buffers[0], 4, buf_size); init_buffers(&buffers[1], 4, buf_size);

1 0

Ken Thomases : winemac: Use kCGLPFANoRecovery for accelerated pixel formats in create_context().
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 484cf761fcd75fb14da0d6a9865b6a597b9668d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484cf761fcd75fb14da0d6a98… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 07:01:22 2013 -0500 winemac: Use kCGLPFANoRecovery for accelerated pixel formats in create_context(). --- dlls/winemac.drv/opengl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 8627b70..58fd951 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2991,7 +2991,10 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share) attribs[n++] = kCGLPFAClosestPolicy; if (pf->accelerated) + { attribs[n++] = kCGLPFAAccelerated; + attribs[n++] = kCGLPFANoRecovery; + } else { attribs[n++] = kCGLPFARendererID;

1 0

Akihiro Sagawa : msvcrt/tests: Add unicode fgetwc tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: cf2ce8c64ba0734762ac3ecb716b332daeafca43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2ce8c64ba0734762ac3ecb7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 27 23:16:50 2013 +0900 msvcrt/tests: Add unicode fgetwc tests. --- dlls/msvcrt/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 25eab7a..5731437 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -865,6 +865,63 @@ static void test_fgetwc_locale(const char* text, const char* locale, int codepag unlink(tempfile); } +static void test_fgetwc_unicode(void) +{ + char temppath[MAX_PATH], tempfile[MAX_PATH]; + FILE *tempfh; + static const WCHAR wchar_text[] = { 0xfeff, 0xff1f, '!' }; + char utf8_text[BUFSIZ]; + int ret, i; + wint_t ch; + + GetTempPath(MAX_PATH, temppath); + GetTempFileName(temppath, "", 0, tempfile); + + if (!p_fopen_s) + { + win_skip("fopen_s not available\n"); + return; + } + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(wchar_text, 1, sizeof(wchar_text), tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt,ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text, sizeof(wchar_text)/sizeof(wchar_text[0]), + utf8_text, sizeof(utf8_text), NULL, NULL); + ok(ret > 0, "utf-8 conversion failed\n"); + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + unlink(temppath); +} + static void test_fputwc(void) { char temppath[MAX_PATH]; @@ -2127,6 +2184,7 @@ START_TEST(file) test_fgetwc_locale("AB\x83\xa9", "English", 1252); /* \x83 is U+0083 */ test_fgetwc_locale("AB\x83\xa9", "C", 0); + test_fgetwc_unicode(); test_fputwc(); test_ctrlz(); test_file_put_get();

1 0

Akihiro Sagawa : msvcrt/tests: Add locale dependent fgetwc tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: c2ce2fa06e0e8977b25823d64b9d6436fa3792fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ce2fa06e0e8977b25823d64… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 27 23:16:47 2013 +0900 msvcrt/tests: Add locale dependent fgetwc tests. --- dlls/msvcrt/tests/file.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 938161c..25eab7a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -33,6 +33,7 @@ #include <winnls.h> #include <process.h> #include <errno.h> +#include <locale.h> static HANDLE proc_handles[2]; @@ -43,6 +44,8 @@ static void init(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + setlocale(LC_CTYPE, "C"); + p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); } @@ -792,6 +795,76 @@ static void test_fgetwc( void ) free(tempf); } +static void test_fgetwc_locale(const char* text, const char* locale, int codepage) +{ + char temppath[MAX_PATH], tempfile[MAX_PATH]; + FILE *tempfh; + static const WCHAR wchar_text[] = { 0xfeff, 0xff1f, '!' }; + WCHAR wtextW[BUFSIZ]; + int ret = 0, i; + wint_t ch; + + if (!setlocale(LC_CTYPE, locale)) + { + win_skip("%s locale not available\n", locale); + return; + } + + GetTempPath(MAX_PATH, temppath); + GetTempFileName(temppath, "", 0, tempfile); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(text, 1, strlen(text), tempfh); + fclose(tempfh); + + if (codepage != 0) + { + /* mbstowcs rejects invalid multibyte sequence, + so we use MultiByteToWideChar here. */ + ret = MultiByteToWideChar(codepage, 0, text, -1, + wtextW, sizeof(wtextW)/sizeof(wtextW[0])); + ok(ret > 0, "MultiByteToWideChar failed\n"); + } + else + { + /* C locale */ + const char *p; + for (p = text; *p != '\0'; p++) + wtextW[ret++] = (unsigned char)*p; + wtextW[ret++] = 0; + } + + tempfh = fopen(tempfile, "rt"); + ok(tempfh != NULL, "can't open tempfile\n"); + + for (i = 0; i < ret-1; i++) + { + ch = fgetwc(tempfh); + ok(ch == wtextW[i], "got %04hx, expected %04hx (cp%d[%d])\n", ch, wtextW[i], codepage, i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (cp%d)\n", ch, codepage); + fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite(wchar_text, 1, sizeof(wchar_text), tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rb"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; i < sizeof(wchar_text)/sizeof(wchar_text[0]); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], "got %04hx, expected %04x (cp%d[%d])\n", ch, wchar_text[i], codepage, i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (cp%d)\n", ch, codepage); + fclose(tempfh); + unlink(tempfile); +} + static void test_fputwc(void) { char temppath[MAX_PATH]; @@ -2048,6 +2121,12 @@ START_TEST(file) test_flsbuf(); test_fflush(); test_fgetwc(); + /* \x83\xa9 is double byte character, \xe0\x7f is not (undefined). */ + test_fgetwc_locale("AB\x83\xa9\xe0\x7f", "Japanese_Japan.932", 932); + /* \x83 is U+0192 */ + test_fgetwc_locale("AB\x83\xa9", "English", 1252); + /* \x83 is U+0083 */ + test_fgetwc_locale("AB\x83\xa9", "C", 0); test_fputwc(); test_ctrlz(); test_file_put_get();

1 0