wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Juan Lang : crypt32: Implement encoding cert policy mappings.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: bf5e4d9bb7d4fce8a37e381b703ff8d945254582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5e4d9bb7d4fce8a37e381b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 11:52:19 2009 -0800 crypt32: Implement encoding cert policy mappings. --- dlls/crypt32/encode.c | 86 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 2 - 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 5639289..976cb6f 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2969,6 +2969,85 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicies(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnEncodeCertPolicyMapping(DWORD dwCertEncodingType, + const CERT_POLICY_MAPPING *mapping, DWORD dwFlags, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + struct AsnEncodeSequenceItem items[] = { + { mapping->pszIssuerDomainPolicy, CRYPT_AsnEncodeOid, 0 }, + { mapping->pszSubjectDomainPolicy, CRYPT_AsnEncodeOid, 0 }, + }; + + if (!mapping->pszIssuerDomainPolicy || !mapping->pszSubjectDomainPolicy) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + return CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), dwFlags, NULL, pbEncoded, pcbEncoded); +} + +static BOOL WINAPI CRYPT_AsnEncodeCertPolicyMappings(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CERT_POLICY_MAPPINGS_INFO *info = pvStructInfo; + DWORD bytesNeeded = 0, lenBytes, size, i; + + ret = TRUE; + for (i = 0; ret && i < info->cPolicyMapping; i++) + { + ret = CRYPT_AsnEncodeCertPolicyMapping(dwCertEncodingType, + &info->rgPolicyMapping[i], dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, + NULL, &size); + if (ret) + bytesNeeded += size; + } + CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes); + bytesNeeded += 1 + lenBytes; + if (ret) + { + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, + &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < info->cPolicyMapping; i++) + { + size = bytesNeeded; + ret = CRYPT_AsnEncodeCertPolicyMapping( + dwCertEncodingType, &info->rgPolicyMapping[i], + dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, pbEncoded, &size); + if (ret) + { + pbEncoded += size; + bytesNeeded -= size; + } + } + } + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodeRsaPubKey(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -4331,6 +4410,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(X509_NAME_CONSTRAINTS): encodeFunc = CRYPT_AsnEncodeNameConstraints; break; + case LOWORD(X509_POLICY_MAPPINGS): + encodeFunc = CRYPT_AsnEncodeCertPolicyMappings; + break; case LOWORD(PKCS7_SIGNER_INFO): encodeFunc = CRYPT_AsnEncodePKCSSignerInfo; break; @@ -4347,6 +4429,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodeUtcTime; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER)) encodeFunc = CRYPT_AsnEncodeAuthorityKeyId; + else if (!strcmp(lpszStructType, szOID_LEGACY_POLICY_MAPPINGS)) + encodeFunc = CRYPT_AsnEncodeCertPolicyMappings; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER2)) encodeFunc = CRYPT_AsnEncodeAuthorityKeyId2; else if (!strcmp(lpszStructType, szOID_CRL_REASON_CODE)) @@ -4373,6 +4457,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodeCRLDistPoints; else if (!strcmp(lpszStructType, szOID_CERT_POLICIES)) encodeFunc = CRYPT_AsnEncodeCertPolicies; + else if (!strcmp(lpszStructType, szOID_POLICY_MAPPINGS)) + encodeFunc = CRYPT_AsnEncodeCertPolicyMappings; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE)) encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 8c8f0ef..2108431 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7447,7 +7447,6 @@ static void test_encodeCertPolicyMappings(DWORD dwEncoding) /* Each of the mapping OIDs is equivalent, so check with all of them */ for (i = 0; i < sizeof(mappingOids) / sizeof(mappingOids[0]); i++) { - todo_wine { memset(&info, 0, sizeof(info)); ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); @@ -7495,7 +7494,6 @@ static void test_encodeCertPolicyMappings(DWORD dwEncoding) "unexpected value\n"); LocalFree(buf); } - } } }

1 0

Juan Lang : crypt32: Add tests for encoding/decoding cert policy mappings.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: fba863ddf004a5c735611d46805aa7f8b7446adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba863ddf004a5c735611d468… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 11:33:52 2009 -0800 crypt32: Add tests for encoding/decoding cert policy mappings. --- dlls/crypt32/tests/encode.c | 138 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9cce74e..8c8f0ef 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7425,6 +7425,142 @@ static void test_decodeCertPolicies(DWORD dwEncoding) } } +static const BYTE policyMappingWithOneMapping[] = { +0x30,0x0a,0x30,0x08,0x06,0x02,0x2a,0x03,0x06,0x02,0x53,0x04 }; +static const BYTE policyMappingWithTwoMappings[] = { +0x30,0x14,0x30,0x08,0x06,0x02,0x2a,0x03,0x06,0x02,0x53,0x04,0x30,0x08,0x06, +0x02,0x2b,0x04,0x06,0x02,0x55,0x06 }; +static const LPCSTR mappingOids[] = { X509_POLICY_MAPPINGS, + szOID_POLICY_MAPPINGS, szOID_LEGACY_POLICY_MAPPINGS }; + +static void test_encodeCertPolicyMappings(DWORD dwEncoding) +{ + static char oid2[] = "2.3.4"; + static char oid3[] = "1.3.4"; + static char oid4[] = "2.5.6"; + BOOL ret; + CERT_POLICY_MAPPINGS_INFO info = { 0 }; + CERT_POLICY_MAPPING mapping[2]; + LPBYTE buf; + DWORD size, i; + + /* Each of the mapping OIDs is equivalent, so check with all of them */ + for (i = 0; i < sizeof(mappingOids) / sizeof(mappingOids[0]); i++) + { + todo_wine { + memset(&info, 0, sizeof(info)); + ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(emptySequence), "unexpected size %d\n", size); + ok(!memcmp(buf, emptySequence, sizeof(emptySequence)), + "unexpected value\n"); + LocalFree(buf); + } + mapping[0].pszIssuerDomainPolicy = NULL; + mapping[0].pszSubjectDomainPolicy = NULL; + info.cPolicyMapping = 1; + info.rgPolicyMapping = mapping; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + mapping[0].pszIssuerDomainPolicy = oid1; + mapping[0].pszSubjectDomainPolicy = oid2; + ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(policyMappingWithOneMapping), + "unexpected size %d\n", size); + ok(!memcmp(buf, policyMappingWithOneMapping, size), + "unexpected value\n"); + LocalFree(buf); + } + mapping[1].pszIssuerDomainPolicy = oid3; + mapping[1].pszSubjectDomainPolicy = oid4; + info.cPolicyMapping = 2; + ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(policyMappingWithTwoMappings), + "unexpected size %d\n", size); + ok(!memcmp(buf, policyMappingWithTwoMappings, size), + "unexpected value\n"); + LocalFree(buf); + } + } + } +} + +static void test_decodeCertPolicyMappings(DWORD dwEncoding) +{ + DWORD size, i; + CERT_POLICY_MAPPINGS_INFO *info; + BOOL ret; + + /* Each of the mapping OIDs is equivalent, so check with all of them */ + for (i = 0; i < sizeof(mappingOids) / sizeof(mappingOids[0]); i++) + { + todo_wine { + ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, + &info, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->cPolicyMapping == 0, + "expected 0 policy mappings, got %d\n", info->cPolicyMapping); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + policyMappingWithOneMapping, sizeof(policyMappingWithOneMapping), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->cPolicyMapping == 1, + "expected 1 policy mappings, got %d\n", info->cPolicyMapping); + ok(!strcmp(info->rgPolicyMapping[0].pszIssuerDomainPolicy, "1.2.3"), + "unexpected issuer policy %s\n", + info->rgPolicyMapping[0].pszIssuerDomainPolicy); + ok(!strcmp(info->rgPolicyMapping[0].pszSubjectDomainPolicy, + "2.3.4"), "unexpected subject policy %s\n", + info->rgPolicyMapping[0].pszSubjectDomainPolicy); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->cPolicyMapping == 2, + "expected 2 policy mappings, got %d\n", info->cPolicyMapping); + ok(!strcmp(info->rgPolicyMapping[0].pszIssuerDomainPolicy, "1.2.3"), + "unexpected issuer policy %s\n", + info->rgPolicyMapping[0].pszIssuerDomainPolicy); + ok(!strcmp(info->rgPolicyMapping[0].pszSubjectDomainPolicy, + "2.3.4"), "unexpected subject policy %s\n", + info->rgPolicyMapping[0].pszSubjectDomainPolicy); + ok(!strcmp(info->rgPolicyMapping[1].pszIssuerDomainPolicy, "1.3.4"), + "unexpected issuer policy %s\n", + info->rgPolicyMapping[1].pszIssuerDomainPolicy); + ok(!strcmp(info->rgPolicyMapping[1].pszSubjectDomainPolicy, + "2.5.6"), "unexpected subject policy %s\n", + info->rgPolicyMapping[1].pszSubjectDomainPolicy); + LocalFree(info); + } + } + } +} + /* Free *pInfo with HeapFree */ static void testExportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO *pInfo) { @@ -7695,6 +7831,8 @@ START_TEST(encode) test_decodePolicyQualifierUserNotice(encodings[i]); test_encodeCertPolicies(encodings[i]); test_decodeCertPolicies(encodings[i]); + test_encodeCertPolicyMappings(encodings[i]); + test_decodeCertPolicyMappings(encodings[i]); } testPortPublicKeyInfo(); }

1 0

Juan Lang : crypt32: Fix decoding cert issuer/subject unique ids.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: ed9a4ffa0ba943f6c9e6eeb2638b278b3331553a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9a4ffa0ba943f6c9e6eeb26… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 11:23:17 2009 -0800 crypt32: Fix decoding cert issuer/subject unique ids. --- dlls/crypt32/decode.c | 4 ++-- dlls/crypt32/tests/encode.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index fa1cc63..aacdcc9 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1002,10 +1002,10 @@ static BOOL CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType, CRYPT_AsnDecodePubKeyInfoInternal, sizeof(CERT_PUBLIC_KEY_INFO), FALSE, TRUE, offsetof(CERT_INFO, SubjectPublicKeyInfo.Algorithm.Parameters.pbData), 0 }, - { ASN_BITSTRING, offsetof(CERT_INFO, IssuerUniqueId), + { ASN_CONTEXT | 1, offsetof(CERT_INFO, IssuerUniqueId), CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), TRUE, TRUE, offsetof(CERT_INFO, IssuerUniqueId.pbData), 0 }, - { ASN_BITSTRING, offsetof(CERT_INFO, SubjectUniqueId), + { ASN_CONTEXT | 2, offsetof(CERT_INFO, SubjectUniqueId), CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), TRUE, TRUE, offsetof(CERT_INFO, SubjectUniqueId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR | 3, offsetof(CERT_INFO, cExtension), diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 1942a83..9cce74e 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3119,7 +3119,6 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) v1CertWithSubjectIssuerSerialAndIssuerUniqueId, sizeof(v1CertWithSubjectIssuerSerialAndIssuerUniqueId), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : crypt32: Fix encoding cert issuer/subject unique ids.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 4ccafdcb6f9dd3a5e8d85a1df5de20941a0a54c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccafdcb6f9dd3a5e8d85a1df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 11:21:51 2009 -0800 crypt32: Fix encoding cert issuer/subject unique ids. --- dlls/crypt32/encode.c | 38 +++++++++++++++++++------------------- dlls/crypt32/tests/encode.c | 4 ---- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 3cd2b1e..5639289 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -506,37 +506,37 @@ static BOOL WINAPI CRYPT_AsnEncodeCertInfo(DWORD dwCertEncodingType, { &info->SubjectPublicKeyInfo, CRYPT_AsnEncodePubKeyInfoNoNull, 0 }, { 0 } }; - struct AsnConstructedItem constructed[3] = { { 0 } }; - DWORD cItem = 7, cConstructed = 0; + struct AsnConstructedItem constructed = { 0 }; + struct AsnEncodeTagSwappedItem swapped[2] = { { 0 } }; + DWORD cItem = 7, cSwapped = 0; if (info->IssuerUniqueId.cbData) { - constructed[cConstructed].tag = 1; - constructed[cConstructed].pvStructInfo = &info->IssuerUniqueId; - constructed[cConstructed].encodeFunc = CRYPT_AsnEncodeBits; - items[cItem].pvStructInfo = &constructed[cConstructed]; - items[cItem].encodeFunc = CRYPT_AsnEncodeConstructed; - cConstructed++; + swapped[cSwapped].tag = ASN_CONTEXT | 1; + swapped[cSwapped].pvStructInfo = &info->IssuerUniqueId; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeBits; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; cItem++; } if (info->SubjectUniqueId.cbData) { - constructed[cConstructed].tag = 2; - constructed[cConstructed].pvStructInfo = &info->SubjectUniqueId; - constructed[cConstructed].encodeFunc = CRYPT_AsnEncodeBits; - items[cItem].pvStructInfo = &constructed[cConstructed]; - items[cItem].encodeFunc = CRYPT_AsnEncodeConstructed; - cConstructed++; + swapped[cSwapped].tag = ASN_CONTEXT | 2; + swapped[cSwapped].pvStructInfo = &info->SubjectUniqueId; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeBits; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; cItem++; } if (info->cExtension) { - constructed[cConstructed].tag = 3; - constructed[cConstructed].pvStructInfo = &info->cExtension; - constructed[cConstructed].encodeFunc = CRYPT_AsnEncodeExtensions; - items[cItem].pvStructInfo = &constructed[cConstructed]; + constructed.tag = 3; + constructed.pvStructInfo = &info->cExtension; + constructed.encodeFunc = CRYPT_AsnEncodeExtensions; + items[cItem].pvStructInfo = &constructed; items[cItem].encodeFunc = CRYPT_AsnEncodeConstructed; - cConstructed++; cItem++; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 7e08cb3..1942a83 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2979,11 +2979,9 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { - todo_wine { ok(size == sizeof(v1CertWithIssuerUniqueId), "Wrong size %d\n", size); ok(!memcmp(buf, v1CertWithIssuerUniqueId, size), "Got unexpected value\n"); - } LocalFree(buf); } /* Test v1 cert with an issuer name, a subject name, and a serial number */ @@ -3031,7 +3029,6 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) ok(size == sizeof(v1CertWithSubjectIssuerSerialAndIssuerUniqueId) || size == sizeof(v1CertWithSubjectIssuerSerialAndIssuerUniqueIdNoNull), "Wrong size %d\n", size); - todo_wine { if (size == sizeof(v1CertWithSubjectIssuerSerialAndIssuerUniqueId)) ok(!memcmp(buf, v1CertWithSubjectIssuerSerialAndIssuerUniqueId, size), "unexpected value\n"); @@ -3040,7 +3037,6 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) ok(!memcmp(buf, v1CertWithSubjectIssuerSerialAndIssuerUniqueIdNoNull, size), "unexpected value\n"); - } LocalFree(buf); } /* Remove the public key, and add a subject key identifier extension */

1 0

Juan Lang : crypt32: Add more tests of cert encoding/decoding.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: acfa433f15be9e4a0145266502d98d39350557e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfa433f15be9e4a014526650… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 11:19:55 2009 -0800 crypt32: Add more tests of cert encoding/decoding. --- dlls/crypt32/tests/encode.c | 140 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 135 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acfa433f15be9e4a01452…

1 0

Jacek Caban : mshtml: Split parse_complete to handle_load and mutation observer.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: bcfa7c57d65c6f640d232e037ee2801a3bde5e11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfa7c57d65c6f640d232e037… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 8 15:40:11 2009 +0100 mshtml: Split parse_complete to handle_load and mutation observer. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/mutation.c | 40 +++++++++++++++++++++++-- dlls/mshtml/nsevents.c | 47 ++++++++++++++++++++++++++++- dlls/mshtml/task.c | 67 ------------------------------------------ 4 files changed, 82 insertions(+), 73 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 94d835d..43601ae 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -683,7 +683,6 @@ HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*); void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*); IMoniker *get_channelbsc_mon(nsChannelBSC*); -void parse_complete(HTMLDocumentObj*); void set_ready_state(HTMLWindow*,READYSTATE); HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index b3cc62a..84c9241 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "winreg.h" #include "ole2.h" +#include "shlguid.h" #include "mshtml_private.h" #include "htmlevent.h" @@ -353,10 +354,43 @@ static nsresult init_frame_window(HTMLDocumentNode *doc, nsISupports *nsunk) return nsres; } -static void parse_complete_proc(task_t *_task) +/* Calls undocumented 69 cmd of CGID_Explorer */ +static void call_explorer_69(HTMLDocumentObj *doc) { - docobj_task_t *task = (docobj_task_t*)_task; - parse_complete(task->doc); + IOleCommandTarget *olecmd; + VARIANT var; + HRESULT hres; + + if(!doc->client) + return; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + return; + + VariantInit(&var); + hres = IOleCommandTarget_Exec(olecmd, &CGID_Explorer, 69, 0, NULL, &var); + IOleCommandTarget_Release(olecmd); + if(SUCCEEDED(hres) && V_VT(&var) != VT_NULL) + FIXME("handle result\n"); +} + +static void parse_complete_proc(task_t *task) +{ + HTMLDocumentObj *doc = ((docobj_task_t*)task)->doc; + + TRACE("(%p)\n", doc); + + if(doc->usermode == EDITMODE) + init_editor(&doc->basedoc); + + call_explorer_69(doc); + call_property_onchanged(&doc->basedoc.cp_propnotif, 1005); + call_explorer_69(doc); + + /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ + + set_ready_state(doc->basedoc.window, READYSTATE_INTERACTIVE); } static void handle_end_load(HTMLDocumentNode *This) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 096dcb3..7c4c09b 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -26,6 +26,8 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "mshtmcid.h" +#include "shlguid.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -173,6 +175,36 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, return NS_OK; } +static void handle_docobj_load(HTMLDocumentObj *doc) +{ + IOleCommandTarget *olecmd = NULL; + HRESULT hres; + + if(!doc->client) + return; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + VARIANT state, progress; + + V_VT(&progress) = VT_I4; + V_I4(&progress) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, OLECMDEXECOPT_DONTPROMPTUSER, + &progress, NULL); + + V_VT(&state) = VT_I4; + V_I4(&state) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, OLECMDEXECOPT_DONTPROMPTUSER, + &state, NULL); + + IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + + IOleCommandTarget_Release(olecmd); + } +} + static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) { HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; @@ -195,8 +227,19 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(doc_obj->usermode == EDITMODE) handle_edit_load(&doc_obj->basedoc); - if(doc->basedoc.window->readystate != READYSTATE_COMPLETE) - set_ready_state(doc->basedoc.window, READYSTATE_COMPLETE); + if(doc == doc_obj->basedoc.doc_node) + handle_docobj_load(doc_obj); + + set_ready_state(doc->basedoc.window, READYSTATE_COMPLETE); + + if(doc == doc_obj->basedoc.doc_node) { + if(doc_obj->frame) { + static const WCHAR wszDone[] = {'D','o','n','e',0}; + IOleInPlaceFrame_SetStatusText(doc_obj->frame, wszDone); + } + + update_title(doc_obj); + } if(!doc->nsdoc) { ERR("NULL nsdoc\n"); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 08f5534..e6b94a2 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -27,8 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" -#include "mshtmcid.h" -#include "shlguid.h" #include "wine/debug.h" @@ -201,75 +199,10 @@ HRESULT clear_task_timer(HTMLDocument *doc, BOOL interval, DWORD id) return S_OK; } -/* Calls undocumented 69 cmd of CGID_Explorer */ -static void call_explorer_69(HTMLDocumentObj *doc) -{ - IOleCommandTarget *olecmd; - VARIANT var; - HRESULT hres; - - if(!doc->client) - return; - - hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); - if(FAILED(hres)) - return; - - VariantInit(&var); - hres = IOleCommandTarget_Exec(olecmd, &CGID_Explorer, 69, 0, NULL, &var); - IOleCommandTarget_Release(olecmd); - if(SUCCEEDED(hres) && V_VT(&var) != VT_NULL) - FIXME("handle result\n"); -} - void parse_complete(HTMLDocumentObj *doc) { - IOleCommandTarget *olecmd = NULL; - TRACE("(%p)\n", doc); - if(doc->usermode == EDITMODE) - init_editor(&doc->basedoc); - - call_explorer_69(doc); - call_property_onchanged(&doc->basedoc.cp_propnotif, 1005); - call_explorer_69(doc); - - /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ - - set_ready_state(doc->basedoc.window, READYSTATE_INTERACTIVE); - - if(doc->client) - IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); - - if(olecmd) { - VARIANT state, progress; - - V_VT(&progress) = VT_I4; - V_I4(&progress) = 0; - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, OLECMDEXECOPT_DONTPROMPTUSER, - &progress, NULL); - - V_VT(&state) = VT_I4; - V_I4(&state) = 0; - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, OLECMDEXECOPT_DONTPROMPTUSER, - &state, NULL); - - IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); - IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); - - IOleCommandTarget_Release(olecmd); - } - - set_ready_state(doc->basedoc.window, READYSTATE_COMPLETE); - - if(doc->frame) { - static const WCHAR wszDone[] = {'D','o','n','e',0}; - IOleInPlaceFrame_SetStatusText(doc->frame, wszDone); - } - - update_title(doc); } static void call_timer_disp(IDispatch *disp)

1 0

Rob Shearman : advapi32: Implement CheckTokenMembership.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: cf680ed0f242c839a742dfeaf329ba005c04ccaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf680ed0f242c839a742dfeaf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 8 11:23:09 2009 +0100 advapi32: Implement CheckTokenMembership. --- dlls/advapi32/security.c | 52 ++++++++++++++++++++++++++++++++++++---- dlls/advapi32/tests/security.c | 44 +++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ba90ad0..db7d028 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -622,13 +622,55 @@ AdjustTokenPrivileges( HANDLE TokenHandle, BOOL DisableAllPrivileges, * Failure: FALSE. */ BOOL WINAPI -CheckTokenMembership( HANDLE TokenHandle, PSID SidToCheck, - PBOOL IsMember ) +CheckTokenMembership( HANDLE token, PSID sid_to_check, + PBOOL is_member ) { - FIXME("(%p %p %p) stub!\n", TokenHandle, SidToCheck, IsMember); + PTOKEN_GROUPS token_groups; + DWORD size, i; - *IsMember = TRUE; - return(TRUE); + TRACE("(%p %s %p)\n", token, debugstr_sid(sid_to_check), is_member); + + *is_member = FALSE; + + if (!token) + { + if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token)) + return FALSE; + } + + if (!GetTokenInformation(token, TokenGroups, NULL, 0, &size)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + } + + token_groups = HeapAlloc(GetProcessHeap(), 0, size); + if (!token_groups) + return FALSE; + + if (!GetTokenInformation(token, TokenGroups, token_groups, size, &size)) + { + HeapFree(GetProcessHeap(), 0, token_groups); + return FALSE; + } + + for (i = 0; i < token_groups->GroupCount; i++) + { + TRACE("Groups[%d]: {0x%x, %s}\n", i, + token_groups->Groups[i].Attributes, + debugstr_sid(token_groups->Groups[i].Sid)); + if ((token_groups->Groups[i].Attributes & SE_GROUP_ENABLED) && + EqualSid(sid_to_check, token_groups->Groups[i].Sid)) + { + *is_member = TRUE; + TRACE("sid enabled and found in token\n"); + break; + } + } + + HeapFree(GetProcessHeap(), 0, token_groups); + + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f610433..1ca5a01 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3200,6 +3200,49 @@ static void test_GetSidSubAuthority(void) LocalFree(psid); } +static void test_CheckTokenMembership(void) +{ + PTOKEN_GROUPS token_groups; + DWORD size; + HANDLE token; + BOOL is_member; + BOOL ret; + DWORD i; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); + + /* groups */ + ret = GetTokenInformation(token, TokenGroups, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation(TokenGroups) %s with error %d\n", + ret ? "succeeded" : "failed", GetLastError()); + token_groups = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetTokenInformation(token, TokenGroups, token_groups, size, &size); + ok(ret, "GetTokenInformation(TokenGroups) failed with error %d\n", GetLastError()); + + for (i = 0; i < token_groups->GroupCount; i++) + { + if (token_groups->Groups[i].Attributes & SE_GROUP_ENABLED) + break; + } + + if (i == token_groups->GroupCount) + { + HeapFree(GetProcessHeap(), 0, token_groups); + CloseHandle(token); + skip("user not a member of any group\n"); + return; + } + + ret = CheckTokenMembership(token, token_groups->Groups[i].Sid, &is_member); + ok(ret, "CheckTokenMembership failed with error %d\n", GetLastError()); + ok(is_member, "CheckTokenMembership should have detected sid as member"); + + HeapFree(GetProcessHeap(), 0, token_groups); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -3230,4 +3273,5 @@ START_TEST(security) test_acls(); test_GetSecurityInfo(); test_GetSidSubAuthority(); + test_CheckTokenMembership(); }

1 0

Rob Shearman : winhlp32: Restore the original window proc for the richedit control before freeing the winhelp window memory .
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: dd4804c413a54a9c26eb4320c7178604b6a55a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4804c413a54a9c26eb4320c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 8 14:07:50 2009 +0100 winhlp32: Restore the original window proc for the richedit control before freeing the winhelp window memory. --- programs/winhlp32/winhelp.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index ae7d58d..fb05aeb 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -541,6 +541,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) { WINHELP_WINDOW** w; BOOL bExit; + HWND hTextWnd; for (w = &Globals.win_list; *w; w = &(*w)->next) { @@ -562,6 +563,10 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) if (win == Globals.active_popup) Globals.active_popup = NULL; + hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT); + SetWindowLongPtr(hTextWnd, GWLP_WNDPROC, + (LONG_PTR)win->origRicheditWndProc); + WINHELP_DeleteButtons(win); if (win->page) WINHELP_DeletePageLinks(win->page);

1 0

Rob Shearman : msi: Improve stub for MsiGetFeatureCost{A, W} and hook the stub into the VolumeCostList dialog control.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: b960b967c997915cb4f3a415b8b2dfbd09c4cdc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b960b967c997915cb4f3a415b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 8 13:34:43 2009 +0100 msi: Improve stub for MsiGetFeatureCost{A, W} and hook the stub into the VolumeCostList dialog control. --- dlls/msi/dialog.c | 41 +++++++++++++++++++++++++++ dlls/msi/install.c | 73 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/msi/msipriv.h | 1 + dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 9 ++++++ 5 files changed, 120 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 59ef8c3..a22091f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2614,15 +2614,44 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control } } +static LONGLONG msi_vcl_get_cost( msi_dialog *dialog ) +{ + MSIFEATURE *feature; + INT each_cost; + LONGLONG total_cost = 0; + + LIST_FOR_EACH_ENTRY( feature, &dialog->package->features, MSIFEATURE, entry ) + { + if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, + MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &each_cost))) + { + /* each_cost is in 512-byte units */ + total_cost += each_cost * 512; + } + if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, + MSICOSTTREE_SELFONLY, INSTALLSTATE_ABSENT, &each_cost))) + { + /* each_cost is in 512-byte units */ + total_cost -= each_cost * 512; + } + } + return total_cost; +} + static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ) { ULARGE_INTEGER total, free; + LONGLONG difference, cost; WCHAR size_text[MAX_PATH]; + WCHAR cost_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; DWORD size; int i = 0; + cost = msi_vcl_get_cost(dialog); + StrFormatByteSizeW(cost, cost_text, MAX_PATH); + size = GetLogicalDriveStringsW( 0, NULL ); if ( !size ) return; @@ -2642,6 +2671,7 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control SendMessageW( control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&lvitem ); GetDiskFreeSpaceExW(ptr, &free, &total, NULL); + difference = free.QuadPart - cost; StrFormatByteSizeW(total.QuadPart, size_text, MAX_PATH); lvitem.iSubItem = 1; @@ -2655,6 +2685,17 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control lvitem.cchTextMax = lstrlenW(size_text) + 1; SendMessageW( control->hwnd, LVM_SETITEMW, 0, (LPARAM)&lvitem ); + lvitem.iSubItem = 3; + lvitem.pszText = cost_text; + lvitem.cchTextMax = lstrlenW(cost_text) + 1; + SendMessageW( control->hwnd, LVM_SETITEMW, 0, (LPARAM)&lvitem ); + + StrFormatByteSizeW(difference, size_text, MAX_PATH); + lvitem.iSubItem = 4; + lvitem.pszText = size_text; + lvitem.cchTextMax = lstrlenW(size_text) + 1; + SendMessageW( control->hwnd, LVM_SETITEMW, 0, (LPARAM)&lvitem ); + ptr += lstrlenW(ptr) + 1; i++; } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 606caba..1a535eb 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -934,8 +934,24 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost) { - FIXME("(%d %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature), - iCostTree, iState, piCost); + LPWSTR szwFeature = NULL; + UINT rc; + + szwFeature = strdupAtoW(szFeature); + + rc = MsiGetFeatureCostW(hInstall, szwFeature, iCostTree, iState, piCost); + + msi_free(szwFeature); + + return rc; +} + +UINT MSI_GetFeatureCost(MSIPACKAGE *package, MSIFEATURE *feature, + MSICOSTTREE iCostTree, INSTALLSTATE iState, + LPINT piCost) +{ + FIXME("(%s %i %i %p): not implemented yet\n", + debugstr_w(feature->Feature), iCostTree, iState, piCost); if (piCost) *piCost = 0; return ERROR_SUCCESS; } @@ -946,10 +962,57 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost) { - FIXME("(%d %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature), + MSIPACKAGE *package; + MSIFEATURE *feature; + UINT ret; + + TRACE("(%d %s %i %i %p)\n", hInstall, debugstr_w(szFeature), iCostTree, iState, piCost); - if (piCost) *piCost = 0; - return ERROR_SUCCESS; + + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); + if (!package) + { + HRESULT hr; + BSTR feature; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + feature = SysAllocString(szFeature); + if (!feature) + { + IWineMsiRemotePackage_Release(remote_package); + return ERROR_OUTOFMEMORY; + } + + hr = IWineMsiRemotePackage_GetFeatureCost(remote_package, feature, + iCostTree, iState, piCost); + + SysFreeString(feature); + IWineMsiRemotePackage_Release(remote_package); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } + + feature = get_loaded_feature(package, szFeature); + + if (feature) + ret = MSI_GetFeatureCost(package, feature, iCostTree, iState, piCost); + else + ret = ERROR_UNKNOWN_FEATURE; + + msiobj_release( &package->hdr ); + return ret; } /*********************************************************************** diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 38103d8..5b23f55 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -759,6 +759,7 @@ extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); extern UINT msi_clone_properties(MSIPACKAGE *); +extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT); /* for deformating */ extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, LPDWORD ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 2189fc4..753cbb0 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -71,6 +71,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetInstallLevel( [in] int level ); HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR *value ); HRESULT EvaluateCondition( [in] BSTR condition ); + HRESULT GetFeatureCost( [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7f13633..87f1092 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1898,6 +1898,14 @@ static HRESULT WINAPI mrp_EvaluateCondition( IWineMsiRemotePackage *iface, BSTR return HRESULT_FROM_WIN32(r); } +static HRESULT WINAPI mrp_GetFeatureCost( IWineMsiRemotePackage *iface, BSTR feature, + INT cost_tree, INSTALLSTATE state, INT *cost ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiGetFeatureCostW(This->package, feature, cost_tree, state, cost); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1922,6 +1930,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetInstallLevel, mrp_FormatRecord, mrp_EvaluateCondition, + mrp_GetFeatureCost, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

Maarten Lankhorst : winealsa.drv: Fix underrun recovery.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 3a9ea794e1a96e72f36af1a96184a5299512fe50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9ea794e1a96e72f36af1a96… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 8 11:12:16 2009 +0100 winealsa.drv: Fix underrun recovery. --- dlls/winealsa.drv/waveout.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 25a1618..3476f59 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -110,6 +110,7 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, snd_pcm_status_t* ps) if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED) { WARN("Unexpected state (%d) while updating Total Played, resetting\n", state); + snd_pcm_recover(wwo->pcm, -EPIPE, 0); delay=0; }

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009