August 2007 - Wine-Commits - list.winehq.org

Francois Gouget : imagehlp: Add two missing fields.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 7a70f9f511d2e402a1b6d8772840e02afa263acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a70f9f511d2e402a1b6d8772… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:49:50 2007 +0200 imagehlp: Add two missing fields. --- dlls/imagehlp/access.c | 2 ++ include/dbghelp.h | 4 +++- include/imagehlp.h | 29 ++++++++++++++++------------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 2aeedff..39e7afa 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -48,6 +48,8 @@ static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { 1, /* Characteristics */ FALSE, /* fSystemImage */ FALSE, /* fDOSImage */ + FALSE, /* fReadOnly */ + 0, /* Version */ { &IMAGEHLP_EmptyLoadedImage.Links, &IMAGEHLP_EmptyLoadedImage.Links }, /* Links */ 148, /* SizeOfImage; */ }; diff --git a/include/dbghelp.h b/include/dbghelp.h index e818096..d454635 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -27,7 +27,7 @@ extern "C" { typedef struct _LOADED_IMAGE { - LPSTR ModuleName; + PSTR ModuleName; HANDLE hFile; PUCHAR MappedAddress; PIMAGE_NT_HEADERS FileHeader; @@ -37,6 +37,8 @@ typedef struct _LOADED_IMAGE ULONG Characteristics; BOOLEAN fSystemImage; BOOLEAN fDOSImage; + BOOLEAN fReadOnly; + UCHAR Version; LIST_ENTRY Links; ULONG SizeOfImage; } LOADED_IMAGE, *PLOADED_IMAGE; diff --git a/include/imagehlp.h b/include/imagehlp.h index e37d921..89883d9 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -158,19 +158,22 @@ typedef enum { * Structures */ -typedef struct _LOADED_IMAGE { - LPSTR ModuleName; - HANDLE hFile; - PUCHAR MappedAddress; - PIMAGE_NT_HEADERS FileHeader; - PIMAGE_SECTION_HEADER LastRvaSection; - ULONG NumberOfSections; - PIMAGE_SECTION_HEADER Sections; - ULONG Characteristics; - BOOLEAN fSystemImage; - BOOLEAN fDOSImage; - LIST_ENTRY Links; - ULONG SizeOfImage; +typedef struct _LOADED_IMAGE +{ + PSTR ModuleName; + HANDLE hFile; + PUCHAR MappedAddress; + PIMAGE_NT_HEADERS FileHeader; + PIMAGE_SECTION_HEADER LastRvaSection; + ULONG NumberOfSections; + PIMAGE_SECTION_HEADER Sections; + ULONG Characteristics; + BOOLEAN fSystemImage; + BOOLEAN fDOSImage; + BOOLEAN fReadOnly; + UCHAR Version; + LIST_ENTRY Links; + ULONG SizeOfImage; } LOADED_IMAGE, *PLOADED_IMAGE; typedef struct _WIN_CERTIFICATE {

1 0

Francois Gouget : dnsapi: Add some constants.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: c3b2258eee21c27276f5eacf66e108e7877555b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b2258eee21c27276f5eacf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:50:49 2007 +0200 dnsapi: Add some constants. --- include/windns.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/windns.h b/include/windns.h index 85f38db..1b1a4e1 100644 --- a/include/windns.h +++ b/include/windns.h @@ -163,6 +163,13 @@ typedef struct DWORD IP6Dword[4]; } IP6_ADDRESS, *PIP6_ADDRESS, DNS_IP6_ADDRESS, *PDNS_IP6_ADDRESS; +#define SIZEOF_IP4_ADDRESS 4 +#define IP4_ADDRESS_STRING_LENGTH 16 +#define IP6_ADDRESS_STRING_LENGTH 65 +#define DNS_ADDRESS_STRING_LENGTH IP6_ADDRESS_STRING_LENGTH +#define IP4_ADDRESS_STRING_BUFFER_LENGTH IP4_ADDRESS_STRING_LENGTH +#define IP6_ADDRESS_STRING_BUFFER_LENGTH IP6_ADDRESS_STRING_LENGTH + typedef struct _IP4_ARRAY { DWORD AddrCount;

1 0

Francois Gouget : dnsapi: Define DNS_STATUS as LONG instead of long to improve Win64 compatibility.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 68953ffd7d81b7a31da1961a0ecf65b14f2d7d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=68953ffd7d81b7a31da1961a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:52:59 2007 +0200 dnsapi: Define DNS_STATUS as LONG instead of long to improve Win64 compatibility. --- dlls/dnsapi/tests/name.c | 2 +- include/windns.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index 5d74bdd..a4a9098 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -161,7 +161,7 @@ static void test_DnsValidateName_A( void ) for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++) { status = pDnsValidateName_A( test_data[i].name, test_data[i].format ); - ok( status == test_data[i].status, "%d: \'%s\': got %ld, expected %ld\n", + ok( status == test_data[i].status, "%d: \'%s\': got %d, expected %d\n", i, test_data[i].name, status, test_data[i].status ); } } diff --git a/include/windns.h b/include/windns.h index 9b9f6ba..85f38db 100644 --- a/include/windns.h +++ b/include/windns.h @@ -155,7 +155,7 @@ typedef enum _DnsSection DnsSectionAddtional } DNS_SECTION; -typedef long DNS_STATUS; +typedef LONG DNS_STATUS, *PDNS_STATUS; typedef DWORD IP4_ADDRESS; typedef struct

1 0

Francois Gouget : d3d9: Declare the D3DPERF_Xxx() functions in d3d9.h.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 69bc2af99042edc9f01ea0944816edde65cd840a URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bc2af99042edc9f01ea0944… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 3 00:53:44 2007 +0200 d3d9: Declare the D3DPERF_Xxx() functions in d3d9.h. --- include/d3d9.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index c6c3004..1eca362 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -1479,10 +1479,19 @@ DECLARE_INTERFACE_(IDirect3DDevice9,IUnknown) #define IDirect3DDevice9_CreateQuery(p,a,b) (p)->CreateQuery(a,b) #endif + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ +int WINAPI D3DPERF_BeginEvent(D3DCOLOR,LPCWSTR); +int WINAPI D3DPERF_EndEvent(void); +DWORD WINAPI D3DPERF_GetStatus(void); +BOOL WINAPI D3DPERF_QueryRepeatFrame(void); +void WINAPI D3DPERF_SetMarker(D3DCOLOR,LPCWSTR); +void WINAPI D3DPERF_SetOptions(DWORD); +void WINAPI D3DPERF_SetRegion(D3DCOLOR,LPCWSTR); + /* Define the main entrypoint as well */ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion);

1 0

Andrew Talbot : oleaut32: Constify some variables.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 61fde63fcea12fe406d94958a283ea14d33ed985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fde63fcea12fe406d94958a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Aug 2 23:13:10 2007 +0100 oleaut32: Constify some variables. --- dlls/oleaut32/ungif.c | 6 +++--- dlls/oleaut32/usrmarshal.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c index 415e7bf..9040632 100644 --- a/dlls/oleaut32/ungif.c +++ b/dlls/oleaut32/ungif.c @@ -107,7 +107,7 @@ typedef struct GifFilePrivateType { static int DGifGetWord(GifFileType *GifFile, GifWord *Word); static int DGifSetupDecompress(GifFileType *GifFile); static int DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen); -static int DGifGetPrefixChar(GifPrefixType *Prefix, int Code, int ClearCode); +static int DGifGetPrefixChar(const GifPrefixType *Prefix, int Code, int ClearCode); static int DGifDecompressInput(GifFileType *GifFile, int *Code); static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, GifByteType *NextByte); @@ -192,7 +192,7 @@ FreeMapObject(ColorMapObject * Object) { static int AddExtensionBlock(SavedImage * New, int Len, - unsigned char ExtData[]) { + const unsigned char ExtData[]) { ExtensionBlock *ep; @@ -723,7 +723,7 @@ DGifDecompressLine(GifFileType * GifFile, * the maximum possible if image O.k. - LZ_MAX_CODE times. *****************************************************************************/ static int -DGifGetPrefixChar(GifPrefixType *Prefix, +DGifGetPrefixChar(const GifPrefixType *Prefix, int Code, int ClearCode) { diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index a6ef030..9976334 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -268,7 +268,7 @@ static unsigned int get_type_size(ULONG *pFlags, const VARIANT *pvar) } } -static unsigned int get_type_alignment(ULONG *pFlags, VARIANT *pvar) +static unsigned int get_type_alignment(ULONG *pFlags, const VARIANT *pvar) { unsigned int size = get_type_size(pFlags, pvar); if(V_VT(pvar) & VT_BYREF) return 3; @@ -333,7 +333,8 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) } /* helper: called for VT_DISPATCH variants to marshal the IDispatch* into the buffer. returns Buffer on failure, new position otherwise */ -static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown *punk) +static unsigned char* interface_variant_marshal(const ULONG *pFlags, unsigned char *Buffer, + REFIID riid, IUnknown *punk) { IStream *working; HGLOBAL working_mem;

1 0

Juan Lang : crypt32: Support finding certificates by cert id.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 0cc08cccb92cf974cd50074bed2f652ad7dcce23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc08cccb92cf974cd50074be… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 12:30:19 2007 -0700 crypt32: Support finding certificates by cert id. --- dlls/crypt32/cert.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f3d5809..c208873 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -911,8 +911,55 @@ static BOOL compare_cert_by_subject_cert(PCCERT_CONTEXT pCertContext, &pCertInfo->Issuer, &pCertContext->pCertInfo->Subject); } -static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, - DWORD dwType, DWORD dwFlags, const void *pvPara) +static BOOL compare_cert_by_cert_id(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) +{ + CERT_ID *id = (CERT_ID *)pvPara; + BOOL ret; + + switch (id->dwIdChoice) + { + case CERT_ID_ISSUER_SERIAL_NUMBER: + ret = CertCompareCertificateName(pCertContext->dwCertEncodingType, + &pCertContext->pCertInfo->Issuer, &id->u.IssuerSerialNumber.Issuer); + if (ret) + ret = CertCompareIntegerBlob(&pCertContext->pCertInfo->SerialNumber, + &id->u.IssuerSerialNumber.SerialNumber); + break; + case CERT_ID_SHA1_HASH: + ret = compare_cert_by_sha1_hash(pCertContext, dwType, dwFlags, + &id->u.HashId); + break; + case CERT_ID_KEY_IDENTIFIER: + { + DWORD size = 0; + + ret = CertGetCertificateContextProperty(pCertContext, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + if (ret && size == id->u.KeyId.cbData) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + CertGetCertificateContextProperty(pCertContext, + CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); + ret = !memcmp(buf, id->u.KeyId.pbData, size); + CryptMemFree(buf); + } + } + else + ret = FALSE; + } + default: + ret = FALSE; + break; + } + return ret; +} + +static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, const void *pvPara) { return compare_cert_by_subject_cert(pCertContext, dwType, dwFlags, ((PCCERT_CONTEXT)pvPara)->pCertInfo); @@ -945,6 +992,9 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert; break; + case CERT_COMPARE_CERT_ID: + compare = compare_cert_by_cert_id; + break; case CERT_COMPARE_ISSUER_OF: compare = compare_cert_by_issuer; break;

1 0

Juan Lang : crypt32: Test and fix getting a certificate context' s key identifier property.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: ac28066b487f5f167f3a26fbced82bf15c6f4d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac28066b487f5f167f3a26fbc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 12:29:49 2007 -0700 crypt32: Test and fix getting a certificate context's key identifier property. --- dlls/crypt32/cert.c | 33 +++++++++++++++++++---- dlls/crypt32/tests/cert.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a74e5e4..f3d5809 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -242,6 +242,33 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, FIXME("CERT_SIGNATURE_HASH_PROP_ID unimplemented\n"); SetLastError(CRYPT_E_NOT_FOUND); break; + case CERT_KEY_IDENTIFIER_PROP_ID: + { + PCERT_EXTENSION ext = CertFindExtension( + szOID_SUBJECT_KEY_IDENTIFIER, pCertContext->pCertInfo->cExtension, + pCertContext->pCertInfo->rgExtension); + + if (ext) + { + CRYPT_DATA_BLOB *value; + DWORD size; + + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, + szOID_SUBJECT_KEY_IDENTIFIER, ext->Value.pbData, + ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &value, + &size); + if (ret) + { + ret = CertContext_CopyParam(pvData, pcbData, value->pbData, + value->cbData); + CertContext_SetProperty(context, dwPropId, 0, value); + LocalFree(value); + } + } + else + SetLastError(ERROR_INVALID_DATA); + break; + } default: SetLastError(CRYPT_E_NOT_FOUND); } @@ -300,12 +327,6 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = CertContext_CopyParam(pvData, pcbData, &state, sizeof(state)); } break; - case CERT_KEY_IDENTIFIER_PROP_ID: - ret = CertContext_GetProperty((void *)pCertContext, dwPropId, - pvData, pcbData); - if (!ret) - SetLastError(ERROR_INVALID_DATA); - break; case CERT_KEY_PROV_HANDLE_PROP_ID: { CERT_KEY_CONTEXT keyContext; diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 4231a1e..ab668ae 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -324,6 +324,30 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, } static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e','m','p',0 }; +static const BYTE v1CertWithPubKey[] = { +0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, +0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06, +0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02, +0x01,0x01 }; +static const BYTE v1CertWithSubjectKeyId[] = { +0x30,0x7b,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, +0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11,0x06, +0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67, +0x00,0x30,0x07,0x30,0x02,0x06,0x00,0x03,0x01,0x00,0xa3,0x17,0x30,0x15,0x30, +0x13,0x06,0x03,0x55,0x1d,0x0e,0x04,0x0c,0x04,0x0a,0x4a,0x75,0x61,0x6e,0x20, +0x4c,0x61,0x6e,0x67,0x00 }; +static const BYTE subjectKeyId[] = { +0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00 }; static void testCertProperties(void) { @@ -493,6 +517,46 @@ static void testCertProperties(void) GetLastError()); ok(keyContext.hCryptProv == 0, "Expected no hCryptProv\n"); + /* According to MSDN the subject key id can be stored as a property, + * as a subject key extension, or as the SHA1 hash of the public key, + * but this cert has none of them: + */ + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + CertFreeCertificateContext(context); + /* This cert does have a public key, but its subject key identifier still + * isn't available: */ + context = CertCreateCertificateContext(X509_ASN_ENCODING, + v1CertWithPubKey, sizeof(v1CertWithPubKey)); + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + CertFreeCertificateContext(context); + /* This cert with a subject key extension can have its key identifier + * property retrieved: + */ + context = CertCreateCertificateContext(X509_ASN_ENCODING, + v1CertWithSubjectKeyId, sizeof(v1CertWithSubjectKeyId)); + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); + if (ret) + { + LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size); + + if (buf) + { + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); + ok(!memcmp(buf, subjectKeyId, size), "Unexpected subject key id\n"); + HeapFree(GetProcessHeap(), 0, buf); + } + } CertFreeCertificateContext(context); }

1 0

Juan Lang : crypt32: Test encoding a cert with a subject key identifier extension.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: c98f605b0e472a0cd7b19728326abe488e402f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98f605b0e472a0cd7b197283… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 12:23:14 2007 -0700 crypt32: Test encoding a cert with a subject key identifier extension. --- dlls/crypt32/tests/encode.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index a9efd22..9b63455 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2736,6 +2736,16 @@ static const BYTE v1CertWithPubKeyNoNull[] = { 0x01,0x01,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09, 0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06,0x03,0x55, 0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; +static const BYTE v1CertWithSubjectKeyId[] = { +0x30,0x7b,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, +0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11,0x06, +0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67, +0x00,0x30,0x07,0x30,0x02,0x06,0x00,0x03,0x01,0x00,0xa3,0x17,0x30,0x15,0x30, +0x13,0x06,0x03,0x55,0x1d,0x0e,0x04,0x0c,0x04,0x0a,0x4a,0x75,0x61,0x6e,0x20, +0x4c,0x61,0x6e,0x67,0x00 }; static const BYTE serialNum[] = { 0x01 }; @@ -2746,6 +2756,8 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) DWORD size = 0; CERT_INFO info = { 0 }; static char oid_rsa_rsa[] = szOID_RSA_RSA; + static char oid_subject_key_identifier[] = szOID_SUBJECT_KEY_IDENTIFIER; + CERT_EXTENSION ext; /* Test with NULL pvStructInfo */ ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, NULL, @@ -2841,9 +2853,24 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) "Got unexpected value\n"); LocalFree(buf); } - /* for now, I let more interesting tests be done for each subcomponent, - * rather than retesting them all here. - */ + /* Remove the public key, and add a subject key identifier extension */ + info.SubjectPublicKeyInfo.Algorithm.pszObjId = NULL; + info.SubjectPublicKeyInfo.PublicKey.cbData = 0; + info.SubjectPublicKeyInfo.PublicKey.pbData = NULL; + ext.pszObjId = oid_subject_key_identifier; + ext.fCritical = FALSE; + ext.Value.cbData = sizeof(octetCommonNameValue); + ext.Value.pbData = (BYTE *)octetCommonNameValue; + info.cExtension = 1; + info.rgExtension = &ext; + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (buf) + { + ok(size == sizeof(v1CertWithSubjectKeyId), "Wrong size %d\n", size); + ok(!memcmp(buf, v1CertWithSubjectKeyId, size), "Unexpected value\n"); + LocalFree(buf); + } } static void test_decodeCertToBeSigned(DWORD dwEncoding)

1 0

Juan Lang : crypt32: Test encoding a cert with a public key.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: 0c5772dc0a72c8b3e20a60a8d3348c300e83552d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5772dc0a72c8b3e20a60a8d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 12:22:17 2007 -0700 crypt32: Test encoding a cert with a public key. --- dlls/crypt32/tests/encode.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 75dd321..a9efd22 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2713,6 +2713,29 @@ static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x07, 0x30, 0x02, 0x06, 0x00, 0x03, 0x01, 0x00, 0xa3, 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x01 }; +static const BYTE v1CertWithPubKey[] = { +0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, +0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06, +0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02, +0x01,0x01 }; +static const BYTE v1CertWithPubKeyNoNull[] = { +0x30,0x81,0x93,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x20,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x01,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09, +0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06,0x03,0x55, +0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; static const BYTE serialNum[] = { 0x01 }; @@ -2722,6 +2745,7 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) BYTE *buf = NULL; DWORD size = 0; CERT_INFO info = { 0 }; + static char oid_rsa_rsa[] = szOID_RSA_RSA; /* Test with NULL pvStructInfo */ ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, NULL, @@ -2800,6 +2824,23 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) ok(!memcmp(buf, bigCert, size), "Got unexpected value\n"); LocalFree(buf); } + /* Add a public key */ + info.SubjectPublicKeyInfo.Algorithm.pszObjId = oid_rsa_rsa; + info.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(aKey); + info.SubjectPublicKeyInfo.PublicKey.pbData = (LPBYTE)aKey; + ret = CryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (buf) + { + ok(size == sizeof(v1CertWithPubKey) || + size == sizeof(v1CertWithPubKeyNoNull), "Wrong size %d\n", size); + if (size == sizeof(v1CertWithPubKey)) + ok(!memcmp(buf, v1CertWithPubKey, size), "Got unexpected value\n"); + else if (size == sizeof(v1CertWithPubKeyNoNull)) + ok(!memcmp(buf, v1CertWithPubKeyNoNull, size), + "Got unexpected value\n"); + LocalFree(buf); + } /* for now, I let more interesting tests be done for each subcomponent, * rather than retesting them all here. */ @@ -2857,6 +2898,38 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) info->Subject.cbData), "Unexpected subject\n"); LocalFree(buf); } + /* Check again with pub key specified */ + ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, + v1CertWithPubKey, sizeof(v1CertWithPubKey), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + CERT_INFO *info = (CERT_INFO *)buf; + + ok(size >= sizeof(CERT_INFO), "Wrong size %d\n", size); + ok(info->SerialNumber.cbData == 1, + "Expected serial number size 1, got %d\n", info->SerialNumber.cbData); + ok(*info->SerialNumber.pbData == *serialNum, + "Expected serial number %d, got %d\n", *serialNum, + *info->SerialNumber.pbData); + ok(info->Issuer.cbData == sizeof(encodedCommonName), + "Wrong size %d\n", info->Issuer.cbData); + ok(!memcmp(info->Issuer.pbData, encodedCommonName, info->Issuer.cbData), + "Unexpected issuer\n"); + ok(info->Subject.cbData == sizeof(encodedCommonName), + "Wrong size %d\n", info->Subject.cbData); + ok(!memcmp(info->Subject.pbData, encodedCommonName, + info->Subject.cbData), "Unexpected subject\n"); + ok(!strcmp(info->SubjectPublicKeyInfo.Algorithm.pszObjId, + szOID_RSA_RSA), "Expected szOID_RSA_RSA, got %s\n", + info->SubjectPublicKeyInfo.Algorithm.pszObjId); + ok(info->SubjectPublicKeyInfo.PublicKey.cbData == sizeof(aKey), + "Wrong size %d\n", info->SubjectPublicKeyInfo.PublicKey.cbData); + ok(!memcmp(info->SubjectPublicKeyInfo.PublicKey.pbData, aKey, + sizeof(aKey)), "Unexpected public key\n"); + LocalFree(buf); + } } static const BYTE hash[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc, 0xd,

1 0

Chris Robinson : winex11: Don' t use ConvertAttribWGLtoGLX for wglCreatePbufferARB.
by Alexandre Julliard Aug. 3, 2007

Aug. 3, 2007

Module: wine Branch: master Commit: a2475921b14d9ef2a4a07dd5d73a33a8242f04be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2475921b14d9ef2a4a07dd5d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Aug 2 13:52:22 2007 -0700 winex11: Don't use ConvertAttribWGLtoGLX for wglCreatePbufferARB. --- dlls/winex11.drv/opengl.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b8dfac4..74fba01 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2055,16 +2055,19 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, object->height = iHeight; object->fmt = fmt; - nAttribs = ConvertAttribWGLtoGLX(piAttribList, attribs, object); - if (-1 == nAttribs) { - WARN("Cannot convert WGL to GLX attributes\n"); - goto create_failed; - } PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth); PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight); while (piAttribList && 0 != *piAttribList) { int attr_v; switch (*piAttribList) { + case WGL_PBUFFER_LARGEST_ARB: { + ++piAttribList; + attr_v = *piAttribList; + TRACE("WGL_LARGEST_PBUFFER_ARB = %d\n", attr_v); + PUSH2(attribs, GLX_LARGEST_PBUFFER, attr_v); + break; + } + case WGL_TEXTURE_FORMAT_ARB: { ++piAttribList; attr_v = *piAttribList;

1 0