Wine-Devel

By thread

wine-devel@list.winehq.org

June 2018

68 participants
1149 messages

[PATCH 1/5] webservices: Avoid a warning from HeapDestroy.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 5e1a273329..e44cf72e74 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -216,7 +216,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR static void reset_heap( struct heap *heap ) { - HeapDestroy( heap->handle ); + if (heap->handle) HeapDestroy( heap->handle ); heap->handle = NULL; heap->max_size = heap->allocated = 0; } -- 2.11.0

June 20, 2018

Re: [PATCH 6/6] wined3d: Call wined3d_cs_emit_update_sub_resource() directly in buffer_init().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 20, 2018

Re: [PATCH 5/6] wined3d: Use WINED3D_LOCATION_DISCARDED before initializing buffers with data.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 20, 2018

Re: [PATCH 4/6] wined3d: Reduce nesting in texture2d_load_sysmem().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 20, 2018

Re: [PATCH 2/6] wined3d: Initialize depth/stencil texture data.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 20, 2018

Re: [PATCH 3/6] d3d9/tests: Add test for depth stencil initialization.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 20, 2018

Re: [PATCH 1/6] d3d11: Introduce get_resource_properties() helper function.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 20, 2018

Re: [PATCH 2/3] crypt32: Implement decoding of X509_OBJECT_IDENTIFIER.

by Nikolay Sivov

On 06/20/2018 11:10 AM, Alistair Leslie-Hughes wrote: > Hi Nikolay, > > Is there a reason why you didn't include tests in this series? > Patch doesn't mention how test blobs were generated, I'd like to find a reproducible way to recreated them. > > Alistair. > > > On 20/06/18 17:37, Nikolay Sivov wrote: >> From: Michael MÃ¼ller<michael(a)fds-team.de> >> >> Signed-off-by: Nikolay Sivov<nsivov(a)codeweavers.com> >> --- >> dlls/crypt32/decode.c | 45 +++++++++++++++++++++++++++++++++++++++++++ >> include/wincrypt.h | 15 +++++++++++++++ >> 2 files changed, 60 insertions(+) >> >> diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c >> index a61316016f..4f11d0d60f 100644 >> --- a/dlls/crypt32/decode.c >> +++ b/dlls/crypt32/decode.c >> @@ -5973,6 +5973,46 @@ BOOL CRYPT_AsnDecodePKCSEnvelopedData(const BYTE *pbEncoded, DWORD cbEncoded, >> return ret; >> } >> >> +static BOOL WINAPI CRYPT_AsnDecodeObjectIdentifier(DWORD dwCertEncodingType, >> + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, >> + CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) >> +{ >> + DWORD bytesNeeded = 0; >> + BOOL ret; >> + >> + __TRY >> + { >> + ret = CRYPT_AsnDecodeOidInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, >> + NULL, &bytesNeeded, NULL); >> + if (ret) >> + { >> + if (!pvStructInfo) >> + *pcbStructInfo = bytesNeeded; >> + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, bytesNeeded))) >> + { >> + LPSTR *info; >> + >> + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) >> + pvStructInfo = *(BYTE **)pvStructInfo; >> + >> + info = pvStructInfo; >> + *info = (void *)((BYTE *)info + sizeof(*info)); >> + ret = CRYPT_AsnDecodeOidInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, >> + pvStructInfo, &bytesNeeded, NULL); >> + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) >> + CRYPT_FreeSpace(pDecodePara, info); >> + } >> + } >> + } >> + __EXCEPT_PAGE_FAULT >> + { >> + SetLastError(STATUS_ACCESS_VIOLATION); >> + ret = FALSE; >> + } >> + __ENDTRY >> + return ret; >> +} >> + >> static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, >> LPCSTR lpszStructType) >> { >> @@ -6112,6 +6152,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, >> case LOWORD(CMS_SIGNER_INFO): >> decodeFunc = CRYPT_AsnDecodeCMSSignerInfo; >> break; >> + case LOWORD(X509_OBJECT_IDENTIFIER): >> + decodeFunc = CRYPT_AsnDecodeObjectIdentifier; >> + break; >> } >> } >> else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) >> @@ -6166,6 +6209,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, >> decodeFunc = CRYPT_AsnDecodePolicyQualifierUserNotice; >> else if (!strcmp(lpszStructType, szOID_CTL)) >> decodeFunc = CRYPT_AsnDecodeCTL; >> + else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) >> + decodeFunc = CRYPT_AsnDecodeObjectIdentifier; >> return decodeFunc; >> } >> >> diff --git a/include/wincrypt.h b/include/wincrypt.h >> index 6e71fb902e..a7c24e7831 100644 >> --- a/include/wincrypt.h >> +++ b/include/wincrypt.h >> @@ -288,6 +288,11 @@ typedef struct _CERT_KEY_ATTRIBUTES_INFO { >> PCERT_PRIVATE_KEY_VALIDITY pPrivateKeyUsagePeriod; >> } CERT_KEY_ATTRIBUTES_INFO, *PCERT_KEY_ATTRIBUTES_INFO; >> >> +typedef struct _CERT_ECC_SIGNATURE { >> + CRYPT_UINT_BLOB r; >> + CRYPT_UINT_BLOB s; >> +} CERT_ECC_SIGNATURE, *PCERT_ECC_SIGNATURE; >> + >> /* byte 0 */ >> #define CERT_DIGITAL_SIGNATURE_KEY_USAGE 0x80 >> #define CERT_NON_REPUDIATION_KEY_USAGE 0x40 >> @@ -2878,6 +2883,12 @@ typedef struct _CTL_FIND_SUBJECT_PARA >> #define szOID_X957 "1.2.840.10040" >> #define szOID_X957_DSA "1.2.840.10040.4.1" >> #define szOID_X957_SHA1DSA "1.2.840.10040.4.3" >> +#define szOID_ECC_PUBLIC_KEY "1.2.840.10045.2.1" >> +#define szOID_ECC_CURVE_P256 "1.2.840.10045.3.1.7" >> +#define szOID_ECDSA_SPECIFIED "1.2.840.10045.4.3" >> +#define szOID_ECDSA_SHA256 "1.2.840.10045.4.3.2" >> +#define szOID_ECDSA_SHA384 "1.2.840.10045.4.3.3" >> +#define szOID_ECDSA_SHA512 "1.2.840.10045.4.3.4" >> #define szOID_DS "2.5" >> #define szOID_DSALG "2.5.8" >> #define szOID_DSALG_CRPT "2.5.8.1" >> @@ -2919,6 +2930,8 @@ typedef struct _CTL_FIND_SUBJECT_PARA >> #define szOID_OIWDIR_SIGN "1.3.14.7.2.3" >> #define szOID_OIWDIR_md2 "1.3.14.7.2.2.1" >> #define szOID_OIWDIR_md2RSA "1.3.14.7.2.3.1" >> +#define szOID_ECC_CURVE_P384 "1.3.132.0.34" >> +#define szOID_ECC_CURVE_P521 "1.3.132.0.35" >> #define szOID_INFOSEC "2.16.840.1.101.2.1" >> #define szOID_INFOSEC_sdnsSignature "2.16.840.1.101.2.1.1.1" >> #define szOID_INFOSEC_mosaicSignature "2.16.840.1.101.2.1.1.2" >> @@ -3223,6 +3236,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA >> #define X509_PKIX_POLICY_QUALIFIER_USERNOTICE ((LPCSTR)46) >> #define X509_DH_PUBLICKEY X509_MULTI_BYTE_UINT >> #define X509_DH_PARAMETERS ((LPCSTR)47) >> +#define X509_ECC_SIGNATURE ((LPCSTR)47) >> #define PKCS_ATTRIBUTES ((LPCSTR)48) >> #define PKCS_SORTED_CTL ((LPCSTR)49) >> #define X942_DH_PARAMETERS ((LPCSTR)50) >> @@ -3240,6 +3254,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA >> #define CMC_ADD_EXTENSIONS ((LPCSTR)62) >> #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) >> #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) >> +#define X509_OBJECT_IDENTIFIER ((LPCSTR)73) >> #define PKCS7_SIGNER_INFO ((LPCSTR)500) >> #define CMS_SIGNER_INFO ((LPCSTR)501) >> >> >> >

June 20, 2018

Re: [PATCH 2/3] crypt32: Implement decoding of X509_OBJECT_IDENTIFIER.

by Alistair Leslie-Hughes

Hi Nikolay, Is there a reason why you didn't include tests in this series? Alistair. On 20/06/18 17:37, Nikolay Sivov wrote: From: Michael MÃ¼ller <michael(a)fds-team.de><mailto:michael(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com><mailto:nsivov(a)codeweavers.com> --- dlls/crypt32/decode.c | 45 +++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 15 +++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a61316016f..4f11d0d60f 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5973,6 +5973,46 @@ BOOL CRYPT_AsnDecodePKCSEnvelopedData(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } +static BOOL WINAPI CRYPT_AsnDecodeObjectIdentifier(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + DWORD bytesNeeded = 0; + BOOL ret; + + __TRY + { + ret = CRYPT_AsnDecodeOidInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + NULL, &bytesNeeded, NULL); + if (ret) + { + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, bytesNeeded))) + { + LPSTR *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + info = pvStructInfo; + *info = (void *)((BYTE *)info + sizeof(*info)); + ret = CRYPT_AsnDecodeOidInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -6112,6 +6152,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(CMS_SIGNER_INFO): decodeFunc = CRYPT_AsnDecodeCMSSignerInfo; break; + case LOWORD(X509_OBJECT_IDENTIFIER): + decodeFunc = CRYPT_AsnDecodeObjectIdentifier; + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -6166,6 +6209,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodePolicyQualifierUserNotice; else if (!strcmp(lpszStructType, szOID_CTL)) decodeFunc = CRYPT_AsnDecodeCTL; + else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) + decodeFunc = CRYPT_AsnDecodeObjectIdentifier; return decodeFunc; } diff --git a/include/wincrypt.h b/include/wincrypt.h index 6e71fb902e..a7c24e7831 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -288,6 +288,11 @@ typedef struct _CERT_KEY_ATTRIBUTES_INFO { PCERT_PRIVATE_KEY_VALIDITY pPrivateKeyUsagePeriod; } CERT_KEY_ATTRIBUTES_INFO, *PCERT_KEY_ATTRIBUTES_INFO; +typedef struct _CERT_ECC_SIGNATURE { + CRYPT_UINT_BLOB r; + CRYPT_UINT_BLOB s; +} CERT_ECC_SIGNATURE, *PCERT_ECC_SIGNATURE; + /* byte 0 */ #define CERT_DIGITAL_SIGNATURE_KEY_USAGE 0x80 #define CERT_NON_REPUDIATION_KEY_USAGE 0x40 @@ -2878,6 +2883,12 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_X957 "1.2.840.10040" #define szOID_X957_DSA "1.2.840.10040.4.1" #define szOID_X957_SHA1DSA "1.2.840.10040.4.3" +#define szOID_ECC_PUBLIC_KEY "1.2.840.10045.2.1" +#define szOID_ECC_CURVE_P256 "1.2.840.10045.3.1.7" +#define szOID_ECDSA_SPECIFIED "1.2.840.10045.4.3" +#define szOID_ECDSA_SHA256 "1.2.840.10045.4.3.2" +#define szOID_ECDSA_SHA384 "1.2.840.10045.4.3.3" +#define szOID_ECDSA_SHA512 "1.2.840.10045.4.3.4" #define szOID_DS "2.5" #define szOID_DSALG "2.5.8" #define szOID_DSALG_CRPT "2.5.8.1" @@ -2919,6 +2930,8 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_OIWDIR_SIGN "1.3.14.7.2.3" #define szOID_OIWDIR_md2 "1.3.14.7.2.2.1" #define szOID_OIWDIR_md2RSA "1.3.14.7.2.3.1" +#define szOID_ECC_CURVE_P384 "1.3.132.0.34" +#define szOID_ECC_CURVE_P521 "1.3.132.0.35" #define szOID_INFOSEC "2.16.840.1.101.2.1" #define szOID_INFOSEC_sdnsSignature "2.16.840.1.101.2.1.1.1" #define szOID_INFOSEC_mosaicSignature "2.16.840.1.101.2.1.1.2" @@ -3223,6 +3236,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define X509_PKIX_POLICY_QUALIFIER_USERNOTICE ((LPCSTR)46) #define X509_DH_PUBLICKEY X509_MULTI_BYTE_UINT #define X509_DH_PARAMETERS ((LPCSTR)47) +#define X509_ECC_SIGNATURE ((LPCSTR)47) #define PKCS_ATTRIBUTES ((LPCSTR)48) #define PKCS_SORTED_CTL ((LPCSTR)49) #define X942_DH_PARAMETERS ((LPCSTR)50) @@ -3240,6 +3254,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500) #define CMS_SIGNER_INFO ((LPCSTR)501)

June 20, 2018

Re: [PATCH] comctl32/imagelist: fix ImageList_Read/Write.

by Nikolay Sivov

On 06/16/2018 07:19 PM, Denis Malikov wrote: > From: Denis Malikov <mdn40000(a)mail.ru> > Date: Sat, 16 Jun 2018 16:35:45 +0700 > Subject: [PATCH] comctl32/imagelist: fix ImageList_Read/Write. > > Fix for versions x600 and x620 and pointer calculation for mixing image and mask bits. > > Tested on ReactOS 0.4.10 with *.reg files extracted from: > - XP/2003 key HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\TrayNotify; > - Vista/7 key HKEY_CLASSES_ROOT\Local Settings\Software\Microsoft\Windows\CurrentVersion\TrayNotify > > Signed-off-by: Denis Malikov <mdn40000(a)mail.ru> > --- > dlls/comctl32/imagelist.c | 59 +++++++++++++++++++++++++++-------------------- > 1 file changed, 34 insertions(+), 25 deletions(-) > > diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c > index a08d60752e..052d59f9e4 100644 > --- a/dlls/comctl32/imagelist.c > +++ b/dlls/comctl32/imagelist.c > @@ -59,7 +59,7 @@ struct _IMAGELIST > INT cGrow; /* 0C: cGrow */ > INT cx; /* 10: cx */ > INT cy; /* 14: cy */ > - DWORD x4; > + DWORD x4; /* hack for IL from stream. Keep version here */ > UINT flags; /* 1C: flags */ > COLORREF clrFg; /* 20: foreground color */ > COLORREF clrBk; /* 24: background color */ > @@ -83,6 +83,7 @@ struct _IMAGELIST > }; The idea is to keep this structure binary compatible, that's why it starts with a part with specific layout. If you want to store source stream version, append a new field for that. I actually like the idea of using source stream format version to save the list back, it seems like a good compromise. > > #define IMAGELIST_MAGIC 0x53414D58 > +#define IMAGELIST_VERSION 0x101 > > /* Header used by ImageList_Read() and ImageList_Write() */ > #include "pshpack2.h" > @@ -806,6 +807,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, > himl->clrFg = CLR_DEFAULT; > himl->clrBk = CLR_NONE; > himl->color_table_set = FALSE; > + himl->x4 = 0; > > /* initialize overlay mask indices */ > for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) > @@ -2257,38 +2259,43 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) > BITMAPINFO *image_info = (BITMAPINFO *)image_buf; > BITMAPINFO *mask_info = (BITMAPINFO *)mask_buf; > void *image_bits, *mask_bits = NULL; > - ILHEAD ilHead; > - HIMAGELIST himl; > + ILHEAD ilHead; > + HIMAGELIST himl; > unsigned int i; > > TRACE("%p\n", pstm); > > if (FAILED(IStream_Read (pstm, &ilHead, sizeof(ILHEAD), NULL))) > - return NULL; > + return NULL; > if (ilHead.usMagic != (('L' << 8) | 'I')) > - return NULL; > - if (ilHead.usVersion != 0x101) /* probably version? */ > - return NULL; > + return NULL; No need to reformat existing lines. > + if (ilHead.usVersion != IMAGELIST_VERSION && > + ilHead.usVersion != 0x600 && /* XP/2003 version */ > + ilHead.usVersion != 0x620) /* Vista/7 version */ > + return NULL; The question is if there's any format differences between 0x600 and 0x620, it was probably bumped for a reason. > > TRACE("cx %u, cy %u, flags 0x%04x, cCurImage %u, cMaxImage %u\n", > ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); > > himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); > if (!himl) > - return NULL; > + return NULL; > + > + // keep version from stream > + himl->x4 = ilHead.usVersion; No cpp-style comments, please. > > @@ -3078,10 +3087,10 @@ BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm) > TRACE("%p %p\n", himl, pstm); > > if (!is_valid(himl)) > - return FALSE; > + return FALSE; > > ilHead.usMagic = (('L' << 8) | 'I'); > - ilHead.usVersion = 0x101; > + ilHead.usVersion = himl->x4 > 0 ? himl->x4 : IMAGELIST_VERSION; > ilHead.cCurImage = himl->cCurImage; > ilHead.cMaxImage = himl->cMaxImage; > ilHead.cGrow = himl->cGrow; > @@ -3090,23 +3099,23 @@ BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm) > ilHead.bkcolor = himl->clrBk; > ilHead.flags = himl->flags; > for(i = 0; i < 4; i++) { > - ilHead.ovls[i] = himl->nOvlIdx[i]; > + ilHead.ovls[i] = himl->nOvlIdx[i]; > } > > TRACE("cx %u, cy %u, flags 0x04%x, cCurImage %u, cMaxImage %u\n", > ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); > > if(FAILED(IStream_Write(pstm, &ilHead, sizeof(ILHEAD), NULL))) > - return FALSE; > + return FALSE; > > /* write the bitmap */ > if(!_write_bitmap(himl->hbmImage, pstm)) > - return FALSE; > + return FALSE; > > /* write the mask if we have one */ > if(himl->flags & ILC_MASK) { > - if(!_write_bitmap(himl->hbmMask, pstm)) > - return FALSE; > + if(!_write_bitmap(himl->hbmMask, pstm)) > + return FALSE; > } Doesn't this write in old format, with mismatching version field?

June 20, 2018

Jump to page: