wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Piotr Caban : msvcrt: Don't forward strncpy to ntdll.
by Alexandre Julliard 27 Mar '13

27 Mar '13

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 27 Mar '13

27 Mar '13

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 strchr to ntdll.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: bf237452effdd4f10e657596af38ec207cc0964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf237452effdd4f10e657596a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:09 2013 +0100 msvcrt: Don't forward strchr 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 be94008..6b11ba4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1411,7 +1411,7 @@ @ varargs sscanf_s(str str) MSVCRT_sscanf_s @ cdecl strcat(str str) ntdll.strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s -@ cdecl strchr(str long) ntdll.strchr +@ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) ntdll.strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) ntdll.strcpy diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f7c2118..6d56cc0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1575,6 +1575,14 @@ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) } /********************************************************************* + * strchr (MSVCRT.@) + */ +char* __cdecl MSVCRT_strchr(const char *str, int c) +{ + return strchr(str, c); +} + +/********************************************************************* * _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 27 Mar '13

27 Mar '13

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 27 Mar '13

27 Mar '13

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: Added _wtol_l implementation.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 06c677384402d30c2868feca59d0708bdcf635cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c677384402d30c2868feca5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:32 2013 +0100 msvcrt: Added _wtol_l implementation. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 07e2984..69ad7a7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -42,6 +42,7 @@ #include "winbase.h" #define MSVCRT_LONG_MAX 0x7fffffffL +#define MSVCRT_LONG_MIN (-MSVCRT_LONG_MAX-1) #define MSVCRT_ULONG_MAX 0xffffffffUL #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ef5823c..36e1510 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1226,8 +1226,8 @@ @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l -@ cdecl _wtol(wstr) ntdll._wtol -# stub _wtol_l(wstr ptr) +@ cdecl _wtol(wstr) MSVCRT__wtol +@ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l @ cdecl _wunlink(wstr) MSVCRT__wunlink @ cdecl _wutime(wstr ptr) @ cdecl _wutime32(wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e00cb83..b0a52d7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1472,6 +1472,31 @@ int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) } /********************************************************************* + * _wtol_l (MSVCRT.@) + */ +MSVCRT_long __cdecl MSVCRT__wtol_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); + + if(ret > MSVCRT_LONG_MAX) { + ret = MSVCRT_LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < MSVCRT_LONG_MIN) { + ret = MSVCRT_LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* + * _wtol (MSVCRT.@) + */ +MSVCRT_long __cdecl MSVCRT__wtol(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtol_l(str, NULL); +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Don't forward _wtoi to ntdll.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 5c03a35f7a78f158e79b86ab0cfb72b594439da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c03a35f7a78f158e79b86ab0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:23 2013 +0100 msvcrt: Don't forward _wtoi to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b648f88..ef5823c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1222,7 +1222,7 @@ # stub _wtmpnam_s(ptr long) @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l -@ cdecl _wtoi(wstr) ntdll._wtoi +@ cdecl _wtoi(wstr) MSVCRT__wtoi @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fe0b6ac..e00cb83 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1449,7 +1449,7 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, /********************************************************************* * _wtoi_l (MSVCRT.@) */ -int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +int __cdecl MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); @@ -1464,6 +1464,14 @@ int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) } /********************************************************************* + * _wtoi (MSVCRT.@) + */ +int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtoi_l(str, NULL); +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Don't forward _wcsicmp to ntdll.
by Alexandre Julliard 27 Mar '13

27 Mar '13

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 27 Mar '13

27 Mar '13

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

Jacek Caban : secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS implementation .
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: e413b8a5054bc1c4ca1ddb35b6d21e3379b6a79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e413b8a5054bc1c4ca1ddb35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:35 2013 +0100 secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS implementation. --- dlls/secur32/schannel.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 87bb942..9a83a76 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -281,14 +281,14 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes( ret = SEC_E_INTERNAL_ERROR; break; case SECPKG_ATTR_SUPPORTED_PROTOCOLS: - if (pBuffer) - { - /* FIXME: get from OpenSSL? */ - FIXME("SECPKG_ATTR_SUPPORTED_PROTOCOLS: stub\n"); - ret = SEC_E_UNSUPPORTED_FUNCTION; - } - else + if(pBuffer) { + /* Regardless of MSDN documentation, tests show that this attribute takes into account + * what protocols are enabled for given credential. */ + ((SecPkgCred_SupportedProtocols*)pBuffer)->grbitProtocol = cred->enabled_protocols; + ret = SEC_E_OK; + }else { ret = SEC_E_INTERNAL_ERROR; + } break; default: ret = SEC_E_UNSUPPORTED_FUNCTION;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
54
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 March 2013