November 2009 - Wine-commits

Eric Pouech : winedbg: In proxy mode, correctly init the wine_segs fields.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: a116f78dedaf05a8b3f44bf5d56a5b76faaccacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a116f78dedaf05a8b3f44bf5d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:08:11 2009 +0100 winedbg: In proxy mode, correctly init the wine_segs fields. --- programs/winedbg/gdbproxy.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 8afabe4..4794b06 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1776,10 +1776,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) { char buf[64]; - if (gdbctx->wine_segs[0] == 0 && gdbctx->wine_segs[1] == 0 && - gdbctx->wine_segs[2] == 0) - return packet_error; - snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), "Text=%08lx;Data=%08lx;Bss=%08lx", gdbctx->wine_segs[0], gdbctx->wine_segs[1], gdbctx->wine_segs[2]); @@ -2284,6 +2281,8 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags) gdbctx->process = NULL; for (i = 0; i < NUM_XPOINT; i++) gdbctx->Xpoints[i].type = -1; + for (i = 0; i < sizeof(gdbctx->wine_segs) / sizeof(gdbctx->wine_segs[0]); i++) + gdbctx->wine_segs[i] = 0; /* wait for first trap */ while (WaitForDebugEvent(&de, INFINITE))

1 0

Eric Pouech : winhlp32: Added support for macros as hotspots' target.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 3fac812bd9019a98f27aa13f0e84b1ba524845a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fac812bd9019a98f27aa13f0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:04:59 2009 +0100 winhlp32: Added support for macros as hotspots' target. --- programs/winhlp32/hlpfile.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index f6c1137..2d685ae 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -797,29 +797,35 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, */ str += strlen(str) + 1; /* skip hotspot name */ + hslink = NULL; switch (start[7 + 15 * i + 0]) /* The next two chars always look like 0x04 0x00 ??? * What are they for ? */ { + case 0xC8: + hslink = (HLPFILE_HOTSPOTLINK*) + HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, 0, 1, -1); + break; + case 0xE6: case 0xE7: hslink = (HLPFILE_HOTSPOTLINK*) HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, file->lpszPath, -1, HLPFILE_Hash(str), 0, 1, -1); - if (hslink) - { - hslink->x = GET_USHORT(start, 7 + 15 * i + 3); - hslink->y = GET_USHORT(start, 7 + 15 * i + 5); - hslink->width = GET_USHORT(start, 7 + 15 * i + 7); - hslink->height = GET_USHORT(start, 7 + 15 * i + 9); - /* target = GET_UINT(start, 7 + 15 * i + 11); */ - } break; default: WINE_FIXME("unknown hotsport target 0x%x\n", start[7 + 15 * i + 0]); } + if (hslink) + { + hslink->x = GET_USHORT(start, 7 + 15 * i + 3); + hslink->y = GET_USHORT(start, 7 + 15 * i + 5); + hslink->width = GET_USHORT(start, 7 + 15 * i + 7); + hslink->height = GET_USHORT(start, 7 + 15 * i + 9); + /* target = GET_UINT(start, 7 + 15 * i + 11); */ + } str += strlen(str) + 1; } }

1 0

Eric Pouech : mmsystem.dll16: Correctly send messages up to winmm.dll.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 8575935f610bafd3b3529d4243ca36b9a7fc6deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8575935f610bafd3b3529d424… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 8 15:09:46 2009 +0100 mmsystem.dll16: Correctly send messages up to winmm.dll. Spotted by Christian Costa. --- dlls/mmsystem.dll16/message16.c | 40 +++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index af1c6c9..ce25b9c 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -979,10 +979,42 @@ DWORD MMSYSTDRV_Message(void* h, UINT msg, DWORD_PTR param1, DWORD_PTR param2) switch (thunk->kind) { case MMSYSTDRV_MIXER: ret = mixerMessage (h, msg, param1, param2); break; - case MMSYSTDRV_MIDIIN: ret = midiInMessage (h, msg, param1, param2); break; - case MMSYSTDRV_MIDIOUT: ret = midiOutMessage(h, msg, param1, param2); break; - case MMSYSTDRV_WAVEIN: ret = waveInMessage (h, msg, param1, param2); break; - case MMSYSTDRV_WAVEOUT: ret = waveOutMessage(h, msg, param1, param2); break; + case MMSYSTDRV_MIDIIN: + switch (msg) + { + case MIDM_ADDBUFFER: ret = midiInAddBuffer(h, (LPMIDIHDR)param1, param2); break; + case MIDM_PREPARE: ret = midiInPrepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MIDM_UNPREPARE: ret = midiInUnprepareHeader(h, (LPMIDIHDR)param1, param2); break; + default: ret = midiInMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_MIDIOUT: + switch (msg) + { + case MODM_PREPARE: ret = midiOutPrepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MODM_UNPREPARE: ret = midiOutUnprepareHeader(h, (LPMIDIHDR)param1, param2); break; + case MODM_LONGDATA: ret = midiOutLongMsg(h, (LPMIDIHDR)param1, param2); break; + default: ret = midiOutMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_WAVEIN: + switch (msg) + { + case WIDM_ADDBUFFER: ret = waveInAddBuffer(h, (LPWAVEHDR)param1, param2); break; + case WIDM_PREPARE: ret = waveInPrepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WIDM_UNPREPARE: ret = waveInUnprepareHeader(h, (LPWAVEHDR)param1, param2); break; + default: ret = waveInMessage(h, msg, param1, param2); break; + } + break; + case MMSYSTDRV_WAVEOUT: + switch (msg) + { + case WODM_PREPARE: ret = waveOutPrepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WODM_UNPREPARE: ret = waveOutUnprepareHeader(h, (LPWAVEHDR)param1, param2); break; + case WODM_WRITE: ret = waveOutWrite(h, (LPWAVEHDR)param1, param2); break; + default: ret = waveOutMessage(h, msg, param1, param2); break; + } + break; default: ret = MMSYSERR_INVALHANDLE; break; /* should never be reached */ } if (map == MMSYSTEM_MAP_OKMEM)

1 0

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

09 Nov '09

Module: wine Branch: master Commit: 7e7e73d0dab42a53d8041b40eaac1434b4c130ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7e73d0dab42a53d8041b40e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 12:26:59 2009 -0800 crypt32: Implement decoding cert policy mappings. --- dlls/crypt32/decode.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 2 - 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index aacdcc9..f1da624 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3632,6 +3632,59 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicies(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeCertPolicyMapping(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + struct AsnDecodeSequenceItem items[] = { + { ASN_OBJECTIDENTIFIER, offsetof(CERT_POLICY_MAPPING, + pszIssuerDomainPolicy), CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), + FALSE, TRUE, offsetof(CERT_POLICY_MAPPING, pszIssuerDomainPolicy), 0 }, + { ASN_OBJECTIDENTIFIER, offsetof(CERT_POLICY_MAPPING, + pszSubjectDomainPolicy), CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), + FALSE, TRUE, offsetof(CERT_POLICY_MAPPING, pszSubjectDomainPolicy), 0 }, + }; + CERT_POLICY_MAPPING *mapping = pvStructInfo; + BOOL ret; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, + pcbDecoded, mapping ? mapping->pszIssuerDomainPolicy : NULL); + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeCertPolicyMappings(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + + __TRY + { + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + offsetof(CERT_POLICY_MAPPINGS_INFO, cPolicyMapping), + offsetof(CERT_POLICY_MAPPINGS_INFO, rgPolicyMapping), + sizeof(CERT_POLICY_MAPPING), + CRYPT_AsnDecodeCertPolicyMapping, sizeof(CERT_POLICY_MAPPING), TRUE, + offsetof(CERT_POLICY_MAPPING, pszIssuerDomainPolicy) }; + + ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, + dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + #define RSA1_MAGIC 0x31415352 struct DECODED_RSA_PUB_KEY @@ -5494,6 +5547,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(X509_NAME_CONSTRAINTS): decodeFunc = CRYPT_AsnDecodeNameConstraints; break; + case LOWORD(X509_POLICY_MAPPINGS): + decodeFunc = CRYPT_AsnDecodeCertPolicyMappings; + break; case LOWORD(PKCS7_SIGNER_INFO): decodeFunc = CRYPT_AsnDecodePKCSSignerInfo; break; @@ -5510,6 +5566,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeSMIMECapabilities; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER)) decodeFunc = CRYPT_AsnDecodeAuthorityKeyId; + else if (!strcmp(lpszStructType, szOID_LEGACY_POLICY_MAPPINGS)) + decodeFunc = CRYPT_AsnDecodeCertPolicyMappings; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER2)) decodeFunc = CRYPT_AsnDecodeAuthorityKeyId2; else if (!strcmp(lpszStructType, szOID_CRL_REASON_CODE)) @@ -5536,6 +5594,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeCRLDistPoints; else if (!strcmp(lpszStructType, szOID_CERT_POLICIES)) decodeFunc = CRYPT_AsnDecodeCertPolicies; + else if (!strcmp(lpszStructType, szOID_POLICY_MAPPINGS)) + decodeFunc = CRYPT_AsnDecodeCertPolicyMappings; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE)) decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 2108431..dd898c6 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7506,7 +7506,6 @@ static void test_decodeCertPolicyMappings(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 { ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); @@ -7555,7 +7554,6 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) info->rgPolicyMapping[1].pszSubjectDomainPolicy); LocalFree(info); } - } } }

1 0

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

09 Nov '09

Module: wine Branch: master Commit: ae32f7bffcd3ec1a6084fe8532e0879b00546509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae32f7bffcd3ec1a6084fe853… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 12:28:43 2009 -0800 crypt32: Add tests for encoding/decoding cert policy constraints. --- dlls/crypt32/tests/encode.c | 149 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index dd898c6..3a1d05b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7557,6 +7557,153 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) } } +static const BYTE policyConstraintsWithRequireExplicit[] = { +0x30,0x03,0x80,0x01,0x00 }; +static const BYTE policyConstraintsWithInhibitMapping[] = { +0x30,0x03,0x81,0x01,0x01 }; +static const BYTE policyConstraintsWithBoth[] = { +0x30,0x06,0x80,0x01,0x01,0x81,0x01,0x01 }; + +static void test_encodeCertPolicyConstraints(DWORD dwEncoding) +{ + CERT_POLICY_CONSTRAINTS_INFO info = { 0 }; + LPBYTE buf; + DWORD size; + BOOL ret; + + /* Even though RFC 5280 explicitly states CAs must not issue empty + * policy constraints (section 4.2.1.11), the API doesn't prevent it. + */ + ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine { + 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); + } + /* If fRequireExplicitPolicy is set but dwRequireExplicitPolicySkipCerts + * is not, then a skip of 0 is encoded. + */ + info.fRequireExplicitPolicy = TRUE; + ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(policyConstraintsWithRequireExplicit), + "unexpected size %d\n", size); + ok(!memcmp(buf, policyConstraintsWithRequireExplicit, + sizeof(policyConstraintsWithRequireExplicit)), "unexpected value\n"); + LocalFree(buf); + } + /* With inhibit policy mapping */ + info.fRequireExplicitPolicy = FALSE; + info.dwRequireExplicitPolicySkipCerts = 0; + info.fInhibitPolicyMapping = TRUE; + info.dwInhibitPolicyMappingSkipCerts = 1; + ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(policyConstraintsWithInhibitMapping), + "unexpected size %d\n", size); + ok(!memcmp(buf, policyConstraintsWithInhibitMapping, + sizeof(policyConstraintsWithInhibitMapping)), "unexpected value\n"); + LocalFree(buf); + } + /* And with both */ + info.fRequireExplicitPolicy = TRUE; + info.dwRequireExplicitPolicySkipCerts = 1; + ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(policyConstraintsWithBoth), "unexpected size %d\n", + size); + ok(!memcmp(buf, policyConstraintsWithBoth, + sizeof(policyConstraintsWithBoth)), "unexpected value\n"); + LocalFree(buf); + } + } +} + +static void test_decodeCertPolicyConstraints(DWORD dwEncoding) +{ + CERT_POLICY_CONSTRAINTS_INFO *info; + DWORD size; + BOOL ret; + + /* Again, even though CAs must not issue such constraints, they can be + * decoded. + */ + ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, + emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, + &info, &size); + todo_wine { + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(!info->fRequireExplicitPolicy, + "expected require explicit = FALSE\n"); + ok(!info->fInhibitPolicyMapping, + "expected implicit mapping = FALSE\n"); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, + policyConstraintsWithRequireExplicit, + sizeof(policyConstraintsWithRequireExplicit), CRYPT_DECODE_ALLOC_FLAG, + NULL, &info, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->fRequireExplicitPolicy, + "expected require explicit = TRUE\n"); + ok(info->dwRequireExplicitPolicySkipCerts == 0, "expected 0, got %d\n", + info->dwRequireExplicitPolicySkipCerts); + ok(!info->fInhibitPolicyMapping, + "expected implicit mapping = FALSE\n"); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, + policyConstraintsWithInhibitMapping, + sizeof(policyConstraintsWithInhibitMapping), CRYPT_DECODE_ALLOC_FLAG, + NULL, &info, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(!info->fRequireExplicitPolicy, + "expected require explicit = FALSE\n"); + ok(info->fInhibitPolicyMapping, + "expected implicit mapping = TRUE\n"); + ok(info->dwInhibitPolicyMappingSkipCerts == 1, "expected 1, got %d\n", + info->dwInhibitPolicyMappingSkipCerts); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, + policyConstraintsWithBoth, sizeof(policyConstraintsWithBoth), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->fRequireExplicitPolicy, + "expected require explicit = TRUE\n"); + ok(info->dwRequireExplicitPolicySkipCerts == 1, "expected 1, got %d\n", + info->dwRequireExplicitPolicySkipCerts); + ok(info->fInhibitPolicyMapping, + "expected implicit mapping = TRUE\n"); + ok(info->dwInhibitPolicyMappingSkipCerts == 1, "expected 1, got %d\n", + info->dwInhibitPolicyMappingSkipCerts); + LocalFree(info); + } + } +} + /* Free *pInfo with HeapFree */ static void testExportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO *pInfo) { @@ -7829,6 +7976,8 @@ START_TEST(encode) test_decodeCertPolicies(encodings[i]); test_encodeCertPolicyMappings(encodings[i]); test_decodeCertPolicyMappings(encodings[i]); + test_encodeCertPolicyConstraints(encodings[i]); + test_decodeCertPolicyConstraints(encodings[i]); } testPortPublicKeyInfo(); }

1 0

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

09 Nov '09

Module: wine Branch: master Commit: 32ad42497295b5c142e70908e41c735d854380bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ad42497295b5c142e70908e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 12:35:49 2009 -0800 crypt32: Implement encoding cert policy constraints. --- dlls/crypt32/encode.c | 52 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 2 - 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 976cb6f..4d137ce 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3048,6 +3048,53 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicyMappings(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeCertPolicyConstraints( + DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CERT_POLICY_CONSTRAINTS_INFO *info = pvStructInfo; + struct AsnEncodeSequenceItem items[2]; + struct AsnEncodeTagSwappedItem swapped[2]; + DWORD cItem = 0, cSwapped = 0; + + if (info->fRequireExplicitPolicy) + { + swapped[cSwapped].tag = ASN_CONTEXT | 0; + swapped[cSwapped].pvStructInfo = + &info->dwRequireExplicitPolicySkipCerts; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeInt; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; + cItem++; + } + if (info->fInhibitPolicyMapping) + { + swapped[cSwapped].tag = ASN_CONTEXT | 1; + swapped[cSwapped].pvStructInfo = + &info->dwInhibitPolicyMappingSkipCerts; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeInt; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; + cItem++; + } + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, + dwFlags, NULL, pbEncoded, pcbEncoded); + } + __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) @@ -4413,6 +4460,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(X509_POLICY_MAPPINGS): encodeFunc = CRYPT_AsnEncodeCertPolicyMappings; break; + case LOWORD(X509_POLICY_CONSTRAINTS): + encodeFunc = CRYPT_AsnEncodeCertPolicyConstraints; + break; case LOWORD(PKCS7_SIGNER_INFO): encodeFunc = CRYPT_AsnEncodePKCSSignerInfo; break; @@ -4459,6 +4509,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodeCertPolicies; else if (!strcmp(lpszStructType, szOID_POLICY_MAPPINGS)) encodeFunc = CRYPT_AsnEncodeCertPolicyMappings; + else if (!strcmp(lpszStructType, szOID_POLICY_CONSTRAINTS)) + encodeFunc = CRYPT_AsnEncodeCertPolicyConstraints; 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 3a1d05b..0ca870a 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7576,7 +7576,6 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding) */ ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine { ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7630,7 +7629,6 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding) sizeof(policyConstraintsWithBoth)), "unexpected value\n"); LocalFree(buf); } - } } static void test_decodeCertPolicyConstraints(DWORD dwEncoding)

1 0

Juan Lang : crypt32: Implement decoding cert policy constraints.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: fbcce9f308ed2b8fb2c28f040170791df203de26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcce9f308ed2b8fb2c28f040… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 12:47:15 2009 -0800 crypt32: Implement decoding cert policy constraints. --- dlls/crypt32/decode.c | 138 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 2 - 2 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index f1da624..d6288b6 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3685,6 +3685,139 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicyMappings(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeRequireExplicit(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret; + DWORD skip, size = sizeof(skip); + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != (ASN_CONTEXT | 0)) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + if ((ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, + &skip, &size, pcbDecoded))) + { + DWORD bytesNeeded = MEMBERSIZE(CERT_POLICY_CONSTRAINTS_INFO, + fRequireExplicitPolicy, fInhibitPolicyMapping); + + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CERT_POLICY_CONSTRAINTS_INFO *info = + (CERT_POLICY_CONSTRAINTS_INFO *)((BYTE *)pvStructInfo - + offsetof(CERT_POLICY_CONSTRAINTS_INFO, fRequireExplicitPolicy)); + + *pcbStructInfo = bytesNeeded; + /* The BOOL is implicit: if the integer is present, then it's + * TRUE. + */ + info->fRequireExplicitPolicy = TRUE; + info->dwRequireExplicitPolicySkipCerts = skip; + } + } + return ret; +} + +static BOOL CRYPT_AsnDecodeInhibitMapping(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret; + DWORD skip, size = sizeof(skip); + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != (ASN_CONTEXT | 1)) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + if ((ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, + &skip, &size, pcbDecoded))) + { + DWORD bytesNeeded = FINALMEMBERSIZE(CERT_POLICY_CONSTRAINTS_INFO, + fInhibitPolicyMapping); + + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CERT_POLICY_CONSTRAINTS_INFO *info = + (CERT_POLICY_CONSTRAINTS_INFO *)((BYTE *)pvStructInfo - + offsetof(CERT_POLICY_CONSTRAINTS_INFO, fInhibitPolicyMapping)); + + *pcbStructInfo = bytesNeeded; + /* The BOOL is implicit: if the integer is present, then it's + * TRUE. + */ + info->fInhibitPolicyMapping = TRUE; + info->dwInhibitPolicyMappingSkipCerts = skip; + } + } + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeCertPolicyConstraints( + DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_CONTEXT | 0, + offsetof(CERT_POLICY_CONSTRAINTS_INFO, fRequireExplicitPolicy), + CRYPT_AsnDecodeRequireExplicit, + MEMBERSIZE(CERT_POLICY_CONSTRAINTS_INFO, fRequireExplicitPolicy, + fInhibitPolicyMapping), TRUE, FALSE, 0, 0 }, + { ASN_CONTEXT | 1, + offsetof(CERT_POLICY_CONSTRAINTS_INFO, fInhibitPolicyMapping), + CRYPT_AsnDecodeInhibitMapping, + FINALMEMBERSIZE(CERT_POLICY_CONSTRAINTS_INFO, fInhibitPolicyMapping), + TRUE, FALSE, 0, 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, NULL, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + #define RSA1_MAGIC 0x31415352 struct DECODED_RSA_PUB_KEY @@ -5550,6 +5683,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(X509_POLICY_MAPPINGS): decodeFunc = CRYPT_AsnDecodeCertPolicyMappings; break; + case LOWORD(X509_POLICY_CONSTRAINTS): + decodeFunc = CRYPT_AsnDecodeCertPolicyConstraints; + break; case LOWORD(PKCS7_SIGNER_INFO): decodeFunc = CRYPT_AsnDecodePKCSSignerInfo; break; @@ -5596,6 +5732,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeCertPolicies; else if (!strcmp(lpszStructType, szOID_POLICY_MAPPINGS)) decodeFunc = CRYPT_AsnDecodeCertPolicyMappings; + else if (!strcmp(lpszStructType, szOID_POLICY_CONSTRAINTS)) + decodeFunc = CRYPT_AsnDecodeCertPolicyConstraints; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE)) decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 0ca870a..6e6c6f3 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7643,7 +7643,6 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine { ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7699,7 +7698,6 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding) info->dwInhibitPolicyMappingSkipCerts); LocalFree(info); } - } } /* Free *pInfo with HeapFree */

1 0

Juan Lang : crypt32: Fix test failures on Win9x/NT4.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 267e8902205ba60e6eeabf4fe4ae23d5ec038d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=267e8902205ba60e6eeabf4fe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 13:08:38 2009 -0800 crypt32: Fix test failures on Win9x/NT4. --- dlls/crypt32/tests/protectdata.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 08ab72a..c3173c3 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -225,7 +225,13 @@ static void test_simpleroundtrip(const char *plaintext, int wine_fails) input.pbData = (unsigned char *)plaintext; input.cbData = strlen(plaintext); res = pCryptProtectData(&input, emptyW, NULL, NULL, NULL, 0, &encrypted); - ok(res != 0, "can't protect\n"); + ok(res != 0 || broken(!res), "can't protect\n"); + if (!res) + { + /* Fails on Win9x, NT4 */ + win_skip("CryptProtectData failed\n"); + return; + } res = pCryptUnprotectData(&encrypted, NULL, NULL, NULL, NULL, 0, &output); if (wine_fails) {

1 0

Stefan Dösinger : d3d8: Read the backbuffer in the visual test.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 18c1d6033ab3bd51a9a3052e0d297c389a6d3bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c1d6033ab3bd51a9a3052e0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 7 16:39:03 2009 +0100 d3d8: Read the backbuffer in the visual test. --- dlls/d3d8/tests/visual.c | 86 ++++++++++++++++++++++++++++------------------ 1 files changed, 52 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18c1d6033ab3bd51a9a30…

1 0

Stefan Dösinger : d3d8: Run the visual tests in a window.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: e6dcf31b28cb5df72744ee65da1c609ccdbefb47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6dcf31b28cb5df72744ee65d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 7 14:55:43 2009 +0100 d3d8: Run the visual tests in a window. --- dlls/d3d8/tests/visual.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3f7ec6c..ad5c4c5 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -34,7 +34,8 @@ static HWND create_window(void) RegisterClass(&wc); ret = CreateWindow("d3d8_test_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + WS_POPUP | WS_SYSMENU , 20, 20, 640, 480, 0, 0, 0, 0); + ShowWindow(ret, SW_SHOW); return ret; } @@ -132,7 +133,7 @@ static IDirect3DDevice8 *init_d3d8(void) } ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = FALSE; + present_parameters.Windowed = TRUE; present_parameters.hDeviceWindow = create_window(); present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640;

1 0