November 2009 - Wine-Commits

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

Nov. 18, 2009

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: Accept a certificate if its name matches any permitted subtree of a name constraint .
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: c464875a6d7465fddb14239f7b35bb4ca099019e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c464875a6d7465fddb14239f7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 13:57:25 2009 -0800 crypt32: Accept a certificate if its name matches any permitted subtree of a name constraint. --- dlls/crypt32/chain.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a5b4141..72f5e24 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -987,18 +987,21 @@ static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; } - for (i = 0; i < nameConstraints->cPermittedSubtree; i++) + if (nameConstraints->cPermittedSubtree) { - CERT_ALT_NAME_ENTRY *constraint = - &nameConstraints->rgPermittedSubtree[i].Base; + BOOL match = FALSE; - if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) { - if (!directory_name_matches(&constraint->u.DirectoryName, - subjectName)) - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgPermittedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_DIRECTORY_NAME) + match = directory_name_matches(&constraint->u.DirectoryName, + subjectName); } + if (!match) + *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; } }

1 0

Juan Lang : crypt32: Check email address in subject name against rfc822 name constraints.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: d6f7d06cad28ebd28a98ea07e4d51abb208f711a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f7d06cad28ebd28a98ea07e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 13:34:00 2009 -0800 crypt32: Check email address in subject name against rfc822 name constraints. --- dlls/crypt32/chain.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 0d9a66d..a5b4141 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -865,11 +865,118 @@ static void compare_alt_name_with_constraints(const CERT_EXTENSION *altNameExt, CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; } +static BOOL rfc822_attr_matches_excluded_name(const CERT_RDN_ATTR *attr, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cExcludedSubtree; i++) + { + const CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgExcludedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_RFC822_NAME) + match = rfc822_name_matches(constraint->u.pwszRfc822Name, + (LPCWSTR)attr->Value.pbData, trustErrorStatus); + } + return match; +} + +static BOOL rfc822_attr_matches_permitted_name(const CERT_RDN_ATTR *attr, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus, + BOOL *present) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) + { + const CERT_ALT_NAME_ENTRY *constraint = + &nameConstraints->rgPermittedSubtree[i].Base; + + if (constraint->dwAltNameChoice == CERT_ALT_NAME_RFC822_NAME) + { + *present = TRUE; + match = rfc822_name_matches(constraint->u.pwszRfc822Name, + (LPCWSTR)attr->Value.pbData, trustErrorStatus); + } + } + return match; +} + +static void compare_subject_with_email_constraints( + const CERT_NAME_BLOB *subjectName, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + CERT_NAME_INFO *name; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_UNICODE_NAME, + subjectName->pbData, subjectName->cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, &name, &size)) + { + DWORD i, j; + + for (i = 0; i < name->cRDN; i++) + for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) + if (!strcmp(name->rgRDN[i].rgRDNAttr[j].pszObjId, + szOID_RSA_emailAddr)) + { + 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 (rfc822_attr_matches_excluded_name( + &name->rgRDN[i].rgRDNAttr[j], nameConstraints, + trustErrorStatus)) + *trustErrorStatus |= + CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; + nameFormPresent = FALSE; + if (!rfc822_attr_matches_permitted_name( + &name->rgRDN[i].rgRDNAttr[j], nameConstraints, + trustErrorStatus, &nameFormPresent) && nameFormPresent) + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; + } + LocalFree(name); + } + else + *trustErrorStatus |= + CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS; +} + static void compare_subject_with_constraints(const CERT_NAME_BLOB *subjectName, const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) { + BOOL hasEmailConstraint = FALSE; DWORD i; + /* In general, a subject distinguished name only matches a directory name + * constraint. However, an exception exists for email addresses. + * From RFC 5280, section 4.2.1.6: + * "Legacy implementations exist where an electronic mail address is + * embedded in the subject distinguished name as an emailAddress + * attribute [RFC2985]." + * If an email address constraint exists, check that constraint separately. + */ + for (i = 0; !hasEmailConstraint && i < nameConstraints->cExcludedSubtree; + i++) + if (nameConstraints->rgExcludedSubtree[i].Base.dwAltNameChoice == + CERT_ALT_NAME_RFC822_NAME) + hasEmailConstraint = TRUE; + for (i = 0; !hasEmailConstraint && i < nameConstraints->cPermittedSubtree; + i++) + if (nameConstraints->rgPermittedSubtree[i].Base.dwAltNameChoice == + CERT_ALT_NAME_RFC822_NAME) + hasEmailConstraint = TRUE; + if (hasEmailConstraint) + compare_subject_with_email_constraints(subjectName, nameConstraints, + trustErrorStatus); for (i = 0; i < nameConstraints->cExcludedSubtree; i++) { CERT_ALT_NAME_ENTRY *constraint =

1 0

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

Nov. 18, 2009

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: Partially implement checking name constraints with directory names.
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: f6d3348b7c52cb00f1d21bdbe4241296eb0ba2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d3348b7c52cb00f1d21bdbe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 11:25:13 2009 -0800 crypt32: Partially implement checking name constraints with directory names. --- dlls/crypt32/chain.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 2965a56..704d974 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -720,6 +720,28 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, return match; } +static BOOL directory_name_matches(const CERT_NAME_BLOB *constraint, + const CERT_NAME_BLOB *name) +{ + CERT_NAME_INFO *constraintName; + DWORD size; + BOOL match = FALSE; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_NAME, constraint->pbData, + constraint->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &constraintName, &size)) + { + DWORD i; + + match = TRUE; + for (i = 0; match && i < constraintName->cRDN; i++) + match = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, + CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, + (CERT_NAME_BLOB *)name, &constraintName->rgRDN[i]); + LocalFree(constraintName); + } + return match; +} + static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus) { @@ -746,6 +768,9 @@ static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, &name->u.IPAddress, trustErrorStatus); break; case CERT_ALT_NAME_DIRECTORY_NAME: + match = directory_name_matches(&constraint->u.DirectoryName, + &name->u.DirectoryName); + break; default: ERR("name choice %d unsupported in this context\n", constraint->dwAltNameChoice);

1 0

Juan Lang : crypt32: Use helper functions to match excluded and permitted subtrees of name constraints .
by Alexandre Julliard Nov. 18, 2009

Nov. 18, 2009

Module: wine Branch: master Commit: 7c44544a6d36e89cf62f3e7a848468632e349abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c44544a6d36e89cf62f3e7a8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 17 11:51:31 2009 -0800 crypt32: Use helper functions to match excluded and permitted subtrees of name constraints. --- dlls/crypt32/chain.c | 94 +++++++++++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 39 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index f92b906..2965a56 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -720,47 +720,66 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, return match; } -static BOOL CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, - const CERT_ALT_NAME_INFO *subjectName, DWORD *trustErrorStatus) +static BOOL alt_name_matches(const CERT_ALT_NAME_ENTRY *name, + const CERT_ALT_NAME_ENTRY *constraint, DWORD *trustErrorStatus) { - DWORD i; BOOL match = FALSE; - for (i = 0; i < subjectName->cAltEntry; i++) + if (name->dwAltNameChoice == constraint->dwAltNameChoice) { - if (subjectName->rgAltEntry[i].dwAltNameChoice == - constraint->dwAltNameChoice) + switch (constraint->dwAltNameChoice) { - switch (constraint->dwAltNameChoice) - { - case CERT_ALT_NAME_RFC822_NAME: - match = rfc822_name_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_DNS_NAME: - match = dns_name_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_URL: - match = url_matches(constraint->u.pwszURL, - subjectName->rgAltEntry[i].u.pwszURL, trustErrorStatus); - break; - case CERT_ALT_NAME_IP_ADDRESS: - match = ip_address_matches(&constraint->u.IPAddress, - &subjectName->rgAltEntry[i].u.IPAddress, trustErrorStatus); - break; - case CERT_ALT_NAME_DIRECTORY_NAME: - default: - ERR("name choice %d unsupported in this context\n", - constraint->dwAltNameChoice); - *trustErrorStatus |= - CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; - } + case CERT_ALT_NAME_RFC822_NAME: + match = rfc822_name_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_DNS_NAME: + match = dns_name_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_URL: + match = url_matches(constraint->u.pwszURL, + name->u.pwszURL, trustErrorStatus); + break; + case CERT_ALT_NAME_IP_ADDRESS: + match = ip_address_matches(&constraint->u.IPAddress, + &name->u.IPAddress, trustErrorStatus); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + default: + ERR("name choice %d unsupported in this context\n", + constraint->dwAltNameChoice); + *trustErrorStatus |= + CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; } } return match; } +static BOOL alt_name_matches_excluded_name(const CERT_ALT_NAME_ENTRY *name, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cExcludedSubtree; i++) + match = alt_name_matches(name, + &nameConstraints->rgExcludedSubtree[i].Base, trustErrorStatus); + return match; +} + +static BOOL alt_name_matches_permitted_name(const CERT_ALT_NAME_ENTRY *name, + const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, DWORD *trustErrorStatus) +{ + DWORD i; + BOOL match = FALSE; + + for (i = 0; !match && i < nameConstraints->cPermittedSubtree; i++) + match = alt_name_matches(name, + &nameConstraints->rgPermittedSubtree[i].Base, trustErrorStatus); + return match; +} + static inline PCERT_EXTENSION get_subject_alt_name_ext(const CERT_INFO *cert) { PCERT_EXTENSION ext; @@ -791,18 +810,15 @@ static void CRYPT_CheckNameConstraints( { DWORD i; - for (i = 0; i < nameConstraints->cExcludedSubtree; i++) + for (i = 0; i < subjectName->cAltEntry; i++) { - if (CRYPT_FindMatchingNameEntry( - &nameConstraints->rgExcludedSubtree[i].Base, subjectName, + if (alt_name_matches_excluded_name( + &subjectName->rgAltEntry[i], nameConstraints, trustErrorStatus)) *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - } - for (i = 0; i < nameConstraints->cPermittedSubtree; i++) - { - if (!CRYPT_FindMatchingNameEntry( - &nameConstraints->rgPermittedSubtree[i].Base, subjectName, + if (!alt_name_matches_permitted_name( + &subjectName->rgAltEntry[i], nameConstraints, trustErrorStatus)) *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT;

1 0

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

Nov. 18, 2009

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

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

Nov. 18, 2009

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

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

Nov. 18, 2009

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 Nov. 18, 2009

Nov. 18, 2009

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