November 2009 - Wine-commits

Rob Shearman : advapi32: Use a duplicate of the process token if a NULL token is passed into CheckTokenMembership and there is no thread token .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 1802a5b9baa8a88bc0a6cf7af4778e9acbaece17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1802a5b9baa8a88bc0a6cf7af… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 10 23:03:10 2009 +0000 advapi32: Use a duplicate of the process token if a NULL token is passed into CheckTokenMembership and there is no thread token. --- dlls/advapi32/security.c | 43 +++++++++++++++++++++++++++------------- dlls/advapi32/tests/security.c | 4 +++ 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index db7d028..7dd39a4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -625,8 +625,10 @@ BOOL WINAPI CheckTokenMembership( HANDLE token, PSID sid_to_check, PBOOL is_member ) { - PTOKEN_GROUPS token_groups; + PTOKEN_GROUPS token_groups = NULL; + HANDLE thread_token = NULL; DWORD size, i; + BOOL ret; TRACE("(%p %s %p)\n", token, debugstr_sid(sid_to_check), is_member); @@ -634,26 +636,37 @@ CheckTokenMembership( HANDLE token, PSID sid_to_check, if (!token) { - if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token)) - return FALSE; + if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &thread_token)) + { + HANDLE process_token; + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE, &process_token); + if (!ret) + goto exit; + ret = DuplicateTokenEx(process_token, TOKEN_QUERY, + NULL, SecurityImpersonation, TokenImpersonation, + &thread_token); + CloseHandle(process_token); + if (!ret) + goto exit; + } + token = thread_token; } - if (!GetTokenInformation(token, TokenGroups, NULL, 0, &size)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - return FALSE; - } + ret = GetTokenInformation(token, TokenGroups, NULL, 0, &size); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + goto exit; token_groups = HeapAlloc(GetProcessHeap(), 0, size); if (!token_groups) - return FALSE; - - if (!GetTokenInformation(token, TokenGroups, token_groups, size, &size)) { - HeapFree(GetProcessHeap(), 0, token_groups); - return FALSE; + ret = FALSE; + goto exit; } + ret = GetTokenInformation(token, TokenGroups, token_groups, size, &size); + if (!ret) + goto exit; + for (i = 0; i < token_groups->GroupCount; i++) { TRACE("Groups[%d]: {0x%x, %s}\n", i, @@ -668,9 +681,11 @@ CheckTokenMembership( HANDLE token, PSID sid_to_check, } } +exit: HeapFree(GetProcessHeap(), 0, token_groups); + if (thread_token != NULL) CloseHandle(thread_token); - return TRUE; + return ret; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index eaa9e2c..b71d64f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3249,6 +3249,10 @@ static void test_CheckTokenMembership(void) ok(ret, "CheckTokenMembership failed with error %d\n", GetLastError()); ok(is_member, "CheckTokenMembership should have detected sid as member\n"); + ret = pCheckTokenMembership(NULL, token_groups->Groups[i].Sid, &is_member); + ok(ret, "CheckTokenMembership failed with error %d\n", GetLastError()); + ok(is_member, "CheckTokenMembership should have detected sid as member\n"); + ret = pCheckTokenMembership(process_token, token_groups->Groups[i].Sid, &is_member); todo_wine { ok(!ret && GetLastError() == ERROR_NO_IMPERSONATION_TOKEN,

1 0

Rob Shearman : rpcrt4: The get_ranged_enum test doesn't work on Windows, so don't execute it for the moment.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 7e52896b841cc117249f0507486ff9f29e0eaaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e52896b841cc117249f05074… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 10 23:04:03 2009 +0000 rpcrt4: The get_ranged_enum test doesn't work on Windows, so don't execute it for the moment. --- dlls/rpcrt4/tests/server.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 1205ea4..42753ac 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -775,7 +775,6 @@ basic_tests(void) wstr_struct_t ws = {wstring}; str_t str; se_t se; - renum_t re; ok(int_return() == INT_CODE, "RPC int_return\n"); @@ -888,9 +887,6 @@ basic_tests(void) ok(x == 0, "echo_ranged_int() returned %d instead of 0\n", x); x = echo_ranged_int(100); ok(x == 100, "echo_ranged_int() returned %d instead of 100\n", x); - - get_ranged_enum(&re); - ok(re == RE3, "get_ranged_enum() returned %d instead of RE3\n", re); } static void

1 0

Rob Shearman : rpcrt4: Support multiple interfaces and transfer syntaxes in bind and bind ack messages .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 59ba6d2573532c15e2487bbc86f6bb93022c1d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ba6d2573532c15e2487bbc8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 10 23:05:07 2009 +0000 rpcrt4: Support multiple interfaces and transfer syntaxes in bind and bind ack messages. --- dlls/rpcrt4/rpc_assoc.c | 7 +- dlls/rpcrt4/rpc_defs.h | 87 ++++++++++++++++------------ dlls/rpcrt4/rpc_message.c | 38 ++++++------- dlls/rpcrt4/rpc_message.h | 4 +- dlls/rpcrt4/rpc_server.c | 140 ++++++++++++++++++++++++++++++++++----------- 5 files changed, 181 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59ba6d2573532c15e2487…

1 0

Maarten Lankhorst : include: Add audiosessiontypes header.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: ffbefc6e04f61629ba2ba4725af871d6dafd9395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbefc6e04f61629ba2ba4725… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 09:16:33 2009 +0100 include: Add audiosessiontypes header. --- include/Makefile.in | 1 + include/audiosessiontypes.h | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 83e4358..f8c2b3d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -106,6 +106,7 @@ SRCDIR_INCLUDES = \ af_irda.h \ appmgmt.h \ audevcod.h \ + audiosessiontypes.h \ aviriff.h \ axcore.idl \ axextend.idl \ diff --git a/include/audiosessiontypes.h b/include/audiosessiontypes.h new file mode 100644 index 0000000..b9435f1 --- /dev/null +++ b/include/audiosessiontypes.h @@ -0,0 +1,48 @@ + +/* + * Core Audio audio session types definitions + * + * Copyright 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef __AUDIOSESSIONTYPES__ +#define __AUDIOSESSIONTYPES__ + +typedef enum _AUDCLNT_SHAREMODE +{ + AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_SHAREMODE_EXCLUSIVE, +} AUDCLNT_SHAREMODE; + +#define AUDCLNT_STREAMFLAGS_CROSSPROCESS 0x00010000 +#define AUDCLNT_STREAMFLAGS_LOOPBACK 0x00020000 +#define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000 +#define AUDCLNT_STREAMFLAGS_NOPERSIST 0x00080000 +#define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000 +#define AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED 0x10000000 +#define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE 0x20000000 +#define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED 0x40000000 + +typedef enum _AudioSessionState +{ + AudioSessionStateInactive = 0, + AudioSessionStateActive, + AudioSessionStateExpired, +} AudioSessionState; + +#endif

1 0

Maarten Lankhorst : include: Add some more defines to winerror.h.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 2b6a453474d3ab25d8335d4422d89c4e27c26426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6a453474d3ab25d8335d442… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 21:09:12 2009 +0100 include: Add some more defines to winerror.h. --- include/winerror.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 5d02c06..0bab882 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -666,6 +666,9 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_EVENTLOG_CANT_START 1501 #define ERROR_LOG_FILE_FULL 1502 #define ERROR_EVENTLOG_FILE_CHANGED 1503 +#define ERROR_INVALID_TASK_NAME 1550 +#define ERROR_INVALID_TASK_INDEX 1551 +#define ERROR_THREAD_ALREADY_IN_TASK 1552 #define ERROR_INSTALL_SERVICE_FAILURE 1601 #define ERROR_INSTALL_USEREXIT 1602 #define ERROR_INSTALL_FAILURE 1603

1 0

Maarten Lankhorst : include: Add avrt header.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 937fd3989494553b9c50a564ea6f57eb36e8fe0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=937fd3989494553b9c50a564e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 19:57:32 2009 +0100 include: Add avrt header. --- include/Makefile.in | 1 + include/avrt.h | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index f8c2b3d..2a49856 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -108,6 +108,7 @@ SRCDIR_INCLUDES = \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ + avrt.h \ axcore.idl \ axextend.idl \ basetsd.h \ diff --git a/include/avrt.h b/include/avrt.h new file mode 100644 index 0000000..691d36a --- /dev/null +++ b/include/avrt.h @@ -0,0 +1,74 @@ +/* + * avrt definitions + * + * Copyright 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef _AVRT_ +#define _AVRT_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum _AVRT_PRIORITY +{ + AVRT_PRIORITY_LOW = -1, + AVRT_PRIORITY_NORMAL, + AVRT_PRIORITY_HIGH, + AVRT_PRIORITY_CRITICAL +} AVRT_PRIORITY, *PAVRT_PRIORITY; + +/* Windows compiler is more lax */ +#define THREAD_ORDER_GROUP_INFINITE_TIMEOUT ((void*)((LONG_PTR)-1)) + +HANDLE WINAPI AvSetMmThreadCharacteristicsA(LPCSTR TaskName, LPDWORD TaskIndex); +HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex); +#define AvSetMmThreadCharacteristics WINELIB_NAME_AW(AvSetMmThreadCharacteristics) + +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(LPCSTR FirstTask, LPCSTR SecondTask, LPDWORD TaskIndex); +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(LPCSTR FirstTask, LPCSTR SecondTask, LPDWORD TaskIndex); +#define AvSetMmMaxThreadCharacteristics WINELIB_NAME_AW(AvSetMmMaxThreadCharacteristics) + +BOOL WINAPI AvRevertMmThreadCharacteristics(HANDLE AvrtHandle); +BOOL WINAPI AvSetMmThreadPriority(HANDLE AvrtHandle, AVRT_PRIORITY Priority); +BOOL WINAPI AvRtCreateThreadOrderingGroup( + PHANDLE Context, PLARGE_INTEGER Period, + GUID *ThreadOrderingGuid, PLARGE_INTEGER Timeout); + +BOOL WINAPI AvRtCreateThreadOrderingGroupExA( + PHANDLE Context, PLARGE_INTEGER Period, + GUID *ThreadOrderingGuid, PLARGE_INTEGER Timeout, + LPCSTR TaskName); +BOOL WINAPI AvRtCreateThreadOrderingGroupExW( + PHANDLE Context, PLARGE_INTEGER Period, + GUID *ThreadOrderingGuid, PLARGE_INTEGER Timeout + LPCSTR TaskName); +#define AvRtCreateThreadOrderingGroupEx WINELIB_NAME_AW(AvRtCreateThreadOrderingGroupEx) + +BOOL WINAPI AvRtJoinThreadOrderingGroup(PHANDLE Context, GUID *ThreadOrderingGuid, BOOL Before); +BOOL WINAPI AvRtWaitOnThreadOrderingGroup(HANDLE Context); +BOOL WINAPI AvRtLeaveThreadOrderingGroup(HANDLE Context); +BOOL WINAPI AvRtDeleteThreadOrderingGroup(HANDLE Context); +BOOL WINAPI AvQuerySystemResponsiveness(HANDLE AvrtHandle, PULONG SystemResponsivenessValue); + +#ifdef __cplusplus +} +#endif + +#endif /*_AVRT_*/

1 0

Juan Lang : crypt32: Fix some test failures on older crypt32 versions.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 49c1a34721a1ccd453b1c5b856ef5612f764f7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c1a34721a1ccd453b1c5b85… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 11:16:47 2009 -0800 crypt32: Fix some test failures on older crypt32 versions. --- dlls/crypt32/tests/encode.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index a46022b..934aceb 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7523,7 +7523,13 @@ static void test_encodeCertPolicyMappings(DWORD dwEncoding) memset(&info, 0, sizeof(info)); ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), + "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("no policy mappings support\n"); + return; + } if (ret) { ok(size == sizeof(emptySequence), "unexpected size %d\n", size); @@ -7582,7 +7588,13 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), + "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("no policy mappings support\n"); + return; + } if (ret) { ok(info->cPolicyMapping == 0, @@ -7649,7 +7661,13 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding) */ ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), + "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("no policy constraints support\n"); + return; + } if (ret) { ok(size == sizeof(emptySequence), "unexpected size %d\n", size); @@ -7716,7 +7734,13 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), + "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("no policy mappings support\n"); + return; + } if (ret) { ok(!info->fRequireExplicitPolicy,

1 0

Juan Lang : crypt32: Fix test failures across Windows versions.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 0695b0dc73e004a78744541d72e817a6d94d88dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0695b0dc73e004a78744541d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 11:47:59 2009 -0800 crypt32: Fix test failures across Windows versions. --- dlls/crypt32/tests/encode.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 934aceb..9c2d739 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1391,11 +1391,35 @@ static void test_decodeNameValue(DWORD dwEncoding) embeddedNullNameValue.value.dwValueType, GetLastError()); if (ret) { - CERT_NAME_VALUE value = { CERT_RDN_ENCODED_BLOB, + CERT_NAME_VALUE rdnEncodedValue = { CERT_RDN_ENCODED_BLOB, { sizeof(ia5EmbeddedNull), ia5EmbeddedNull } }; - - todo_wine - compareNameValues(&value, (const CERT_NAME_VALUE *)buf); + CERT_NAME_VALUE embeddedNullValue = { CERT_RDN_IA5_STRING, + { sizeof(embedded_null) - 1, (BYTE *)embedded_null } }; + const CERT_NAME_VALUE *got = (const CERT_NAME_VALUE *)buf, + *expected = NULL; + + /* Some Windows versions decode name values with embedded NULLs, + * others leave them encoded, even with the same version of crypt32. + * Accept either. + */ + ok(got->dwValueType == CERT_RDN_ENCODED_BLOB || + got->dwValueType == CERT_RDN_IA5_STRING, + "Expected CERT_RDN_ENCODED_BLOB or CERT_RDN_IA5_STRING, got %d\n", + got->dwValueType); + if (got->dwValueType == CERT_RDN_ENCODED_BLOB) + expected = &rdnEncodedValue; + else if (got->dwValueType == CERT_RDN_IA5_STRING) + expected = &embeddedNullValue; + if (expected) + { + ok(got->Value.cbData == expected->Value.cbData, + "String type %d: unexpected data size, got %d, expected %d\n", + got->dwValueType, got->Value.cbData, expected->Value.cbData); + if (got->Value.cbData && got->Value.pbData) + ok(!memcmp(got->Value.pbData, expected->Value.pbData, + min(got->Value.cbData, expected->Value.cbData)), + "String type %d: unexpected value\n", expected->dwValueType); + } LocalFree(buf); } }

1 0

Juan Lang : rsaenh/tests: Fix a couple typos.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 314033b992242a3dc781d8b717e377e61126c436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=314033b992242a3dc781d8b71… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 11:53:59 2009 -0800 rsaenh/tests: Fix a couple typos. --- dlls/rsaenh/tests/rsaenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 2f28335..4a69483 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -176,7 +176,7 @@ static int init_aes_environment(void) result = CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT); if (!result && GetLastError() == NTE_PROV_TYPE_NOT_DEF) { - win_skip("RSA_ASE provider not supported\n"); + win_skip("RSA_AES provider not supported\n"); return 0; } ok(!result && GetLastError()==NTE_BAD_FLAGS, "%d, %08x\n", result, GetLastError()); @@ -2307,7 +2307,7 @@ static void test_null_provider(void) ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); if (!result) return; result = CryptImportKey(prov, signBlob, sizeof(signBlob), 0, 0, &key); - ok(result, "CryptGenKey failed: %08x\n", GetLastError()); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); CryptDestroyKey(key); /* doesn't allow access to the key exchange key.. */ result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key);

1 0

Juan Lang : crypt32: Trace cert version.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: bdbee82c428915d4e54526a5c384dbccc261bf35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbee82c428915d4e54526a5c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 18:00:05 2009 -0800 crypt32: Trace cert version. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a69b9e4..a6fc9ff 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1112,7 +1112,7 @@ static void dump_element(PCCERT_CONTEXT cert) LPWSTR name = NULL; DWORD len, i; - TRACE_(chain)("%p\n", cert); + TRACE_(chain)("%p: version %d\n", cert, cert->pCertInfo->dwVersion); len = CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, NULL, NULL, 0); name = CryptMemAlloc(len * sizeof(WCHAR));

1 0