November 2009 - Wine-Commits

Juan Lang : crypt32: Remove an unnecessary if.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: f8044948bad5507fecdd0a3bdd5e409f010e3fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8044948bad5507fecdd0a3bd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 18:12:16 2009 -0800 crypt32: Remove an unnecessary if. --- dlls/crypt32/chain.c | 71 ++++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 39 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 11010d5..89ce807 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -778,50 +778,43 @@ static void CRYPT_CheckNameConstraints( const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, DWORD *trustErrorStatus) { - /* If there aren't any existing constraints, don't bother checking */ - if (nameConstraints->cPermittedSubtree || nameConstraints->cExcludedSubtree) + CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + + if (ext) { - CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + CERT_ALT_NAME_INFO *subjectName; + DWORD size; - if (ext) + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, + ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &subjectName, &size)) { - CERT_ALT_NAME_INFO *subjectName; - DWORD size; - - if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, - ext->Value.pbData, ext->Value.cbData, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - &subjectName, &size)) - { - DWORD i; + DWORD i; - for (i = 0; i < nameConstraints->cExcludedSubtree; i++) - CRYPT_FindMatchingNameEntry( - &nameConstraints->rgExcludedSubtree[i].Base, subjectName, - trustErrorStatus, - CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0); - for (i = 0; i < nameConstraints->cPermittedSubtree; i++) - CRYPT_FindMatchingNameEntry( - &nameConstraints->rgPermittedSubtree[i].Base, subjectName, - trustErrorStatus, 0, - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); - LocalFree(subjectName); - } - else - *trustErrorStatus |= - CERT_TRUST_INVALID_EXTENSION | - CERT_TRUST_INVALID_NAME_CONSTRAINTS; + for (i = 0; i < nameConstraints->cExcludedSubtree; i++) + CRYPT_FindMatchingNameEntry( + &nameConstraints->rgExcludedSubtree[i].Base, subjectName, + trustErrorStatus, CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0); + for (i = 0; i < nameConstraints->cPermittedSubtree; i++) + CRYPT_FindMatchingNameEntry( + &nameConstraints->rgPermittedSubtree[i].Base, subjectName, + trustErrorStatus, 0, + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); + LocalFree(subjectName); } else - { - if (nameConstraints->cPermittedSubtree) - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; - if (nameConstraints->cExcludedSubtree) - *trustErrorStatus |= - CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - } + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; + } + else + { + if (nameConstraints->cPermittedSubtree) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + if (nameConstraints->cExcludedSubtree) + *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; } }

1 0

Juan Lang : crypt32: Let caller set error codes when name constraints aren' t met.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 9a40de08dec33cf1cba0ed2b508300d8286060a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a40de08dec33cf1cba0ed2b5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 18:16:34 2009 -0800 crypt32: Let caller set error codes when name constraints aren't met. --- dlls/crypt32/chain.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 89ce807..f92b906 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -720,9 +720,8 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, return match; } -static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, - const CERT_ALT_NAME_INFO *subjectName, DWORD *trustErrorStatus, - DWORD errorIfFound, DWORD errorIfNotFound) +static BOOL CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, + const CERT_ALT_NAME_INFO *subjectName, DWORD *trustErrorStatus) { DWORD i; BOOL match = FALSE; @@ -759,7 +758,7 @@ static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, } } } - *trustErrorStatus |= match ? errorIfFound : errorIfNotFound; + return match; } static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) @@ -793,14 +792,21 @@ static void CRYPT_CheckNameConstraints( DWORD i; for (i = 0; i < nameConstraints->cExcludedSubtree; i++) - CRYPT_FindMatchingNameEntry( + { + if (CRYPT_FindMatchingNameEntry( &nameConstraints->rgExcludedSubtree[i].Base, subjectName, - trustErrorStatus, CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0); + trustErrorStatus)) + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } for (i = 0; i < nameConstraints->cPermittedSubtree; i++) - CRYPT_FindMatchingNameEntry( + { + if (!CRYPT_FindMatchingNameEntry( &nameConstraints->rgPermittedSubtree[i].Base, subjectName, - trustErrorStatus, 0, - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); + trustErrorStatus)) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } LocalFree(subjectName); } else

1 0

Alexandre Julliard : gdi32: Reimplement the 16-bit metafile functions on top of the 32-bit ones.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: d9700b6a7711f334f8c807b674b1ed51f6da8e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9700b6a7711f334f8c807b67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 19:58:02 2009 +0100 gdi32: Reimplement the 16-bit metafile functions on top of the 32-bit ones. --- dlls/gdi32/gdi_private.h | 3 - dlls/gdi32/metafile.c | 6 +- dlls/gdi32/metafile16.c | 133 ++++++++++++++------------------------------- 3 files changed, 45 insertions(+), 97 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ab4cd03..9526c9a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -449,9 +449,6 @@ extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; -extern METAHEADER *MF_ReadMetaFile(HANDLE hfile) DECLSPEC_HIDDEN; -extern METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh) DECLSPEC_HIDDEN; -extern BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) DECLSPEC_HIDDEN; /* path.c */ diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index a14928c..27ce7b5 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -175,7 +175,7 @@ BOOL WINAPI DeleteMetaFile( HMETAFILE hmf ) * Returns a pointer to a memory based METAHEADER read in from file HFILE * */ -METAHEADER *MF_ReadMetaFile(HANDLE hfile) +static METAHEADER *MF_ReadMetaFile(HANDLE hfile) { METAHEADER *mh; DWORD BytesRead, size; @@ -266,7 +266,7 @@ HMETAFILE WINAPI GetMetaFileW( LPCWSTR lpFilename ) * * Creates a new memory-based metafile from a disk-based one. */ -METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh) +static METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh) { METAHEADERDISK *mhd; HANDLE hfile; @@ -384,7 +384,7 @@ HMETAFILE WINAPI CopyMetaFileA( HMETAFILE hSrcMetaFile, LPCSTR lpFilename ) * * Helper for PlayMetaFile */ -BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) +static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) { METARECORD *mr; diff --git a/dlls/gdi32/metafile16.c b/dlls/gdi32/metafile16.c index 812fb9c..dfde8f7 100644 --- a/dlls/gdi32/metafile16.c +++ b/dlls/gdi32/metafile16.c @@ -30,12 +30,15 @@ #include "wine/wingdi16.h" #include "wownt32.h" #include "winreg.h" -#include "winternl.h" -#include "gdi_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(metafile); +#define METAFILE_MEMORY 1 +#define METAFILE_DISK 2 +#define MFHEADERSIZE (sizeof(METAHEADER)) +#define MFVERSION 0x300 + /****************************************************************** * MF_GetMetaHeader16 * @@ -58,26 +61,38 @@ static BOOL16 MF_ReleaseMetaHeader16( HMETAFILE16 hmf ) } /****************************************************************** - * MF_Create_HMETATFILE16 - * - * Creates a HMETAFILE16 object from a METAHEADER + * create_metafile16 * - * HMETAFILE16s are Global memory handles. + * Create a 16-bit metafile from a 32-bit one. The 32-bit one is deleted. */ -static HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh) +static HMETAFILE16 create_metafile16( HMETAFILE hmf ) { - HMETAFILE16 hmf; - DWORD size = mh->mtSize * sizeof(WORD); + UINT size; + HMETAFILE16 hmf16; - hmf = GlobalAlloc16(GMEM_MOVEABLE, size); - if(hmf) + if (!hmf) return 0; + size = GetMetaFileBitsEx( hmf, 0, NULL ); + hmf16 = GlobalAlloc16( GMEM_MOVEABLE, size ); + if (hmf16) { - METAHEADER *mh_dest = GlobalLock16(hmf); - memcpy(mh_dest, mh, size); - GlobalUnlock16(hmf); + void *buffer = GlobalLock16( hmf16 ); + GetMetaFileBitsEx( hmf, size, buffer ); + GlobalUnlock16( hmf16 ); } - HeapFree(GetProcessHeap(), 0, mh); - return hmf; + DeleteMetaFile( hmf ); + return hmf16; +} + +/****************************************************************** + * create_metafile32 + * + * Create a 32-bit metafile from a 16-bit one. + */ +static HMETAFILE create_metafile32( HMETAFILE16 hmf16 ) +{ + METAHEADER *mh = MF_GetMetaHeader16( hmf16 ); + if (!mh) return 0; + return SetMetaFileBitsEx( mh->mtSize * 2, (BYTE *)mh ); } /********************************************************************** @@ -93,23 +108,7 @@ HDC16 WINAPI CreateMetaFile16( LPCSTR filename ) */ HMETAFILE16 WINAPI CloseMetaFile16(HDC16 hdc) { - HMETAFILE16 hmf16 = 0; - HMETAFILE hmf = CloseMetaFile( HDC_32(hdc) ); - - if (hmf) - { - UINT size = GetMetaFileBitsEx( hmf, 0, NULL ); - - hmf16 = GlobalAlloc16( GMEM_MOVEABLE, size ); - if (hmf16) - { - void *buffer = GlobalLock16( hmf16 ); - GetMetaFileBitsEx( hmf, size, buffer ); - GlobalUnlock16( hmf16 ); - } - DeleteMetaFile( hmf ); - } - return hmf16; + return create_metafile16( CloseMetaFile( HDC_32(hdc) )); } /****************************************************************** @@ -125,22 +124,7 @@ BOOL16 WINAPI DeleteMetaFile16( HMETAFILE16 hmf ) */ HMETAFILE16 WINAPI GetMetaFile16( LPCSTR lpFilename ) { - METAHEADER *mh; - HANDLE hFile; - - TRACE("%s\n", lpFilename); - - if(!lpFilename) - return 0; - - if((hFile = CreateFileA(lpFilename, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) - return 0; - - mh = MF_ReadMetaFile(hFile); - CloseHandle(hFile); - if(!mh) return 0; - return MF_Create_HMETAFILE16( mh ); + return create_metafile16( GetMetaFileA( lpFilename )); } /****************************************************************** @@ -148,35 +132,10 @@ HMETAFILE16 WINAPI GetMetaFile16( LPCSTR lpFilename ) */ HMETAFILE16 WINAPI CopyMetaFile16( HMETAFILE16 hSrcMetaFile, LPCSTR lpFilename) { - METAHEADER *mh = MF_GetMetaHeader16( hSrcMetaFile ); - METAHEADER *mh2 = NULL; - HANDLE hFile; - - TRACE("(%08x,%s)\n", hSrcMetaFile, lpFilename); - - if(!mh) return 0; - - if(mh->mtType == METAFILE_DISK) - mh2 = MF_LoadDiskBasedMetaFile(mh); - else { - mh2 = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); - memcpy( mh2, mh, mh->mtSize * 2 ); - } - MF_ReleaseMetaHeader16( hSrcMetaFile ); - - if(lpFilename) { /* disk based metafile */ - DWORD w; - if((hFile = CreateFileA(lpFilename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { - HeapFree( GetProcessHeap(), 0, mh2 ); - return 0; - } - WriteFile(hFile, mh2, mh2->mtSize * 2, &w, NULL); - CloseHandle(hFile); - mh2 = MF_CreateMetaHeaderDisk(mh2, lpFilename, FALSE); - } - - return MF_Create_HMETAFILE16( mh2 ); + HMETAFILE hmf = create_metafile32( hSrcMetaFile ); + HMETAFILE hmf2 = CopyMetaFileA( hmf, lpFilename ); + DeleteMetaFile( hmf ); + return create_metafile16( hmf2 ); } /****************************************************************** @@ -212,12 +171,11 @@ BOOL16 WINAPI IsValidMetaFile16(HMETAFILE16 hmf) * PlayMetaFile (GDI.123) * */ -BOOL16 WINAPI PlayMetaFile16( HDC16 hdc, HMETAFILE16 hmf ) +BOOL16 WINAPI PlayMetaFile16( HDC16 hdc, HMETAFILE16 hmf16 ) { - BOOL16 ret; - METAHEADER *mh = MF_GetMetaHeader16( hmf ); - ret = MF_PlayMetaFile( HDC_32(hdc), mh ); - MF_ReleaseMetaHeader16( hmf ); + HMETAFILE hmf = create_metafile32( hmf16 ); + BOOL ret = PlayMetaFile( HDC_32(hdc), hmf ); + DeleteMetaFile( hmf ); return ret; } @@ -241,16 +199,11 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc16, HMETAFILE16 hmf, HBRUSH hBrush; HFONT hFont; WORD args[8]; - BOOL16 result = TRUE, loaded = FALSE; + BOOL16 result = TRUE; TRACE("(%p, %04x, %p, %08lx)\n", hdc, hmf, lpEnumFunc, lpData); if(!mh) return FALSE; - if(mh->mtType == METAFILE_DISK) { /* Create a memory-based copy */ - mh = MF_LoadDiskBasedMetaFile(mh); - if(!mh) return FALSE; - loaded = TRUE; - } /* save the current pen, brush and font */ hPen = GetCurrentObject(hdc, OBJ_PEN); @@ -308,8 +261,6 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc16, HMETAFILE16 hmf, /* free handle table */ GlobalFree16(hHT); - if(loaded) - HeapFree( GetProcessHeap(), 0, mh ); MF_ReleaseMetaHeader16(hmf); return result; }

1 0

Juan Lang : crypt32: Only apply a name constraint if the name form is present.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: a98dad4f93daf1bb8a10fbe7e776bd4c8b7b381d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98dad4f93daf1bb8a10fbe7e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 12:06:18 2009 -0800 crypt32: Only apply a name constraint if the name form is present. --- dlls/crypt32/chain.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 704d974..8c7ad5b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -743,12 +743,14 @@ static BOOL directory_name_matches(const CERT_NAME_BLOB *constraint, } static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, - const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus) + const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus, BOOL *present) { BOOL match = FALSE; if (name->dwAltNameChoice == constraint->dwAltNameChoice) { + if (present) + *present = TRUE; switch (constraint->dwAltNameChoice) { case CERT_ALT_NAME_RFC822_NAME: @@ -778,6 +780,8 @@ static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; } } + else if (present) + *present = FALSE; return match; } @@ -789,19 +793,21 @@ static BOOL alt_name_matches_excluded_name(const CERT_ALT_NAME_ENTRY *name, for (i = 0; !match && i < nameConstraints->cExcludedSubtree; i++) match = alt_name_matches(name, - &nameConstraints->rgExcludedSubtree[i].Base, trustErrorStatus); + &nameConstraints->rgExcludedSubtree[i].Base, trustErrorStatus, NULL); return match; } static BOOL alt_name_matches_permitted_name(const CERT_ALT_NAME_ENTRY *name, - const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus, + BOOL *present) { DWORD i; BOOL match = FALSE; for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) match = alt_name_matches(name, - &nameConstraints->rgPermittedSubtree[i].Base, trustErrorStatus); + &nameConstraints->rgPermittedSubtree[i].Base, trustErrorStatus, + present); return match; } @@ -837,14 +843,23 @@ static void CRYPT_CheckNameConstraints( for (i = 0; i < subjectName->cAltEntry; i++) { + BOOL nameFormPresent; + + /* A name constraint only applies if the name form is present. + * From RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is + * present. If no name of the type is in the certificate, + * the certificate is acceptable." + */ if (alt_name_matches_excluded_name( &subjectName->rgAltEntry[i], nameConstraints, trustErrorStatus)) *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + nameFormPresent = FALSE; if (!alt_name_matches_permitted_name( &subjectName->rgAltEntry[i], nameConstraints, - trustErrorStatus)) + trustErrorStatus, &nameFormPresent) && nameFormPresent) *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; }

1 0

Juan Lang : crypt32: Use helper function to compare a subject alternate name with name constraints .
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 6f35ae25b8043b0b6200b347847d05ee1b0d7c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f35ae25b8043b0b6200b3478… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 12:19:46 2009 -0800 crypt32: Use helper function to compare a subject alternate name with name constraints. --- dlls/crypt32/chain.c | 83 ++++++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 39 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 8c7ad5b..14e716a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -823,53 +823,58 @@ static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) return ext; } -static void CRYPT_CheckNameConstraints( - const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, - DWORD *trustErrorStatus) +static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) { - CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + CERT_ALT_NAME_INFO *subjectAltName; + DWORD size; - if (ext) + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, + altNameExt->Value.pbData, altNameExt->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &subjectAltName, &size)) { - CERT_ALT_NAME_INFO *subjectName; - DWORD size; + DWORD i; - if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, - ext->Value.pbData, ext->Value.cbData, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - &subjectName, &size)) + for (i = 0; i < subjectAltName->cAltEntry; i++) { - DWORD i; - - for (i = 0; i < subjectName->cAltEntry; i++) - { - BOOL nameFormPresent; - - /* A name constraint only applies if the name form is present. - * From RFC 5280, section 4.2.1.10: - * "Restrictions apply only when the specified name form is - * present. If no name of the type is in the certificate, - * the certificate is acceptable." - */ - if (alt_name_matches_excluded_name( - &subjectName->rgAltEntry[i], nameConstraints, - trustErrorStatus)) - *trustErrorStatus |= - CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - nameFormPresent = FALSE; - if (!alt_name_matches_permitted_name( - &subjectName->rgAltEntry[i], nameConstraints, - trustErrorStatus, &nameFormPresent) && nameFormPresent) - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; - } - LocalFree(subjectName); + BOOL nameFormPresent; + + /* A name constraint only applies if the name form is present. + * From RFC 5280, section 4.2.1.10: + * "Restrictions apply only when the specified name form is + * present. If no name of the type is in the certificate, + * the certificate is acceptable." + */ + if (alt_name_matches_excluded_name( + &subjectAltName->rgAltEntry[i], nameConstraints, + trustErrorStatus)) + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + nameFormPresent = FALSE; + if (!alt_name_matches_permitted_name( + &subjectAltName->rgAltEntry[i], nameConstraints, + trustErrorStatus, &nameFormPresent) && nameFormPresent) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; } - else - *trustErrorStatus |= - CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; + LocalFree(subjectAltName); } else + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; +} + +static void CRYPT_CheckNameConstraints( + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert, + DWORD *trustErrorStatus) +{ + CERT_EXTENSION *ext = get_subject_alt_name_ext(cert); + + if (ext) + compare_alt_name_with_constraints(ext, nameConstraints, + trustErrorStatus); + else { if (nameConstraints->cPermittedSubtree) *trustErrorStatus |=

1 0

Alexandre Julliard : gdi32: Disable SetSolidBrush16 since it requires access to gdi32 internals.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 06e09f67b4c2e72869eac918df853ef16b52032e URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e09f67b4c2e72869eac918d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 22:29:37 2009 +0100 gdi32: Disable SetSolidBrush16 since it requires access to gdi32 internals. --- dlls/gdi32/brush.c | 21 --------------------- dlls/gdi32/gdi16.c | 5 ++--- dlls/gdi32/gdi_private.h | 3 --- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 721da98..0202033 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -447,24 +447,3 @@ static INT BRUSH_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) GDI_ReleaseObj( handle ); return count; } - -/*********************************************************************** - * BRUSH_SetSolid - */ -BOOL BRUSH_SetSolid( HGDIOBJ handle, COLORREF new_color ) -{ - BRUSHOBJ * brushPtr; - BOOL res = FALSE; - - if (!(brushPtr = GDI_GetObjPtr( handle, OBJ_BRUSH ))) - return FALSE; - - if (brushPtr->logbrush.lbStyle == BS_SOLID) - { - brushPtr->logbrush.lbColor = new_color; - res = TRUE; - } - - GDI_ReleaseObj( handle ); - return res; -} diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index a8644da..4290d8f 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3521,9 +3521,8 @@ BOOL16 WINAPI SetLayout16( HDC16 hdc, DWORD layout ) */ BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor ) { - TRACE("(hBrush %04x, newColor %08x)\n", hBrush, newColor); - - return BRUSH_SetSolid( HBRUSH_32(hBrush), newColor ); + FIXME( "%04x %08x no longer supported\n", hBrush, newColor ); + return FALSE; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9526c9a..bf0f37b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -359,9 +359,6 @@ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, DC *dc ) DECLSPEC_HIDDEN; extern INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) DECLSPEC_HIDDEN; -/* brush.c */ -extern BOOL BRUSH_SetSolid( HGDIOBJ handle, COLORREF new_color ) DECLSPEC_HIDDEN; - /* clipping.c */ extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN;

1 0

Alexander Nicolaysen Sørnes : Use objectManager to show 'View Maintainers' page
by Alexander Nicolaysen Sørnes Nov. 17, 2009

Nov. 17, 2009

Module: appdb Branch: master Commit: 820d753ca21e27e620915eba563b502425e288c1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=820d753ca21e27e620915eba… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 22:47:17 2009 +0100 Use objectManager to show 'View Maintainers' page --- admin/adminMaintainers.php | 113 ----------------------------- include/maintainerView.php | 173 ++++++++++++++++++++++++++++++++++++++++++-- include/objectManager.php | 72 ++++++++++++++----- include/sidebar_admin.php | 2 +- 4 files changed, 223 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=820d753ca21e27e62091…

1 0

Alexander Nicolaysen Sørnes : testData: Allow admins to only show entries for versions they maintain
by Alexander Nicolaysen Sørnes Nov. 17, 2009

Nov. 17, 2009

Module: appdb Branch: master Commit: 038a0da4cf575be3d7da6addf27451c021705e76 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=038a0da4cf575be3d7da6add… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 19:45:17 2009 +0100 testData: Allow admins to only show entries for versions they maintain --- include/testData.php | 57 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 12 deletions(-) diff --git a/include/testData.php b/include/testData.php index 1a6762f..879e363 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1175,27 +1175,46 @@ class testData{ { $oFilter = new FilterInterface(); $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show test data for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + + /* Allow admins to only show entries for apps they maintain */ + if($_SESSION['current']->hasPriv('admin')) + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show test data for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; } function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oTest = new testData(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oTest->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } - if($aOptions['onlyWithoutMaintainers'] == 'true') + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appVersion'; $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; } - $oTest = new testData(); - - if($sState != 'accepted' && !$oTest->canEdit()) + if($bOnlyMyMaintainedEntries) { - if($sState == 'rejected') + if(!$oTest->canEdit() && $sState == 'rejected') { $sQuery = "SELECT COUNT(testingId) AS count FROM testResults$sExtraTables WHERE @@ -1255,18 +1274,32 @@ class testData{ function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oTest = new testData(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oTest->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } - if($aOptions['onlyWithoutMaintainers'] == 'true') + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } + + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appVersion'; $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; } - $oTest = new testData(); - $sLimit = ""; /* Should we add a limit clause to the query? */ @@ -1280,9 +1313,9 @@ class testData{ $iRows = testData::objectGetEntriesCount($sState); } - if($sState != 'accepted' && !$oTest->canEdit()) + if($bOnlyMyMaintainedEntries) { - if($sState == 'rejected') + if(!$oTest->canEdit() && $sState == 'rejected') { $sQuery = "SELECT testResults.* FROM testResults$sExtraTables WHERE testResults.submitterId = '?'

1 0

Alexander Nicolaysen Sørnes : testData: Add Installs? option of 'No, but has workaround'
by Alexander Nicolaysen Sørnes Nov. 17, 2009

Nov. 17, 2009

Module: appdb Branch: master Commit: 0df84bdc05fc5fad39304bda89a8450f88b083e0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0df84bdc05fc5fad39304bda… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 20:26:53 2009 +0100 testData: Add Installs? option of 'No, but has workaround' --- include/testData.php | 8 ++++---- tables/testResults.sql | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/testData.php b/include/testData.php index e565bee..5b6f1cb 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1012,16 +1012,16 @@ class testData{ if (($aValues['sRuns'] != "Yes") && ($aValues['sTestedRating'] != GARBAGE_RATING)) $errors .= "<li>Applications that do not run should be rated ‘Garbage’.</li>\n"; - if (($aValues['sInstalls'] == "No") && ($aValues['sTestedRating'] == PLATINUM_RATING)) + if (($aValues['sInstalls'] == "No" || $aValues['sInstalls'] == 'No, but has workaround') && ($aValues['sTestedRating'] == PLATINUM_RATING)) $errors .= "<li>An application can only get a Platinum rating if it installs and runs ‘out of the box’.</li>\n"; // Basic checking of logic. Runs? can obviously only be 'Not Installable' // if the application does not install if (($aValues['sInstalls'] != "No") && ($aValues['sRuns'] == "Not installable")) - $errors .= "<li>You can only set Runs? to ‘Not installable’ if the application's installer does not work</li>\n"; + $errors .= "<li>You can only set Runs? to ‘Not installable’ if Installs? is set ‘No’</li>\n"; if (($aValues['sInstalls'] == "No") && ($aValues['sRuns'] != "Not installable")) - $errors .= "<li>You can only set Runs? to ‘Not installable’' if the application's installer does not work</li>\n"; + $errors .= "<li>Runs? must be set to ‘Not installable’ if there is no way to install the app</li>\n"; return $errors; @@ -1053,7 +1053,7 @@ class testData{ { echo "<select name='$sVarname'>\n"; echo "<option value=\"\">Choose ...</option>\n"; - $aRating = array("Yes", "No", "N/A"); + $aRating = array('Yes', 'No', 'No, but has workaround', 'N/A'); $iMax = count($aRating); for($i=0; $i < $iMax; $i++) diff --git a/tables/testResults.sql b/tables/testResults.sql index dd0d899..7f88a54 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -14,7 +14,7 @@ create table testResults ( testedDate datetime not null, distributionId int not null, testedRelease tinytext, - installs enum('Yes','No','N/A') NOT NULL default 'Yes', + installs enum('Yes','No','No, but has workaround','N/A') NOT NULL default 'Yes', runs enum('Yes','No','Not Installable') NOT NULL default 'Yes', testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL, comments text,

1 0

Alexander Nicolaysen Sørnes : testData: Don't show non-admins the option of showing unmaintained entries, as it has no effect for them
by Alexander Nicolaysen Sørnes Nov. 17, 2009

Nov. 17, 2009

Module: appdb Branch: master Commit: 03ac68731c1305bdd786184bb6472c20669be1e8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=03ac68731c1305bdd786184b… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 20:00:56 2009 +0100 testData: Don't show non-admins the option of showing unmaintained entries, as it has no effect for them --- include/testData.php | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/testData.php b/include/testData.php index 879e363..e565bee 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1174,11 +1174,14 @@ class testData{ public function objectGetFilterInfo() { $oFilter = new FilterInterface(); + + /* The following filters are only useful for admins */ + if(!$_SESSION['current']->hasPriv('admin')) + return null; + $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show test data for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); - /* Allow admins to only show entries for apps they maintain */ - if($_SESSION['current']->hasPriv('admin')) - $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show test data for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show test data for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); return $oFilter; }

1 0