November 2009 - Wine-commits

Chris Robinson : openal32: Use the correct prototype for function pointers.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 9d61f1d72ff370d77e3c1d280b6323c99f4fb26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d61f1d72ff370d77e3c1d280… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Nov 10 04:47:10 2009 -0800 openal32: Use the correct prototype for function pointers. --- dlls/openal32/openal.c | 66 ++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 88bfc9c..3d2bb00 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -44,39 +44,39 @@ typedef struct wine_ALCcontext { ALboolean been_current; - ALvoid (CDECL*alGenFilters)(ALsizei n, ALuint* filters); - ALvoid (CDECL*alDeleteFilters)(ALsizei n, const ALuint* filters); - ALboolean (CDECL*alIsFilter)(ALuint fid); - ALvoid (CDECL*alFilterf)(ALuint fid, ALenum param, ALfloat value); - ALvoid (CDECL*alFilterfv)(ALuint fid, ALenum param, const ALfloat* values); - ALvoid (CDECL*alFilteri)(ALuint fid, ALenum param, ALint value); - ALvoid (CDECL*alFilteriv)(ALuint fid, ALenum param, const ALint* values); - ALvoid (CDECL*alGetFilterf)(ALuint fid, ALenum param, ALfloat* value); - ALvoid (CDECL*alGetFilterfv)(ALuint fid, ALenum param, ALfloat* values); - ALvoid (CDECL*alGetFilteri)(ALuint fid, ALenum param, ALint* value); - ALvoid (CDECL*alGetFilteriv)(ALuint fid, ALenum param, ALint* values); - ALvoid (CDECL*alGenEffects)(ALsizei n, ALuint* effects); - ALvoid (CDECL*alDeleteEffects)(ALsizei n, const ALuint* effects); - ALboolean (CDECL*alIsEffect)(ALuint eid); - ALvoid (CDECL*alEffectf)(ALuint eid, ALenum param, ALfloat value); - ALvoid (CDECL*alEffectfv)(ALuint eid, ALenum param, const ALfloat* values); - ALvoid (CDECL*alEffecti)(ALuint eid, ALenum param, ALint value); - ALvoid (CDECL*alEffectiv)(ALuint eid, ALenum param, const ALint* values); - ALvoid (CDECL*alGetEffectf)(ALuint eid, ALenum param, ALfloat* value); - ALvoid (CDECL*alGetEffectfv)(ALuint eid, ALenum param, ALfloat* values); - ALvoid (CDECL*alGetEffecti)(ALuint eid, ALenum param, ALint* value); - ALvoid (CDECL*alGetEffectiv)(ALuint eid, ALenum param, ALint* values); - ALvoid (CDECL*alGenAuxiliaryEffectSlots)(ALsizei n, ALuint* slots); - ALvoid (CDECL*alDeleteAuxiliaryEffectSlots)(ALsizei n, const ALuint* slots); - ALboolean (CDECL*alIsAuxiliaryEffectSlot)(ALuint sid); - ALvoid (CDECL*alAuxiliaryEffectSlotf)(ALuint sid, ALenum param, ALfloat value); - ALvoid (CDECL*alAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, const ALfloat* values); - ALvoid (CDECL*alAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint value); - ALvoid (CDECL*alAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, const ALint* values); - ALvoid (CDECL*alGetAuxiliaryEffectSlotf)(ALuint sid, ALenum param, ALfloat* value); - ALvoid (CDECL*alGetAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, ALfloat* values); - ALvoid (CDECL*alGetAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint* value); - ALvoid (CDECL*alGetAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, ALint* values); + ALvoid (AL_APIENTRY*alGenFilters)(ALsizei n, ALuint* filters); + ALvoid (AL_APIENTRY*alDeleteFilters)(ALsizei n, const ALuint* filters); + ALboolean (AL_APIENTRY*alIsFilter)(ALuint fid); + ALvoid (AL_APIENTRY*alFilterf)(ALuint fid, ALenum param, ALfloat value); + ALvoid (AL_APIENTRY*alFilterfv)(ALuint fid, ALenum param, const ALfloat* values); + ALvoid (AL_APIENTRY*alFilteri)(ALuint fid, ALenum param, ALint value); + ALvoid (AL_APIENTRY*alFilteriv)(ALuint fid, ALenum param, const ALint* values); + ALvoid (AL_APIENTRY*alGetFilterf)(ALuint fid, ALenum param, ALfloat* value); + ALvoid (AL_APIENTRY*alGetFilterfv)(ALuint fid, ALenum param, ALfloat* values); + ALvoid (AL_APIENTRY*alGetFilteri)(ALuint fid, ALenum param, ALint* value); + ALvoid (AL_APIENTRY*alGetFilteriv)(ALuint fid, ALenum param, ALint* values); + ALvoid (AL_APIENTRY*alGenEffects)(ALsizei n, ALuint* effects); + ALvoid (AL_APIENTRY*alDeleteEffects)(ALsizei n, const ALuint* effects); + ALboolean (AL_APIENTRY*alIsEffect)(ALuint eid); + ALvoid (AL_APIENTRY*alEffectf)(ALuint eid, ALenum param, ALfloat value); + ALvoid (AL_APIENTRY*alEffectfv)(ALuint eid, ALenum param, const ALfloat* values); + ALvoid (AL_APIENTRY*alEffecti)(ALuint eid, ALenum param, ALint value); + ALvoid (AL_APIENTRY*alEffectiv)(ALuint eid, ALenum param, const ALint* values); + ALvoid (AL_APIENTRY*alGetEffectf)(ALuint eid, ALenum param, ALfloat* value); + ALvoid (AL_APIENTRY*alGetEffectfv)(ALuint eid, ALenum param, ALfloat* values); + ALvoid (AL_APIENTRY*alGetEffecti)(ALuint eid, ALenum param, ALint* value); + ALvoid (AL_APIENTRY*alGetEffectiv)(ALuint eid, ALenum param, ALint* values); + ALvoid (AL_APIENTRY*alGenAuxiliaryEffectSlots)(ALsizei n, ALuint* slots); + ALvoid (AL_APIENTRY*alDeleteAuxiliaryEffectSlots)(ALsizei n, const ALuint* slots); + ALboolean (AL_APIENTRY*alIsAuxiliaryEffectSlot)(ALuint sid); + ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotf)(ALuint sid, ALenum param, ALfloat value); + ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, const ALfloat* values); + ALvoid (AL_APIENTRY*alAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint value); + ALvoid (AL_APIENTRY*alAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, const ALint* values); + ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotf)(ALuint sid, ALenum param, ALfloat* value); + ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, ALfloat* values); + ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint* value); + ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, ALint* values); struct wine_ALCcontext *next; } wine_ALCcontext;

1 0

Paul Vriens : advapi32/tests: Run tests on Win9x/WinMe again.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 77c672f86fafebc7deeadb5c240548e7934dd424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c672f86fafebc7deeadb5c2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 10 13:04:55 2009 +0100 advapi32/tests: Run tests on Win9x/WinMe again. --- dlls/advapi32/tests/security.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1ca5a01..b8d6e19 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -79,6 +79,7 @@ typedef LPSTR (WINAPI *fnGetTrusteeNameA)( PTRUSTEEA pTrustee ); typedef BOOL (WINAPI *fnMakeSelfRelativeSD)( PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR, LPDWORD ); typedef BOOL (WINAPI *fnConvertSidToStringSidA)( PSID pSid, LPSTR *str ); typedef BOOL (WINAPI *fnConvertStringSidToSidA)( LPCSTR str, PSID pSid ); +static BOOL (WINAPI *pCheckTokenMembership)(HANDLE, PSID, PBOOL); static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD, PSECURITY_DESCRIPTOR*, PULONG ); static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorW)(LPCWSTR, DWORD, @@ -153,6 +154,7 @@ static void init(void) pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); pAddAccessDeniedAceEx = (void *)GetProcAddress(hmod, "AddAccessDeniedAceEx"); pAddAuditAccessAceEx = (void *)GetProcAddress(hmod, "AddAuditAccessAceEx"); + pCheckTokenMembership = (void *)GetProcAddress(hmod, "CheckTokenMembership"); pConvertStringSecurityDescriptorToSecurityDescriptorA = (void *)GetProcAddress(hmod, "ConvertStringSecurityDescriptorToSecurityDescriptorA" ); pConvertStringSecurityDescriptorToSecurityDescriptorW = @@ -3209,6 +3211,11 @@ static void test_CheckTokenMembership(void) BOOL ret; DWORD i; + if (!pCheckTokenMembership) + { + win_skip("CheckTokenMembership is not available\n"); + return; + } ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); @@ -3235,7 +3242,7 @@ static void test_CheckTokenMembership(void) return; } - ret = CheckTokenMembership(token, token_groups->Groups[i].Sid, &is_member); + ret = pCheckTokenMembership(token, 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");

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 159506893b9ce29912831ed018b1ff689aefbde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159506893b9ce29912831ed01… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 10 14:29:12 2009 +0100 kernel32/tests: Fix some test failures on Win9x/WinMe. --- dlls/kernel32/tests/file.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0a9152e..ec61659 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -650,8 +650,10 @@ static void test_CopyFileA(void) ret = CopyFileA(source, dest, FALSE); todo_wine { - ok(!ret && GetLastError() == ERROR_USER_MAPPED_FILE, - "CopyFileA with mapped dest file: expected ERROR_USER_MAPPED_FILE, got %d\n", GetLastError()); + ok(!ret, "CopyFileA: expected failure\n"); + ok(GetLastError() == ERROR_USER_MAPPED_FILE || + broken(GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x and WinMe */ + "CopyFileA with mapped dest file: expected ERROR_USER_MAPPED_FILE, got %d\n", GetLastError()); } CloseHandle(hmapfile); @@ -1325,7 +1327,9 @@ static void test_MoveFileA(void) ret = MoveFileA(source, dest); todo_wine { ok(!ret, "MoveFileA: expected failure\n"); - ok(GetLastError() == ERROR_SHARING_VIOLATION, "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ + "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); } CloseHandle(hmapfile); @@ -1343,7 +1347,9 @@ static void test_MoveFileA(void) ret = MoveFileA(source, dest); todo_wine { ok(!ret, "MoveFileA: expected failure\n"); - ok(GetLastError() == ERROR_SHARING_VIOLATION, "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ + "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); } CloseHandle(hmapfile);

1 0

Sunil Mohan Adapa : oleaut32: Fix SLTG parser so that dispatch interface can inherit another interface.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 05b24260310bd489f65e1599ec8a4d5c425cab28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b24260310bd489f65e1599e… Author: Sunil Mohan Adapa <sunilmohan(a)fsf.org.in> Date: Tue Nov 10 10:28:01 2009 +0530 oleaut32: Fix SLTG parser so that dispatch interface can inherit another interface. --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9e25e77..9c13bbe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3676,6 +3676,9 @@ static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI, if (pTITail->funcs_off != 0xffff) SLTG_DoFuncs(pBlk, pBlk + pTITail->funcs_off, pTI, pTITail->cFuncs, pNameTable, ref_lookup); + if (pTITail->impls_off != 0xffff) + SLTG_DoImpls(pBlk + pTITail->impls_off, pTI, FALSE, ref_lookup); + /* this is necessary to cope with MSFT typelibs that set cFuncs to the number * of dispinterface functions including the IDispatch ones, so * ITypeInfo::GetFuncDesc takes the real value for cFuncs from cbSizeVft */

1 0

Sunil Mohan Adapa : oleaut32: Fix SLTG parser so that dual interfaces are returned as IDispatch first.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 926b884cd68f90d77f9a1cef881657ab58a61821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=926b884cd68f90d77f9a1cef8… Author: Sunil Mohan Adapa <sunilmohan(a)fsf.org.in> Date: Tue Nov 10 10:28:54 2009 +0530 oleaut32: Fix SLTG parser so that dual interfaces are returned as IDispatch first. --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9c13bbe..772c2cf 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3938,6 +3938,9 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) (*ppTypeInfoImpl)->TypeAttr.wTypeFlags = (pTIHeader->typeflags1 >> 3) | (pTIHeader->typeflags2 << 5); + if((*ppTypeInfoImpl)->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL) + (*ppTypeInfoImpl)->TypeAttr.typekind = TKIND_DISPATCH; + if((pTIHeader->typeflags1 & 7) != 2) FIXME_(typelib)("typeflags1 = %02x\n", pTIHeader->typeflags1); if(pTIHeader->typeflags3 != 2)

1 0

Sunil Mohan Adapa : oleaut32: Do no check for dispatchable flag on dual interfaces.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 59ae1705ac469d9df75cd5bd6b54761b600217fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ae1705ac469d9df75cd5bd6… Author: Sunil Mohan Adapa <sunilmohan(a)fsf.org.in> Date: Tue Nov 10 10:29:46 2009 +0530 oleaut32: Do no check for dispatchable flag on dual interfaces. --- dlls/oleaut32/typelib.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 772c2cf..07447f2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5503,8 +5503,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( */ if( This->TypeAttr.typekind != TKIND_DISPATCH) return E_INVALIDARG; - if (This->TypeAttr.wTypeFlags & TYPEFLAG_FDISPATCHABLE && - This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL ) + if (This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL) { *pRefType = -1; }

1 0

Sunil Mohan Adapa : oleaut32: Update comment about a newly seen value in SLTG TypeLib.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: ffb2cfc29e5cb51ed6747a872a6c99ffa1e1a352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb2cfc29e5cb51ed6747a872… Author: Sunil Mohan Adapa <sunilmohan(a)fsf.org.in> Date: Tue Nov 10 10:30:24 2009 +0530 oleaut32: Update comment about a newly seen value in SLTG TypeLib. --- dlls/oleaut32/typelib.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 1fe8ecf..b1c85ed 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -413,7 +413,7 @@ typedef struct { /*0e*/ DWORD res0e; /* 0xffffffff */ /*12*/ WORD major_version; /* major version number */ /*14*/ WORD minor_version; /* minor version number */ -/*16*/ DWORD res16; /* 0xfffe0000 */ +/*16*/ DWORD res16; /* 0xfffe0000 or 0xfffc0000 (on dual interfaces?) */ /*1a*/ BYTE typeflags1;/* 0x02 | top 5 bits hold l5sbs of TYPEFLAGS */ /*1b*/ BYTE typeflags2;/* TYPEFLAGS >> 5 */ /*1c*/ BYTE typeflags3;/* 0x02*/

1 0

Juan Lang : crypt32: Check the issued certificate for name constraint violations, not the issuing certificate.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 865f3df35b102585dba79862a5c26c99529d13d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=865f3df35b102585dba79862a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 9 16:35:43 2009 -0800 crypt32: Check the issued certificate for name constraint violations, not the issuing certificate. --- 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 26627e2..c93e148 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -801,7 +801,7 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) chain->rgpElement[j]->pCertContext)) { CRYPT_CheckNameConstraints(nameConstraints, - chain->rgpElement[i]->pCertContext->pCertInfo, + chain->rgpElement[j]->pCertContext->pCertInfo, &errorStatus); chain->rgpElement[i]->TrustStatus.dwErrorStatus |= errorStatus;

1 0

Juan Lang : crypt32: Correct error when the subject alternate name can' t be decoded.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: ae6e884142e734a5538a3de7f90975c636d2b6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6e884142e734a5538a3de7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 9 16:47:54 2009 -0800 crypt32: Correct error when the subject alternate name can't be decoded. --- dlls/crypt32/chain.c | 4 ++++ dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c93e148..b1f230f 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -695,6 +695,10 @@ static void CRYPT_CheckNameConstraints( 0, CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); LocalFree(subjectName); } + else + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | + CERT_TRUST_INVALID_NAME_CONSTRAINTS; } else { diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 70dc3d2..1994d85 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2793,7 +2793,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_NAME_CONSTRAINTS | CERT_TRUST_INVALID_EXTENSION, 0 }, 1, simpleStatus27 }, - TODO_ERROR }, + 0 }, { { sizeof(chain28) / sizeof(chain28[0]), chain28 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_HAS_PREFERRED_ISSUER },

1 0

Juan Lang : crypt32: Use helper function to find the subject alternate name extension wherever it 's needed.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 2503e9ec73de03f3777fbab13cbf04bd79a87c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2503e9ec73de03f3777fbab13… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 9 16:43:32 2009 -0800 crypt32: Use helper function to find the subject alternate name extension wherever it's needed. --- dlls/crypt32/chain.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b1f230f..eab7f00 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -657,6 +657,18 @@ static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, *trustErrorStatus |= match ? errorIfFound : errorIfNotFound; } +static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) +{ + PCERT_EXTENSION ext; + + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, + cert->cExtension, cert->rgExtension); + if (!ext) + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, + cert->cExtension, cert->rgExtension); + return ext; +} + static void CRYPT_CheckNameConstraints( const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, DWORD *trustErrorStatus) @@ -664,13 +676,8 @@ static void CRYPT_CheckNameConstraints( /* If there aren't any existing constraints, don't bother checking */ if (nameConstraints->cPermittedSubtree || nameConstraints->cExcludedSubtree) { - CERT_EXTENSION *ext; + CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); - ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, cert->cExtension, - cert->rgExtension); - if (!ext) - ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, cert->cExtension, - cert->rgExtension); if (ext) { CERT_ALT_NAME_INFO *subjectName; @@ -2346,18 +2353,6 @@ static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, return TRUE; } -static inline PCERT_EXTENSION get_subject_alt_name_ext(PCCERT_CONTEXT cert) -{ - PCERT_EXTENSION ext; - - ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); - if (!ext) - ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); - return ext; -} - static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, LPCWSTR server_name) { @@ -2545,7 +2540,7 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, BOOL matches; cert = pChainContext->rgpChain[0]->rgpElement[0]->pCertContext; - altNameExt = get_subject_alt_name_ext(cert); + altNameExt = get_subject_alt_name_ext(cert->pCertInfo); /* If the alternate name extension exists, the name it contains * is bound to the certificate, so make sure the name matches * it. Otherwise, look for the server name in the subject

1 0