November 2007 - Wine-commits

Stefan Dösinger : wined3d: Hide NP2 textures support on R500 and earlier cards.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: cd1812b4737da9caa92a1c83fc35e63610019f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1812b4737da9caa92a1c83f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 12:39:57 2007 +0100 wined3d: Hide NP2 textures support on R500 and earlier cards. --- dlls/wined3d/directx.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dc2462e..aff5bee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2760,6 +2760,20 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { gl_info->vs_glsl_constantsF, gl_info->vs_arb_constantsF); gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; } + + /* MacOS advertises GL_ARB_texture_non_power_of_two on ATI r500 and earlier cards, although + * these cards only support GL_ARB_texture_rectangle(D3DPTEXTURECAPS_NONPOW2CONDITIONAL). + * If real NP2 textures are used, the driver falls back to software. So remove the supported + * flag for this extension + */ + if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_info->gl_vendor == VENDOR_ATI) { + if(gl_info->gl_card == CARD_ATI_RADEON_X700 || gl_info->gl_card == CARD_ATI_RADEON_X1600 || + gl_info->gl_card == CARD_ATI_RADEON_9500 || gl_info->gl_card == CARD_ATI_RADEON_8500 || + gl_info->gl_card == CARD_ATI_RADEON_7200 || gl_info->gl_card == CARD_ATI_RAGE_128PRO) { + TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing\n"); + gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; + } + } } }

1 0

Vijay Kiran Kamuju : include: Add missing defines for RC5, SHA and AES in wincrypt.h.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: f00def503b29ed6ee0b8c3b7076e4035cc2e77dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00def503b29ed6ee0b8c3b70… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Nov 8 14:15:53 2007 -0600 include: Add missing defines for RC5, SHA and AES in wincrypt.h. --- include/wincrypt.h | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index d2a2d5d..aa6ae2e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1393,6 +1393,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define ALG_CLASS_DATA_ENCRYPT (3 << 13) #define ALG_CLASS_HASH (4 << 13) #define ALG_CLASS_KEY_EXCHANGE (5 << 13) +#define ALG_CLASS_ALL (7 << 13) /* Algorithm types */ #define ALG_TYPE_ANY (0) #define ALG_TYPE_DSS (1 << 9) @@ -1424,6 +1425,12 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define ALG_SID_SAFERSK64 7 #define ALG_SID_SAFERSK128 8 #define ALG_SID_3DES_112 9 +#define ALG_SID_CYLINK_MEK 12 +#define ALG_SID_RC5 13 +#define ALG_SID_AES_128 14 +#define ALG_SID_AES_192 15 +#define ALG_SID_AES_256 16 +#define ALG_SID_AES 17 /* Diffie-Hellmans SIDs */ #define ALG_SID_DH_SANDF 1 #define ALG_SID_DH_EPHEM 2 @@ -1445,6 +1452,10 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define ALG_SID_SSL3SHAMD5 8 #define ALG_SID_HMAC 9 #define ALG_SID_TLS1PRF 10 +#define ALG_SID_HASH_REPLACE_OWF 11 +#define ALG_SID_SHA_256 12 +#define ALG_SID_SHA_384 13 +#define ALG_SID_SHA_512 14 /* SCHANNEL SIDs */ #define ALG_SID_SSL3_MASTER 1 #define ALG_SID_SCHANNEL_MASTER_HASH 2 @@ -1465,6 +1476,10 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define CALG_SSL3_SHAMD5 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SSL3SHAMD5) #define CALG_HMAC (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HMAC) #define CALG_TLS1PRF (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_TLS1PRF) +#define CALG_HASH_REPLACE_OWF (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HASH_REPLACE_OWF) +#define CALG_SHA_256 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_256) +#define CALG_SHA_384 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_384) +#define CALG_SHA_512 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512) #define CALG_RSA_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) #define CALG_DSS_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_DSS_ANY) #define CALG_NO_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_ANY | ALG_SID_ANY) @@ -1475,8 +1490,13 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2) #define CALG_3DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES) #define CALG_3DES_112 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES_112) +#define CALG_AES_128 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_128) +#define CALG_AES_192 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_192) +#define CALG_AES_256 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_256) +#define CALG_AES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES) #define CALG_RC4 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC4) #define CALG_SEAL (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_SEAL) +#define CALG_RC5 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC5) #define CALG_SSL3_MASTER (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_SSL3_MASTER) #define CALG_SCHANNEL_MASTER_HASH (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_SCHANNEL_MASTER_HASH) #define CALG_SCHANNEL_MAC_KEY (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_SCHANNEL_MAC_KEY) @@ -1485,6 +1505,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define CALG_SSL2_MASTER (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_SSL2_MASTER) #define CALG_TLS1_MASTER (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_TLS1_MASTER) + /* Protocol Flags */ #define CRYPT_FLAG_PCT1 0x0001 #define CRYPT_FLAG_SSL2 0x0002 @@ -1638,6 +1659,20 @@ static const WCHAR MS_SCARD_PROV_W[] = { 'M','i','c','r','o','s','o',' #endif #define MS_SCARD_PROV WINELIB_NAME_AW(MS_SCARD_PROV_) +#define MS_ENH_RSA_AES_PROV_A "Microsoft Enhanced RSA and AES Cryptographic Provider" +#if defined(__GNUC__) +# define MS_ENH_RSA_AES_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \ + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ',\ + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 } +#elif defined(_MSC_VER) +# define MS_ENH_RSA_AES_PROV_W L"Microsoft Enhanced RSA and AES Cryptographic Provider" +#else +static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ', + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }; +#endif +#define MS_ENH_RSA_AES_PROV WINELIB_NAME_AW(MS_ENH_RSA_AES_PROV_) + /* Key Specs*/ #define AT_KEYEXCHANGE 1 #define AT_SIGNATURE 2

1 0

Hans Leidekker : usp10: Fix some more memory leaks.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 106dbd5617197a0e4d52ea373eaa5c6d0df7c2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=106dbd5617197a0e4d52ea373… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 8 19:18:30 2007 +0100 usp10: Fix some more memory leaks. --- dlls/usp10/tests/usp10.c | 6 +++++- dlls/usp10/usp10.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 73615de..158f201 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -640,6 +640,7 @@ static void test_ScriptString(HDC hdc) ReqWidth, &Control, &State, Dx, &Tabdef, &InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + ScriptStringFree(&ssa); /* test makes sure that a call with a valid pssa still works */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, @@ -844,8 +845,9 @@ static void test_ScriptCacheGetHeight(HDC hdc) hr = ScriptCacheGetHeight(hdc, &sc, &height); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); - ok(height > 0, "expected height > 0\n"); + + ScriptFreeCache(&sc); } static void test_ScriptGetGlyphABCWidth(HDC hdc) @@ -867,6 +869,8 @@ static void test_ScriptGetGlyphABCWidth(HDC hdc) hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', &abc); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + + ScriptFreeCache(&sc); } static void test_ScriptLayout(void) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3e1258d..576b056 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -660,6 +660,7 @@ error: usp_free(analysis->glyphs); usp_free(analysis->logattrs); usp_free(analysis->pItem); + usp_free(analysis->sc); usp_free(analysis); return hr; } @@ -887,6 +888,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) usp_free(analysis->pItem); usp_free(analysis->logattrs); usp_free(analysis->sz); + usp_free(analysis->sc); usp_free(analysis); if (invalid) return E_INVALIDARG;

1 0

Andrew Talbot : user32: Constify some variables.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: d98b83bed55f5df4d117c91d55fe24d6bc2ea61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98b83bed55f5df4d117c91d5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 8 18:56:48 2007 +0000 user32: Constify some variables. --- dlls/user32/button.c | 2 +- dlls/user32/combo.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 46940f0..6e21bbc 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -723,7 +723,7 @@ static BOOL CALLBACK BUTTON_DrawTextCallback(HDC hdc, LPARAM lp, WPARAM wp, int * * Common function for drawing button label. */ -static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, RECT *rc) +static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc) { DRAWSTATEPROC lpOutputProc = NULL; LPARAM lp; diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 4279297..1709f28 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -835,9 +835,9 @@ static void CBPaintText( * CBPaintBorder */ static void CBPaintBorder( - HWND hwnd, - LPHEADCOMBO lphc, - HDC hdc) + HWND hwnd, + const HEADCOMBO *lphc, + HDC hdc) { RECT clientRect; @@ -1541,8 +1541,8 @@ static LRESULT COMBO_GetTextA( LPHEADCOMBO lphc, INT count, LPSTR buf ) */ static void CBResetPos( LPHEADCOMBO lphc, - LPRECT rectEdit, - LPRECT rectLB, + const RECT *rectEdit, + const RECT *rectLB, BOOL bRedraw) { BOOL bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE); @@ -1804,7 +1804,7 @@ static void COMBO_MouseMove( LPHEADCOMBO lphc, WPARAM wParam, LPARAM lParam ) } } -static LRESULT COMBO_GetComboBoxInfo(LPHEADCOMBO lphc, COMBOBOXINFO *pcbi) +static LRESULT COMBO_GetComboBoxInfo(const HEADCOMBO *lphc, COMBOBOXINFO *pcbi) { if (!pcbi || (pcbi->cbSize < sizeof(COMBOBOXINFO))) return FALSE;

1 0

Hans Leidekker : usp10: Fully initialize LOGFONT structure.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 1e445c49329e3c6d241f8b113e567fb858e87e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e445c49329e3c6d241f8b113… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 8 19:18:14 2007 +0100 usp10: Fully initialize LOGFONT structure. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 052a0f4..1aba6db 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1217,7 +1217,7 @@ START_TEST(usp10) hdc = GetDC(hwnd); /* We now have a hdc */ ok( hdc != NULL, "HDC failed to be created %p\n", hdc); - memset(&lf, 0, sizeof(HFONT)); + memset(&lf, 0, sizeof(LOGFONTA)); lstrcpyA(lf.lfFaceName, "Symbol"); lf.lfHeight = 10; lf.lfWeight = 3;

1 0

Hans Leidekker : usp10: Fix a test to not rely on uninitialized memory.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 66c6b84ff090cb2a6a19cbc61d2be8f693d3d236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c6b84ff090cb2a6a19cbc61… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 8 19:18:22 2007 +0100 usp10: Fix a test to not rely on uninitialized memory. --- dlls/usp10/tests/usp10.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1aba6db..73615de 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -337,10 +337,11 @@ static void test_ScriptGetFontProperties(HDC hdc) ok( hr == E_INVALIDARG, "(hdc,&psc,NULL), expected E_INVALIDARG, got %08x\n", hr); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - /* Pass an uninitialized sfp */ + /* Pass an invalid sfp */ psc = NULL; + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES) - 1; hr = ScriptGetFontProperties(hdc,&psc,&sfp); - ok( hr == E_INVALIDARG, "(hdc,&psc,&sfp) partly uninitialized, expected E_INVALIDARG, got %08x\n", hr); + ok( hr == E_INVALIDARG, "(hdc,&psc,&sfp) invalid, expected E_INVALIDARG, got %08x\n", hr); ok( psc != NULL, "Expected a pointer in psc, got NULL\n"); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc);

1 0

Maarten Lankhorst : dsound: Use a 2 stage mixing/normalization for sound.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 4d1129f7859b6c777f0e281548d05e8ba5d5b3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1129f7859b6c777f0e28154… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Wed Nov 7 20:32:22 2007 +0100 dsound: Use a 2 stage mixing/normalization for sound. --- dlls/dsound/dsound.c | 5 +- dlls/dsound/dsound_private.h | 9 ++- dlls/dsound/mixer.c | 109 +++++++++++++++-------------------------- dlls/dsound/primary.c | 21 ++++++++- 4 files changed, 69 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d1129f7859b6c777f0e2…

1 0

Juan Lang : crypt32: Fix a couple leaks in test.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: f6bfa45970c8712a679cb0548acdbc70f27391ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bfa45970c8712a679cb0548… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 8 08:45:58 2007 -0800 crypt32: Fix a couple leaks in test. --- dlls/crypt32/tests/encode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 82d0344..1b1462d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4296,6 +4296,7 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) "Wrong issuer size %d\n", info->Issuer.cbData); ok(!memcmp(info->Issuer.pbData, encodedCommonName, info->Issuer.cbData), "Unexpected issuer\n"); + LocalFree(buf); } /* a real CRL from verisign that has extensions */ ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, @@ -4359,6 +4360,7 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) "Unexpected issuer\n"); ok(info->cExtension == 1, "Expected 1 extensions, got %d\n", info->cExtension); + LocalFree(buf); } ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_CRL_TO_BE_SIGNED, v2CRLWithExt, sizeof(v2CRLWithExt), CRYPT_DECODE_ALLOC_FLAG,

1 0

Juan Lang : crypt32: Fix another leak in tests.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 4c981e20ef9de97e0eddd1c48f5e134dfdf9d073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c981e20ef9de97e0eddd1c48… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 8 08:55:10 2007 -0800 crypt32: Fix another leak in tests. --- dlls/crypt32/tests/encode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 1b1462d..a06531c 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5036,6 +5036,7 @@ static void test_decodePKCSAttribute(DWORD dwEncoding) "Unexpected size %d\n", attr->rgValue[0].cbData); ok(!memcmp(attr->rgValue[0].pbData, ints[0].encoded, attr->rgValue[0].cbData), "Unexpected value\n"); + LocalFree(buf); } }

1 0

Juan Lang : crypt32: If a decoding function failed, free the memory allocated for it.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 2e4242b5453e661e186697a166cee259805f5ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4242b5453e661e186697a16… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 8 08:55:36 2007 -0800 crypt32: If a decoding function failed, free the memory allocated for it. --- dlls/crypt32/decode.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 8ceceac..3697c8a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -231,6 +231,14 @@ static BOOL CRYPT_DecodeEnsureSpace(DWORD dwFlags, return ret; } +static void CRYPT_FreeSpace(PCRYPT_DECODE_PARA pDecodePara, LPVOID pv) +{ + if (pDecodePara && pDecodePara->pfnFree) + pDecodePara->pfnFree(pv); + else + LocalFree(pv); +} + /* Helper function to check *pcbStructInfo and set it to the required size. * Assumes pvStructInfo is not NULL. */ @@ -540,6 +548,8 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], ret = CRYPT_AsnDecodeSequenceItems(items, cItem, ptr, dataLen, dwFlags, pvStructInfo, nextData, &cbDecoded); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, pvStructInfo); } } } @@ -727,6 +737,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, ptr += itemDecoded; } } + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, pvStructInfo); } } if (itemSizes != &itemSize)

1 0