February 2018 - Wine-commits

Józef Kucia : d3d10core/tests: Add test for resource access flags.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 6801cc140f776ea08f3a62680bc0d4f257626346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6801cc140f776ea08f3a6268… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 1 09:50:33 2018 +0100 d3d10core/tests: Add test for resource access flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 330 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 330 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6801cc140f776ea08f3a…

1 0

Zebediah Figura : dbghelp: Avoid an infinite loop.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 5d740ddcfed5da981e2741610937e879b184004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d740ddcfed5da981e274161… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 31 22:03:12 2018 -0600 dbghelp: Avoid an infinite loop. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 99b5c17..67b710c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -712,6 +712,7 @@ static void* x86_64_find_runtime_function(struct module* module, DWORD64 addr while (rtf->UnwindData & 1) /* follow chained entry */ { FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n"); + return NULL; /* we need to read into the other process */ /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */ }

1 0

Dmitry Timoshkov : secur32: Implement LsaFreeReturnBuffer.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 9be9415576277a8134cbdb34bd6fb04fae3a8412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be9415576277a8134cbdb34… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 14:56:15 2018 +0800 secur32: Implement LsaFreeReturnBuffer. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 35df4ce..3a99135 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -113,9 +113,10 @@ NTSTATUS WINAPI LsaEnumerateLogonSessions(PULONG LogonSessionCount, return STATUS_SUCCESS; } -NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID Buffer) +NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID buffer) { - FIXME("%p stub\n", Buffer); + TRACE("%p\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); return STATUS_SUCCESS; }

1 0

Michael Stefaniuc : ieframe: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: b662f0c2ec14e29767487d10acf5cdb9837a3e09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b662f0c2ec14e29767487d10… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:41:03 2018 +0100 ieframe: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 3e6ac6c..8adf47e 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -38,6 +38,7 @@ #include "docobjectservice.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" typedef struct ConnectionPoint ConnectionPoint; @@ -334,26 +335,6 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : jscript: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: eb168bcbbfbe6e1cb420bffb17856c160524bc90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb168bcbbfbe6e1cb420bffb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:02 2018 +0100 jscript: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 756d7cf..1a24751 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -31,6 +31,7 @@ #include "resource.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" typedef struct _jsval_t jsval_t; @@ -54,26 +55,6 @@ void heap_pool_clear(heap_pool_t*) DECLSPEC_HIDDEN; void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; heap_pool_t *heap_pool_mark(heap_pool_t*) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : mshtml: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 11e706785e9dd5870e9cb892265b87382b172cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11e706785e9dd5870e9cb892… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:04 2018 +0100 mshtml: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51a1add..ea38a66 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -30,6 +30,7 @@ #include "tlogstg.h" #include "shdeprecated.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/rbtree.h" #include "wine/unicode.h" @@ -1176,31 +1177,11 @@ DEFINE_GUID(IID_IDispatchJS,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Jacek Caban : crypt32: Support constructed strings in octet strings decoder.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 7a5209c66e37f27f58dfe6042087810b912f9b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5209c66e37f27f58dfe604… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 1 01:27:28 2018 +0100 crypt32: Support constructed strings in octet strings decoder. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 146 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 117 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a5209c66e37f27f58df…

1 0

Jacek Caban : crypt32/tests: Added more decoding tests.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: ced1b9ba600e18877a86d06cf31b075f4a87f5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced1b9ba600e18877a86d06c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 1 01:27:38 2018 +0100 crypt32/tests: Added more decoding tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 238 +++++++++++++++++++++++++++++--------------- 1 file changed, 157 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ced1b9ba600e18877a86…

1 0

Jacek Caban : crypt32: Fixed decoded size calculation in CRYPT_AsnDecodeSequence when indefinite length is used.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 2a2ecdd564609e8ae68d66ff598cd62e0551bc46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2ecdd564609e8ae68d66ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 1 01:27:53 2018 +0100 crypt32: Fixed decoded size calculation in CRYPT_AsnDecodeSequence when indefinite length is used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 1 + dlls/crypt32/tests/encode.c | 105 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7d65912..8b84388 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -479,6 +479,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], { dataLen = cbEncoded; indefinite = TRUE; + lenBytes += 2; } else if (cbEncoded < dataLen) { diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 53ec20b..a4daec0 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3368,18 +3368,76 @@ static const BYTE hash[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf }; static const BYTE signedBigCert[] = { - 0x30, 0x81, 0x93, 0x30, 0x7a, 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, - 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, - 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, - 0x00, 0x03, 0x11, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, - 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 }; + ASN_SEQUENCE,0x81,147, + ASN_SEQUENCE,122, + ASN_INTEGER,1, 0x01, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_SEQUENCE,21, + 0x31,19, + ASN_SEQUENCE,17, + ASN_OBJECTIDENTIFIER,3, 0x55,0x04,0x03, + 0x13,10, 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, + ASN_SEQUENCE,34, + 0x18,15, 0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, + 0x18,15, 0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, + ASN_SEQUENCE,21, + 0x31,19, + ASN_SEQUENCE,17, + ASN_OBJECTIDENTIFIER,3, 0x55,0x04,0x03, + 0x13,10, 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, + ASN_SEQUENCE,7, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_BITS,1, 0x00, + 0xa3,22, + ASN_SEQUENCE,20, + ASN_SEQUENCE,18, + ASN_OBJECTIDENTIFIER,3, 0x55,0x1d,0x13, + 0x01,1, 0xff, + ASN_OCTETSTRING,8, 0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_BITS,17, 0x00,0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08, + 0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00 +}; + +static const BYTE signedBigCertWithIndefiniteSeq[] = { + ASN_SEQUENCE,0x81,151, + ASN_SEQUENCE,126, + ASN_INTEGER,1, 0x01, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_SEQUENCE,21, + 0x31,19, + ASN_SEQUENCE,17, + ASN_OBJECTIDENTIFIER,3, 0x55,0x04,0x03, + 0x13,10, 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, + ASN_SEQUENCE,0x80, + 0x18,15, 0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, + 0x18,15, 0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, + 0,0, + ASN_SEQUENCE,21, + 0x31,19, + ASN_SEQUENCE,17, + ASN_OBJECTIDENTIFIER,3, 0x55,0x04,0x03, + 0x13,10, 0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, + ASN_SEQUENCE,0x80, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_BITS,1, 0x00, + 0,0, + 0xa3,22, + ASN_SEQUENCE,20, + ASN_SEQUENCE,18, + ASN_OBJECTIDENTIFIER,3, 0x55,0x1d,0x13, + 0x01,1, 0xff, + ASN_OCTETSTRING,8, 0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01, + ASN_SEQUENCE,2, + ASN_OBJECTIDENTIFIER,0, + ASN_BITS,17, 0x00,0x0f,0x0e,0x0d,0x0c,0x0b,0x0a,0x09,0x08, + 0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00 +}; static void test_encodeCert(DWORD dwEncoding) { @@ -3451,6 +3509,29 @@ static void test_decodeCert(DWORD dwEncoding) info->Subject.cbData), "Unexpected subject\n"); LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, signedBigCertWithIndefiniteSeq, + sizeof(signedBigCertWithIndefiniteSeq), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + 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"); + LocalFree(buf); + } } static const BYTE emptyDistPoint[] = { 0x30, 0x02, 0x30, 0x00 };

1 0

Jacek Caban : crypt32: Always set returned size in CRYPT_CopySignerInfo.
by Alexandre Julliard 01 Feb '18

01 Feb '18

Module: wine Branch: master Commit: 39ba0bbe437498ee6252694f771e686e7e7b98af URL: https://source.winehq.org/git/wine.git/?a=commit;h=39ba0bbe437498ee6252694f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 1 01:28:02 2018 +0100 crypt32: Always set returned size in CRYPT_CopySignerInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 3 +-- dlls/crypt32/tests/msg.c | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 80b2de7..fd43a7b 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2727,12 +2727,10 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, size += CRYPT_SizeOfAttributes(&in->UnauthAttrs); if (!pvData) { - *pcbData = size; ret = TRUE; } else if (*pcbData < size) { - *pcbData = size; SetLastError(ERROR_MORE_DATA); ret = FALSE; } @@ -2765,6 +2763,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); } } + *pcbData = size; TRACE("returning %d\n", ret); return ret; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index e9887b0..c240533 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2857,7 +2857,7 @@ static void test_decode_msg_get_param(void) HCRYPTPROV hCryptProv; HCRYPTKEY key = 0; BOOL ret; - DWORD size = 0, value; + DWORD size = 0, value, req_size; LPBYTE buf; CMSG_CTRL_DECRYPT_PARA decryptPara = { sizeof(decryptPara), 0 }; @@ -2947,7 +2947,10 @@ static void test_decode_msg_get_param(void) signer.SerialNumber.cbData = sizeof(serialNum); signer.SerialNumber.pbData = serialNum; signer.HashAlgorithm.pszObjId = oid_rsa_md5; + req_size = size; + size += 10; CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, buf, &size); + ok(size == req_size, "size = %u, expected %u\n", size, req_size); compare_signer_info((CMSG_SIGNER_INFO *)buf, &signer); CryptMemFree(buf); }

1 0