October 2009 - Wine-Commits

Christian Costa : ddraw: Make SetColorKey handle case where dwColorSpaceHighValue < dwColorSpaceLowValue + tests.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: e95ffacde05fc6e0d77c9d2af381b1a99cb0ad3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95ffacde05fc6e0d77c9d2af… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Oct 15 00:06:26 2009 +0200 ddraw: Make SetColorKey handle case where dwColorSpaceHighValue < dwColorSpaceLowValue + tests. --- dlls/ddraw/surface.c | 16 +++++++++++----- dlls/ddraw/tests/dsurface.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3d41d18..bfe83a4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2429,31 +2429,37 @@ IDirectDrawSurfaceImpl_SetColorKey(IDirectDrawSurface7 *iface, DDCOLORKEY *CKey) { IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; - struct SCKContext ctx = { DD_OK, (WINEDDCOLORKEY *) CKey, Flags }; + DDCOLORKEY FixedCKey; + struct SCKContext ctx = { DD_OK, (WINEDDCOLORKEY *) (CKey ? &FixedCKey : NULL), Flags }; TRACE("(%p)->(%x,%p)\n", This, Flags, CKey); EnterCriticalSection(&ddraw_cs); if (CKey) { + FixedCKey = *CKey; + /* Handle case where dwColorSpaceHighValue < dwColorSpaceLowValue */ + if (FixedCKey.dwColorSpaceHighValue < FixedCKey.dwColorSpaceLowValue) + FixedCKey.dwColorSpaceHighValue = FixedCKey.dwColorSpaceLowValue; + switch (Flags & ~DDCKEY_COLORSPACE) { case DDCKEY_DESTBLT: - This->surface_desc.ddckCKDestBlt = *CKey; + This->surface_desc.ddckCKDestBlt = FixedCKey; This->surface_desc.dwFlags |= DDSD_CKDESTBLT; break; case DDCKEY_DESTOVERLAY: - This->surface_desc.u3.ddckCKDestOverlay = *CKey; + This->surface_desc.u3.ddckCKDestOverlay = FixedCKey; This->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; break; case DDCKEY_SRCOVERLAY: - This->surface_desc.ddckCKSrcOverlay = *CKey; + This->surface_desc.ddckCKSrcOverlay = FixedCKey; This->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; break; case DDCKEY_SRCBLT: - This->surface_desc.ddckCKSrcBlt = *CKey; + This->surface_desc.ddckCKSrcBlt = FixedCKey; This->surface_desc.dwFlags |= DDSD_CKSRCBLT; break; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c0e84be..1feab9b 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -325,6 +325,37 @@ static void SrcColorKey32BlitTest(void) ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00FF00 && ddsd.ddckCKSrcBlt.dwColorSpaceHighValue == 0x00FF00, "GetSurfaceDesc does not return the colorkey set with SetColorKey\n"); + /* Test SetColorKey with dwColorSpaceHighValue < dwColorSpaceLowValue */ + DDColorKey.dwColorSpaceLowValue = 0x0000FF; + DDColorKey.dwColorSpaceHighValue = 0x000000; + IDirectDrawSurface_SetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + + DDColorKey.dwColorSpaceLowValue = 0; + DDColorKey.dwColorSpaceHighValue = 0; + IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + ok(DDColorKey.dwColorSpaceLowValue == 0x0000FF && DDColorKey.dwColorSpaceHighValue == 0x0000FF, + "GetColorKey does not return the colorkey set with SetColorKey (%x %x)\n", DDColorKey.dwColorSpaceLowValue, DDColorKey.dwColorSpaceHighValue); + + DDColorKey.dwColorSpaceLowValue = 0x0000FF; + DDColorKey.dwColorSpaceHighValue = 0x000001; + IDirectDrawSurface_SetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + + DDColorKey.dwColorSpaceLowValue = 0; + DDColorKey.dwColorSpaceHighValue = 0; + IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + ok(DDColorKey.dwColorSpaceLowValue == 0x0000FF && DDColorKey.dwColorSpaceHighValue == 0x0000FF, + "GetColorKey does not return the colorkey set with SetColorKey (%x %x)\n", DDColorKey.dwColorSpaceLowValue, DDColorKey.dwColorSpaceHighValue); + + DDColorKey.dwColorSpaceLowValue = 0x0000FF; + DDColorKey.dwColorSpaceHighValue = 0x0000FE; + IDirectDrawSurface_SetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + + DDColorKey.dwColorSpaceLowValue = 0; + DDColorKey.dwColorSpaceHighValue = 0; + IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + ok(DDColorKey.dwColorSpaceLowValue == 0x0000FF && DDColorKey.dwColorSpaceHighValue == 0x0000FF, + "GetColorKey does not return the colorkey set with SetColorKey (%x %x)\n", DDColorKey.dwColorSpaceLowValue, DDColorKey.dwColorSpaceHighValue); + IDirectDrawSurface_Release(lpSrc); IDirectDrawSurface_Release(lpDst);

1 0

Juan Lang : crypt32: Decode authority info access with CRYPT_AsnDecodeArrayNoAlloc.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: bba695cc3fb60134e1820420ec2950efbd567701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba695cc3fb60134e1820420e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:05:13 2009 -0700 crypt32: Decode authority info access with CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index e19984e..19ad2ec 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3458,9 +3458,29 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityInfoAccess(DWORD dwCertEncodingType, sizeof(CERT_AUTHORITY_INFO_ACCESS), CRYPT_AsnDecodeAccessDescription, sizeof(CERT_ACCESS_DESCRIPTION), TRUE, offsetof(CERT_ACCESS_DESCRIPTION, pszAccessMethod) }; + DWORD bytesNeeded; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, 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))) + { + CERT_AUTHORITY_INFO_ACCESS *access; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + access = pvStructInfo; + access->rgAccDescr = (PCERT_ACCESS_DESCRIPTION) + ((BYTE *)pvStructInfo + sizeof(CERT_AUTHORITY_INFO_ACCESS)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + &access->cAccDescr, pcbStructInfo, NULL); + } + } } __EXCEPT_PAGE_FAULT {

1 0

Juan Lang : crypt32: Decode CRL dist points using CRYPT_AsnDecodeArrayNoAlloc.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 36fc7b06b11065981cb4ae99b14312c559cf3d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fc7b06b11065981cb4ae99b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:06:20 2009 -0700 crypt32: Decode CRL dist points using CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 4c21549..54fc790 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5079,9 +5079,29 @@ static BOOL WINAPI CRYPT_AsnDecodeCRLDistPoints(DWORD dwCertEncodingType, sizeof(CRL_DIST_POINTS_INFO), CRYPT_AsnDecodeDistPoint, sizeof(CRL_DIST_POINT), TRUE, offsetof(CRL_DIST_POINT, DistPointName.u.FullName.rgAltEntry) }; + DWORD bytesNeeded; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, 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))) + { + CRL_DIST_POINTS_INFO *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = pvStructInfo; + info->rgDistPoint = (PCRL_DIST_POINT) + ((BYTE *)pvStructInfo + sizeof(CRL_DIST_POINTS_INFO)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + &info->cDistPoint, pcbStructInfo, NULL); + } + } } __EXCEPT_PAGE_FAULT {

1 0

Juan Lang : crypt32: Rename CRYPT_AsnDecodeArrayNoAlloc to CRYPT_AsnDecodeArray, and pass a CRYPT_DECODE_PARA * to it so that it can allocate memory if requested .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 3c25d7540f2224f07aafa2a6d3c45c90546cf81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c25d7540f2224f07aafa2a6d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:07:36 2009 -0700 crypt32: Rename CRYPT_AsnDecodeArrayNoAlloc to CRYPT_AsnDecodeArray, and pass a CRYPT_DECODE_PARA * to it so that it can allocate memory if requested. --- dlls/crypt32/decode.c | 179 +++++++++++++++++++++++++----------------------- 1 files changed, 93 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c25d7540f2224f07aafa…

1 0

Juan Lang : crypt32: Allocate memory if requested in CRYPT_AsnDecodeArray.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: c5699e736fa6b02e0093bba9cf695496745d3935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5699e736fa6b02e0093bba9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:08:24 2009 -0700 crypt32: Allocate memory if requested in CRYPT_AsnDecodeArray. --- dlls/crypt32/decode.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index dff574d..8c177d3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -600,8 +600,7 @@ struct AsnArrayItemSize }; /* Decodes an array of like types into a structure described by a struct - * AsnArrayDescriptor. Doesn't allocate memory for the decoded items, - * leaves that up to the caller. + * AsnArrayDescriptor. */ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, @@ -618,11 +617,6 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, SetLastError(CRYPT_E_ASN1_EOD); ret = FALSE; } - else if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) - { - FIXME("allocation not implemented yet\n"); - ret = FALSE; - } else if (!arrayDesc->tag || pbEncoded[0] == arrayDesc->tag) { DWORD dataLen; @@ -713,18 +707,29 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, *pcbDecoded = decoded; if (!pvStructInfo) *pcbStructInfo = bytesNeeded; - else if ((ret = CRYPT_DecodeEnsureSpace(0, NULL, pvStructInfo, - pcbStructInfo, bytesNeeded))) + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) { DWORD i, *pcItems; BYTE *nextData; const BYTE *ptr; void *rgItems; + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(void **)pvStructInfo; pcItems = pvStructInfo; *pcItems = cItems; - rgItems = *(void **)((BYTE *)pcItems - - arrayDesc->countOffset + arrayDesc->arrayOffset); + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + { + rgItems = (BYTE *)pvStructInfo + + arrayDesc->minArraySize; + *(void **)((BYTE *)pcItems - + arrayDesc->countOffset + arrayDesc->arrayOffset) = + rgItems; + } + else + rgItems = *(void **)((BYTE *)pcItems - + arrayDesc->countOffset + arrayDesc->arrayOffset); nextData = (BYTE *)rgItems + cItems * arrayDesc->itemSize; for (i = 0, ptr = pbEncoded + 1 + lenBytes; ret && i < cItems && ptr - pbEncoded - 1 - lenBytes <

1 0

Juan Lang : crypt32: Decode cert policies info using CRYPT_AsnDecodeArrayNoAlloc.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 155aa41d7cae11e10f999fa9bff8c469edbfc1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155aa41d7cae11e10f999fa9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:05:44 2009 -0700 crypt32: Decode cert policies info using CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 19ad2ec..4c21549 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3895,9 +3895,29 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicies(DWORD dwCertEncodingType, sizeof(CERT_POLICIES_INFO), CRYPT_AsnDecodeCertPolicy, sizeof(CERT_POLICY_INFO), TRUE, offsetof(CERT_POLICY_INFO, pszPolicyIdentifier) }; + DWORD bytesNeeded; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, 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))) + { + CERT_POLICIES_INFO *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = pvStructInfo; + info->rgPolicyInfo = (PCERT_POLICY_INFO) + ((BYTE *)pvStructInfo + sizeof(CERT_POLICIES_INFO)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + &info->cPolicyInfo, pcbStructInfo, NULL); + } + } } __EXCEPT_PAGE_FAULT {

1 0

Juan Lang : crypt32: Decode enhanced key usages using CRYPT_AsnDecodeArrayNoAlloc.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: b1a1b32b59cb3aef6a9e79397a099441ac9d2fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a1b32b59cb3aef6a9e79397… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:06:47 2009 -0700 crypt32: Decode enhanced key usages using CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 197 ++++++------------------------------------------- 1 files changed, 22 insertions(+), 175 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 54fc790..e1bd1a6 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -58,12 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); WINE_DECLARE_DEBUG_CHANNEL(crypt); -struct GenericArray -{ - DWORD cItems; - BYTE *rgItems; -}; - typedef BOOL (WINAPI *CryptDecodeObjectFunc)(DWORD, LPCSTR, const BYTE *, DWORD, DWORD, void *, DWORD *); typedef BOOL (WINAPI *CryptDecodeObjectExFunc)(DWORD, LPCSTR, const BYTE *, @@ -605,173 +599,6 @@ struct AsnArrayItemSize DWORD size; }; -/* Decodes an array of like types into a struct GenericArray. - * The layout and decoding of the array are described by a struct - * AsnArrayDescriptor. - */ -static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, - const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, - PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo, - DWORD *pcbDecoded, void *startingPointer) -{ - BOOL ret = TRUE; - - TRACE("%p, %p, %d, %08x, %p, %p, %d, %p\n", arrayDesc, pbEncoded, - cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo, - startingPointer); - - if (!cbEncoded) - { - SetLastError(CRYPT_E_ASN1_EOD); - ret = FALSE; - } - else if (!arrayDesc->tag || pbEncoded[0] == arrayDesc->tag) - { - DWORD dataLen; - - if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, &dataLen))) - { - DWORD bytesNeeded, cItems = 0, decoded; - BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); - /* There can be arbitrarily many items, but there is often only one. - */ - struct AsnArrayItemSize itemSize = { 0 }, *itemSizes = &itemSize; - - decoded = 1 + lenBytes; - bytesNeeded = sizeof(struct GenericArray); - if (dataLen) - { - const BYTE *ptr; - BOOL doneDecoding = FALSE; - - for (ptr = pbEncoded + 1 + lenBytes; ret && !doneDecoding; ) - { - if (dataLen == CMSG_INDEFINITE_LENGTH) - { - if (ptr[0] == 0) - { - doneDecoding = TRUE; - if (ptr[1] != 0) - { - SetLastError(CRYPT_E_ASN1_CORRUPT); - ret = FALSE; - } - else - decoded += 2; - } - } - else if (ptr - pbEncoded - 1 - lenBytes >= dataLen) - doneDecoding = TRUE; - if (!doneDecoding) - { - DWORD itemEncoded, itemDataLen, itemDecoded, size = 0; - - /* Each item decoded may not tolerate extraneous bytes, - * so get the length of the next element if known. - */ - if ((ret = CRYPT_GetLengthIndefinite(ptr, - cbEncoded - (ptr - pbEncoded), &itemDataLen))) - { - if (itemDataLen == CMSG_INDEFINITE_LENGTH) - itemEncoded = cbEncoded - (ptr - pbEncoded); - else - itemEncoded = 1 + GET_LEN_BYTES(ptr[1]) + - itemDataLen; - } - if (ret) - ret = arrayDesc->decodeFunc(ptr, itemEncoded, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &size, - &itemDecoded); - if (ret) - { - cItems++; - if (itemSizes != &itemSize) - itemSizes = CryptMemRealloc(itemSizes, - cItems * sizeof(struct AsnArrayItemSize)); - else if (cItems > 1) - { - itemSizes = - CryptMemAlloc( - cItems * sizeof(struct AsnArrayItemSize)); - if (itemSizes) - memcpy(itemSizes, &itemSize, - sizeof(itemSize)); - } - if (itemSizes) - { - decoded += itemDecoded; - itemSizes[cItems - 1].encodedLen = itemEncoded; - itemSizes[cItems - 1].size = size; - bytesNeeded += size; - ptr += itemEncoded; - } - else - ret = FALSE; - } - } - } - } - if (ret) - { - if (pcbDecoded) - *pcbDecoded = decoded; - if (!pvStructInfo) - *pcbStructInfo = bytesNeeded; - else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, bytesNeeded))) - { - DWORD i; - BYTE *nextData; - const BYTE *ptr; - struct GenericArray *array; - - if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) - pvStructInfo = *(BYTE **)pvStructInfo; - array = pvStructInfo; - array->cItems = cItems; - if (startingPointer) - array->rgItems = startingPointer; - else - array->rgItems = (BYTE *)array + - sizeof(struct GenericArray); - nextData = array->rgItems + - array->cItems * arrayDesc->itemSize; - for (i = 0, ptr = pbEncoded + 1 + lenBytes; ret && - i < cItems && ptr - pbEncoded - 1 - lenBytes < - dataLen; i++) - { - DWORD itemDecoded; - - if (arrayDesc->hasPointer) - *(BYTE **)(array->rgItems + i * arrayDesc->itemSize - + arrayDesc->pointerOffset) = nextData; - ret = arrayDesc->decodeFunc(ptr, - itemSizes[i].encodedLen, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, - array->rgItems + i * arrayDesc->itemSize, - &itemSizes[i].size, &itemDecoded); - if (ret) - { - nextData += itemSizes[i].size - arrayDesc->itemSize; - ptr += itemDecoded; - } - } - if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) - CRYPT_FreeSpace(pDecodePara, pvStructInfo); - } - } - if (itemSizes != &itemSize) - CryptMemFree(itemSizes); - } - } - else - { - SetLastError(CRYPT_E_ASN1_BADTAG); - ret = FALSE; - } - return ret; -} - /* Decodes an array of like types into a structure described by a struct * AsnArrayDescriptor. Doesn't allocate memory for the decoded items, * leaves that up to the caller. @@ -5128,9 +4955,29 @@ static BOOL WINAPI CRYPT_AsnDecodeEnhancedKeyUsage(DWORD dwCertEncodingType, offsetof(CERT_ENHKEY_USAGE, rgpszUsageIdentifier), sizeof(CERT_ENHKEY_USAGE), CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), TRUE, 0 }; + DWORD bytesNeeded; + + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, 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))) + { + CERT_ENHKEY_USAGE *usage; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + usage = pvStructInfo; + usage->rgpszUsageIdentifier = (LPSTR *) + ((BYTE *)pvStructInfo + sizeof(CERT_ENHKEY_USAGE)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + &usage->cUsageIdentifier, pcbStructInfo, NULL); + } + } } __EXCEPT_PAGE_FAULT {

1 0

Juan Lang : crypt32: Decode unicode names using CRYPT_AsnDecodeArrayNoAlloc .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 1b1626ac81eadc5e84b3e6561777b53d80ee1c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1626ac81eadc5e84b3e6561… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:04:44 2009 -0700 crypt32: Decode unicode names using CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 1179ff2..e19984e 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2175,9 +2175,29 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicodeName(DWORD dwCertEncodingType, sizeof(CERT_NAME_INFO), CRYPT_AsnDecodeUnicodeRdn, sizeof(CERT_RDN), TRUE, offsetof(CERT_RDN, rgRDNAttr) }; + DWORD bytesNeeded; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, 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))) + { + CERT_NAME_INFO *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = pvStructInfo; + info->rgRDN = + (PCERT_RDN)((BYTE *)pvStructInfo + sizeof(CERT_NAME_INFO)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + &info->cRDN, pcbStructInfo, NULL); + } + } } __EXCEPT_PAGE_FAULT {

1 0

Juan Lang : crypt32: Convert internal callers of CRYPT_AsnDecodeArray to call CRYPT_AsnDecodeArrayNoAlloc .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 4f815c7d03ff0df2e4d0bc5dfc7cf9019e04cdc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f815c7d03ff0df2e4d0bc5df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:02:53 2009 -0700 crypt32: Convert internal callers of CRYPT_AsnDecodeArray to call CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 34 +++++++++++----------------------- 1 files changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index ff47818..d9475c4 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2062,11 +2062,9 @@ static BOOL CRYPT_AsnDecodeRdn(const BYTE *pbEncoded, DWORD cbEncoded, sizeof(CERT_RDN), CRYPT_AsnDecodeRdnAttr, sizeof(CERT_RDN_ATTR), TRUE, offsetof(CERT_RDN_ATTR, pszObjId) }; - PCERT_RDN rdn = pvStructInfo; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, - rdn ? rdn->rgRDNAttr : NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, pcbDecoded); return ret; } @@ -2138,11 +2136,9 @@ static BOOL CRYPT_AsnDecodeUnicodeRdn(const BYTE *pbEncoded, DWORD cbEncoded, sizeof(CERT_RDN), CRYPT_AsnDecodeUnicodeRdnAttr, sizeof(CERT_RDN_ATTR), TRUE, offsetof(CERT_RDN_ATTR, pszObjId) }; - PCERT_RDN rdn = pvStructInfo; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, - rdn ? rdn->rgRDNAttr : NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, pcbDecoded); return ret; } @@ -2284,11 +2280,9 @@ static BOOL CRYPT_AsnDecodeCTLUsage(const BYTE *pbEncoded, DWORD cbEncoded, offsetof(CTL_USAGE, rgpszUsageIdentifier), sizeof(CTL_USAGE), CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), TRUE, 0 }; - CTL_USAGE *usage = pvStructInfo; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, - usage ? usage->rgpszUsageIdentifier : NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, pcbDecoded); return ret; } @@ -2952,12 +2946,10 @@ static BOOL CRYPT_AsnDecodePKCSAttributesInternal(const BYTE *pbEncoded, sizeof(CRYPT_ATTRIBUTES), CRYPT_AsnDecodePKCSAttributeInternal, sizeof(CRYPT_ATTRIBUTE), TRUE, offsetof(CRYPT_ATTRIBUTE, pszObjId) }; - PCRYPT_ATTRIBUTES attrs = pvStructInfo; BOOL ret; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, attrs ? attrs->rgAttr : - NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, pcbDecoded); return ret; } @@ -3265,23 +3257,19 @@ static BOOL CRYPT_AsnDecodeAltNameInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { - BOOL ret = TRUE; + BOOL ret; struct AsnArrayDescriptor arrayDesc = { 0, offsetof(CERT_ALT_NAME_INFO, cAltEntry), offsetof(CERT_ALT_NAME_INFO, rgAltEntry), sizeof(CERT_ALT_NAME_INFO), CRYPT_AsnDecodeAltNameEntry, sizeof(CERT_ALT_NAME_ENTRY), TRUE, offsetof(CERT_ALT_NAME_ENTRY, u.pwszURL) }; - PCERT_ALT_NAME_INFO info = pvStructInfo; TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - if (info) - TRACE("info->rgAltEntry is %p\n", info->rgAltEntry); - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - NULL, pvStructInfo, pcbStructInfo, pcbDecoded, - info ? info->rgAltEntry : NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, pcbDecoded); return ret; }

1 0

Juan Lang : crypt32: Decode names using CRYPT_AsnDecodeArrayNoAlloc.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 67ee87664e834cbd0f4ccb74ccd7b10560221c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ee87664e834cbd0f4ccb74c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 14 13:04:22 2009 -0700 crypt32: Decode names using CRYPT_AsnDecodeArrayNoAlloc. --- dlls/crypt32/decode.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 925f632..1179ff2 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2081,9 +2081,29 @@ static BOOL WINAPI CRYPT_AsnDecodeName(DWORD dwCertEncodingType, sizeof(CERT_NAME_INFO), CRYPT_AsnDecodeRdn, sizeof(CERT_RDN), TRUE, offsetof(CERT_RDN, rgRDNAttr) }; + DWORD bytesNeeded; - ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, 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))) + { + CERT_NAME_INFO *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = pvStructInfo; + info->rgRDN = + (PCERT_RDN)((BYTE *)pvStructInfo + sizeof(CERT_NAME_INFO)); + ret = CRYPT_AsnDecodeArrayNoAlloc(&arrayDesc, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + &info->cRDN, pcbStructInfo, NULL); + } + } } __EXCEPT_PAGE_FAULT {

1 0