November 2009 - Wine-commits

Juan Lang : crypt32: Only fail directory name comparison if a directory name constraint is present and doesn 't match.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 1db8a6abdad49a23510ed6a6a4dab5eb0fe32ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db8a6abdad49a23510ed6a6a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 14:01:11 2009 -0800 crypt32: Only fail directory name comparison if a directory name constraint is present and doesn't match. --- dlls/crypt32/chain.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index df94523..2b2ac88 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1011,7 +1011,7 @@ static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, */ if (nameConstraints->cPermittedSubtree && !CRYPT_IsEmptyName(subjectName)) { - BOOL match = FALSE; + BOOL match = FALSE, hasDirectoryConstraint = FALSE; for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) { @@ -1019,10 +1019,13 @@ static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, &nameConstraints->rgPermittedSubtree[i].Base; if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + { + hasDirectoryConstraint = TRUE; match = directory_name_matches(&constraint->u.DirectoryName, subjectName); + } } - if (!match) + if (hasDirectoryConstraint && !match) *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; } }

1 0

Juan Lang : crypt32: Trace reasons for name constraint failure.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: d6958d76600503d69dfde8837b7ba687cf75ea23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6958d76600503d69dfde8837… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 14:06:44 2009 -0800 crypt32: Trace reasons for name constraint failure. --- dlls/crypt32/chain.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 2b2ac88..bb7a6e1 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -849,14 +849,22 @@ static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt, if (alt_name_matches_excluded_name( &subjectAltName->rgAltEntry[i], nameConstraints, trustErrorStatus)) + { + TRACE_(chain)("subject alternate name form %d excluded\n", + subjectAltName->rgAltEntry[i].dwAltNameChoice); *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } nameFormPresent = FALSE; if (!alt_name_matches_permitted_name( &subjectAltName->rgAltEntry[i], nameConstraints, trustErrorStatus, &nameFormPresent) && nameFormPresent) + { + TRACE_(chain)("subject alternate name form %d not permitted\n", + subjectAltName->rgAltEntry[i].dwAltNameChoice); *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } } LocalFree(subjectAltName); } @@ -934,14 +942,22 @@ static void compare_subject_with_email_constraints( if (rfc822_attr_matches_excluded_name( &name->rgRDN[i].rgRDNAttr[j], nameConstraints, trustErrorStatus)) + { + TRACE_(chain)( + "email address in subject name is excluded\n"); *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } nameFormPresent = FALSE; if (!rfc822_attr_matches_permitted_name( &name->rgRDN[i].rgRDNAttr[j], nameConstraints, trustErrorStatus, &nameFormPresent) && nameFormPresent) + { + TRACE_(chain)( + "email address in subject name is not permitted\n"); *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } } LocalFree(name); } @@ -1000,8 +1016,11 @@ static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME && directory_name_matches(&constraint->u.DirectoryName, subjectName)) + { + TRACE_(chain)("subject name is excluded\n"); *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + } } /* RFC 5280, section 4.2.1.10: * "Restrictions apply only when the specified name form is present. @@ -1026,7 +1045,10 @@ static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, } } if (hasDirectoryConstraint && !match) + { + TRACE_(chain)("subject name is not permitted\n"); *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } } }

1 0

Juan Lang : crypt32: Remove an unnecessary test for the extended key usage extension in CA certificates .
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 96073d51298e835df6880df6e91a576c675afa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96073d51298e835df6880df6e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 14:40:08 2009 -0800 crypt32: Remove an unnecessary test for the extended key usage extension in CA certificates. --- dlls/crypt32/chain.c | 57 -------------------------------------------------- 1 files changed, 0 insertions(+), 57 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index bb7a6e1..89c8e90 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1604,58 +1604,6 @@ static BOOL CRYPT_KeyUsageValid(PCertificateChainEngine engine, return ret; } -static BOOL CRYPT_ExtendedKeyUsageValidForCA(PCCERT_CONTEXT cert) -{ - PCERT_EXTENSION ext; - BOOL ret; - - /* RFC 5280, section 4.2.1.12: "In general, this extension will only - * appear in end entity certificates." And, "If a certificate contains - * both a key usage extension and an extended key usage extension, then - * both extensions MUST be processed independently and the certificate MUST - * only be used for a purpose consistent with both extensions." This seems - * to imply that it should be checked if present, and ignored if not. - * Unfortunately some CAs, e.g. the Thawte SGC CA, don't include the code - * signing extended key usage, whereas they do include the keyCertSign - * key usage. Thus, when checking for a CA, we only require the - * code signing extended key usage if the extended key usage is critical. - */ - ext = CertFindExtension(szOID_ENHANCED_KEY_USAGE, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); - if (ext && ext->fCritical) - { - CERT_ENHKEY_USAGE *usage; - DWORD size; - - ret = CryptDecodeObjectEx(cert->dwCertEncodingType, - X509_ENHANCED_KEY_USAGE, ext->Value.pbData, ext->Value.cbData, - CRYPT_DECODE_ALLOC_FLAG, NULL, &usage, &size); - if (ret) - { - DWORD i; - - /* Explicitly require the code signing extended key usage for a CA - * with an extended key usage extension. That is, don't assume - * a cert is allowed to be a CA if it specifies the - * anyExtendedKeyUsage usage oid. See again RFC 5280, section - * 4.2.1.12: "Applications that require the presence of a - * particular purpose MAY reject certificates that include the - * anyExtendedKeyUsage OID but not the particular OID expected for - * the application." - */ - ret = FALSE; - for (i = 0; !ret && i < usage->cUsageIdentifier; i++) - if (!strcmp(usage->rgpszUsageIdentifier[i], - szOID_PKIX_KP_CODE_SIGNING)) - ret = TRUE; - LocalFree(usage); - } - } - else - ret = TRUE; - return ret; -} - static BOOL CRYPT_CriticalExtensionsSupported(PCCERT_CONTEXT cert) { BOOL ret = TRUE; @@ -1804,11 +1752,6 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, isRoot, constraints.fCA, i)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_VALID_FOR_USAGE; - if (i != 0) - if (!CRYPT_ExtendedKeyUsageValidForCA( - chain->rgpElement[i]->pCertContext)) - chain->rgpElement[i]->TrustStatus.dwErrorStatus |= - CERT_TRUST_IS_NOT_VALID_FOR_USAGE; if (CRYPT_IsSimpleChainCyclic(chain)) { /* If the chain is cyclic, then the path length constraints

1 0

Jacek Caban : shdocvw: Check QueryInterface return codes before using its result.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 60b096f60961e551d161167d910299eca7481f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b096f60961e551d161167d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 21:32:22 2009 +0100 shdocvw: Check QueryInterface return codes before using its result. --- dlls/shdocvw/oleobject.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 3657a7a..dde850f 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -282,7 +282,9 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE pClientSite) { WebBrowser *This = OLEOBJ_THIS(iface); + IDocHostUIHandler *hostui; IOleContainer *container; + IDispatch *disp; HRESULT hres; TRACE("(%p)->(%p)\n", This, pClientSite); @@ -322,11 +324,15 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE IOleClientSite_AddRef(pClientSite); - IOleClientSite_QueryInterface(This->client, &IID_IDispatch, - (void**)&This->doc_host.client_disp); + hres = IOleClientSite_QueryInterface(This->client, &IID_IDispatch, + (void**)&disp); + if(SUCCEEDED(hres)) + This->doc_host.client_disp = disp; - IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, - (void**)&This->doc_host.hostui); + hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, + (void**)&hostui); + if(SUCCEEDED(hres)) + This->doc_host.hostui = hostui; hres = IOleClientSite_GetContainer(This->client, &container); if(SUCCEEDED(hres)) {

1 0

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

18 Nov '09

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

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

18 Nov '09

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

Alexandre Julliard : gdi32: Remove remaining references to gdi32 internals from gdi16.c.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 17349a06b1f5741c4ac439c4febd3656d5dc2a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17349a06b1f5741c4ac439c4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 22:30:08 2009 +0100 gdi32: Remove remaining references to gdi32 internals from gdi16.c. --- dlls/gdi32/gdi16.c | 30 +++++++++--------------------- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/palette.c | 2 +- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 4290d8f..e62b711 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -25,7 +25,6 @@ #include "wingdi.h" #include "wownt32.h" #include "wine/wingdi16.h" -#include "gdi_private.h" #include "wine/list.h" #include "wine/debug.h" @@ -43,6 +42,8 @@ struct saved_visrgn static struct list saved_regions = LIST_INIT( saved_regions ); +static HPALETTE16 hPrimaryPalette; + /* * ############################################################################ */ @@ -2421,7 +2422,9 @@ HPALETTE16 WINAPI CreatePalette16( const LOGPALETTE* palette ) */ HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg ) { - return HPALETTE_16( GDISelectPalette( HDC_32(hdc), HPALETTE_32(hpalette), wBkg )); + HPALETTE16 ret = HPALETTE_16( SelectPalette( HDC_32(hdc), HPALETTE_32(hpalette), wBkg )); + if (ret && !wBkg) hPrimaryPalette = hpalette; + return ret; } @@ -2430,7 +2433,7 @@ HPALETTE16 WINAPI GDISelectPalette16( HDC16 hdc, HPALETTE16 hpalette, WORD wBkg */ UINT16 WINAPI GDIRealizePalette16( HDC16 hdc ) { - return GDIRealizePalette( HDC_32(hdc) ); + return RealizePalette( HDC_32(hdc) ); } @@ -3539,16 +3542,8 @@ void WINAPI Copy16( LPVOID src, LPVOID dst, WORD size ) */ UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc ) { - UINT16 ret = 0; - DC *dc; - - TRACE("%04x\n", hdc ); - - if (!(dc = get_dc_ptr( HDC_32(hdc) ))) return 0; - - if (dc->funcs->pRealizeDefaultPalette) ret = dc->funcs->pRealizeDefaultPalette( dc->physDev ); - release_dc_ptr( dc ); - return ret; + FIXME( "%04x semi-stub\n", hdc ); + return GDIRealizePalette16( hdc ); } /*********************************************************************** @@ -3556,14 +3551,7 @@ UINT16 WINAPI RealizeDefaultPalette16( HDC16 hdc ) */ BOOL16 WINAPI IsDCCurrentPalette16(HDC16 hDC) { - DC *dc = get_dc_ptr( HDC_32(hDC) ); - if (dc) - { - BOOL bRet = dc->hPalette == hPrimaryPalette; - release_dc_ptr( dc ); - return bRet; - } - return FALSE; + return HPALETTE_16( GetCurrentObject( HDC_32(hDC), OBJ_PAL )) == hPrimaryPalette; } /********************************************************************* diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bf0f37b..64717af 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -484,7 +484,6 @@ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPE extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg); extern UINT WINAPI GDIRealizePalette( HDC hdc ); extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; -extern HPALETTE hPrimaryPalette DECLSPEC_HIDDEN; /* region.c */ extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index b4bbc95..e941b10 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -67,7 +67,7 @@ UINT (WINAPI *pfnRealizePalette)(HDC hdc) = GDIRealizePalette; static UINT SystemPaletteUse = SYSPAL_STATIC; /* currently not considered */ -HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */ +static HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */ static HPALETTE hLastRealizedPalette = 0; /* UnrealizeObject() needs it */ #define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */

1 0

Vincent Povirk : ole32: Rename property variables in storage stream implementation.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: d3dbc8b1e6bd8929fdf9b12a389c7342350e518e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3dbc8b1e6bd8929fdf9b12a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 15:10:47 2009 -0600 ole32: Rename property variables in storage stream implementation. --- dlls/ole32/stg_stream.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index e3ca9a1..e849ca1 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -180,14 +180,14 @@ static ULONG WINAPI StgStreamImpl_Release( } /*** - * This method will open the block chain pointed by the property + * This method will open the block chain pointed by the directory entry * that describes the stream. * If the stream's size is null, no chain is opened. */ static void StgStreamImpl_OpenBlockChain( StgStreamImpl* This) { - DirEntry curProperty; + DirEntry currentEntry; BOOL readSuccessful; /* @@ -206,22 +206,22 @@ static void StgStreamImpl_OpenBlockChain( } /* - * Read the information from the property. + * Read the information from the directory entry. */ readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, This->dirEntry, - &curProperty); + &currentEntry); if (readSuccessful) { - This->streamSize = curProperty.size; + This->streamSize = currentEntry.size; /* * This code supports only streams that are <32 bits in size. */ assert(This->streamSize.u.HighPart == 0); - if(curProperty.startingBlock == BLOCK_END_OF_CHAIN) + if(currentEntry.startingBlock == BLOCK_END_OF_CHAIN) { assert( (This->streamSize.u.HighPart == 0) && (This->streamSize.u.LowPart == 0) ); } @@ -545,7 +545,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( { StgStreamImpl* const This=(StgStreamImpl*)iface; - DirEntry curProperty; + DirEntry currentEntry; BOOL Success; TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart); @@ -603,16 +603,16 @@ static HRESULT WINAPI StgStreamImpl_SetSize( } /* - * Read this stream's property to see if it's small blocks or big blocks + * Read this stream's size to see if it's small blocks or big blocks */ Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, This->dirEntry, - &curProperty); + &currentEntry); /* * Determine if we have to switch from small to big blocks or vice versa */ if ( (This->smallBlockChain!=0) && - (curProperty.size.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK) ) + (currentEntry.size.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK) ) { if (libNewSize.u.LowPart >= LIMIT_TO_USE_SMALL_BLOCK) { @@ -625,7 +625,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( } } else if ( (This->bigBlockChain!=0) && - (curProperty.size.u.LowPart >= LIMIT_TO_USE_SMALL_BLOCK) ) + (currentEntry.size.u.LowPart >= LIMIT_TO_USE_SMALL_BLOCK) ) { if (libNewSize.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK) { @@ -648,20 +648,20 @@ static HRESULT WINAPI StgStreamImpl_SetSize( } /* - * Write the new information about this stream to the property + * Write the new information about this stream to the directory entry */ Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, This->dirEntry, - &curProperty); + &currentEntry); - curProperty.size.u.HighPart = libNewSize.u.HighPart; - curProperty.size.u.LowPart = libNewSize.u.LowPart; + currentEntry.size.u.HighPart = libNewSize.u.HighPart; + currentEntry.size.u.LowPart = libNewSize.u.LowPart; if (Success) { StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage, This->dirEntry, - &curProperty); + &currentEntry); } This->streamSize = libNewSize; @@ -834,7 +834,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( { StgStreamImpl* const This=(StgStreamImpl*)iface; - DirEntry curProperty; + DirEntry currentEntry; BOOL readSuccessful; TRACE("%p %p %d\n", This, pstatstg, grfStatFlag); @@ -850,18 +850,18 @@ static HRESULT WINAPI StgStreamImpl_Stat( } /* - * Read the information from the property. + * Read the information from the directory entry. */ readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, This->dirEntry, - &curProperty); + &currentEntry); if (readSuccessful) { StorageImpl *root = This->parentStorage->ancestorStorage; StorageUtl_CopyDirEntryToSTATSTG(pstatstg, - &curProperty, + &currentEntry, grfStatFlag); pstatstg->grfMode = This->grfMode; @@ -873,7 +873,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( return S_OK; } - WARN("failed to read properties\n"); + WARN("failed to read entry\n"); return E_FAIL; } @@ -957,7 +957,7 @@ static const IStreamVtbl StgStreamImpl_Vtbl = * * Params: * parentStorage - Pointer to the storage that contains the stream to open - * ownerProperty - Index of the property that points to this stream. + * dirEntry - Index of the directory entry that points to this stream. */ StgStreamImpl* StgStreamImpl_Construct( StorageBaseImpl* parentStorage, @@ -1008,7 +1008,7 @@ StgStreamImpl* StgStreamImpl_Construct( newStream->smallBlockChain = 0; /* - * Read the size from the property and determine if the blocks forming + * Read the size from the directory entry and determine if the blocks forming * this stream are large or small. */ StgStreamImpl_OpenBlockChain(newStream);

1 0

Vincent Povirk : ole32: Add a DirRef type for references to directory entries.
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: e77e9e45aa74f97a76d3aa5bf127015cc509745b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e77e9e45aa74f97a76d3aa5bf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 15:53:42 2009 -0600 ole32: Add a DirRef type for references to directory entries. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 119 ++++++++++++++++++++++++----------------------- dlls/ole32/storage32.h | 29 +++++++----- 3 files changed, 78 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e77e9e45aa74f97a76d3a…

1 0

Juan Lang : crypt32: Prohibit name constraints that contain neither an excluded nor a permitted subtree .
by Alexandre Julliard 18 Nov '09

18 Nov '09

Module: wine Branch: master Commit: 8585203103bf29192af2019d777eb508d1fd01ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8585203103bf29192af2019d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 17:55:23 2009 -0800 crypt32: Prohibit name constraints that contain neither an excluded nor a permitted subtree. --- dlls/crypt32/chain.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 52ac5d9..11010d5 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -850,6 +850,17 @@ static BOOL CRYPT_IsValidNameConstraint(const CERT_NAME_CONSTRAINTS_INFO *info) DWORD i; BOOL ret = TRUE; + /* Make sure at least one permitted or excluded subtree is present. From + * RFC 5280, section 4.2.1.10: + * "Conforming CAs MUST NOT issue certificates where name constraints is an + * empty sequence. That is, either the permittedSubtrees field or the + * excludedSubtrees MUST be present." + */ + if (!info->cPermittedSubtree && !info->cExcludedSubtree) + { + WARN_(chain)("constraints contain no permitted nor excluded subtree\n"); + ret = FALSE; + } /* Check that none of the constraints specifies a minimum or a maximum. * See RFC 5280, section 4.2.1.10: * "Within this profile, the minimum and maximum fields are not used with

1 0