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

Dmitry Timoshkov : shlwapi: Fix parameter types of SHGetIniStringW.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: f27e5299c96c1956d6f92073b900165d83829748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27e5299c96c1956d6f92073b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 16 13:11:27 2007 +0900 shlwapi: Fix parameter types of SHGetIniStringW. --- dlls/shlwapi/ordinal.c | 22 ++++------------------ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e8738f3..6ebabfa 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3088,24 +3088,10 @@ BOOL WINAPI PlaySoundWrapW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound) /************************************************************************* * @ [SHLWAPI.294] */ -BOOL WINAPI SHGetIniStringW(LPSTR str1, LPSTR str2, LPSTR pStr, DWORD some_len, LPCSTR lpStr2) -{ - /* - * str1: "I" "I" pushl esp+0x20 - * str2: "U" "I" pushl 0x77c93810 - * (is "I" and "U" "integer" and "unsigned" ??) - * - * pStr: "" "" pushl eax - * some_len: 0x824 0x104 pushl 0x824 - * lpStr2: "%l" "%l" pushl esp+0xc - * - * shlwapi. StrCpyNW(lpStr2, irrelevant_var, 0x104); - * LocalAlloc(0x00, some_len) -> irrelevant_var - * LocalAlloc(0x40, irrelevant_len) -> pStr - * shlwapi.294(str1, str2, pStr, some_len, lpStr2); - * shlwapi.PathRemoveBlanksW(pStr); - */ - FIXME("('%s', '%s', '%s', %08x, '%s'): stub!\n", str1, str2, pStr, some_len, lpStr2); +BOOL WINAPI SHGetIniStringW(LPCWSTR str1, LPCWSTR str2, LPWSTR pStr, DWORD some_len, LPCWSTR lpStr2) +{ + FIXME("(%s,%s,%p,%08x,%s): stub!\n", debugstr_w(str1), debugstr_w(str2), + pStr, some_len, debugstr_w(lpStr2)); return TRUE; } diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 5821865..bca51ee 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -291,7 +291,7 @@ 291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) 292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) 293 stub -noname SHCancelUserWorkItems -294 stdcall -noname SHGetIniStringW(long long long long long) +294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) 295 stdcall -noname SHSetIniStringW(wstr ptr wstr wstr) 296 stub -noname CreateURLFileContentsW 297 stub -noname CreateURLFileContentsA

1 0

Vitaliy Margolen : msvcrt: Preserve registers when calling unwind function.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: b25ad76a224b21db8062db5b8f28d6880417524b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25ad76a224b21db8062db5b8… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Jul 14 23:45:02 2007 -0600 msvcrt: Preserve registers when calling unwind function. --- dlls/msvcrt/except.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index aef5133..9af5ff2 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -84,7 +84,16 @@ static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void static inline int call_unwind_func( int (*func)(void), void *ebp ) { int ret; - __asm__ __volatile__ ("pushl %%ebp; movl %2,%%ebp; call *%0; popl %%ebp" + __asm__ __volatile__ ("pushl %%ebp\n\t" + "pushl %%ebx\n\t" + "pushl %%esi\n\t" + "pushl %%edi\n\t" + "movl %2,%%ebp\n\t" + "call *%0\n\t" + "popl %%edi\n\t" + "popl %%esi\n\t" + "popl %%ebx\n\t" + "popl %%ebp" : "=a" (ret) : "0" (func), "r" (ebp) : "ecx", "edx", "memory" );

1 0

Misha Koshelev : urlmon: Fix HttpProtocol behavior when InternetQueryDataAvailable returns ERROR_IO_PENDING .
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: fc48d6da73bc9d5c4f1cfde2b9b800e813363a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc48d6da73bc9d5c4f1cfde2b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Jul 15 16:32:28 2007 -0500 urlmon: Fix HttpProtocol behavior when InternetQueryDataAvailable returns ERROR_IO_PENDING. --- dlls/urlmon/http.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 926fc91..3914bdb 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -68,11 +68,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); * Continue is executed by the protocol sink. */ #define FLAG_REQUEST_COMPLETE 0x1 -#define FLAG_FIRST_DATA_REPORTED 0x2 -#define FLAG_ALL_DATA_READ 0x4 -#define FLAG_LAST_DATA_REPORTED 0x8 -#define FLAG_RESULT_REPORTED 0x10 -#define FLAG_CALLED_SWITCH 0x20 +#define FLAG_CALLED_SWITCH 0x2 +#define FLAG_FIRST_CONTINUE_COMPLETE 0x4 +#define FLAG_FIRST_DATA_REPORTED 0x8 +#define FLAG_ALL_DATA_READ 0x10 +#define FLAG_LAST_DATA_REPORTED 0x20 +#define FLAG_RESULT_REPORTED 0x40 typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; @@ -180,20 +181,15 @@ static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( case INTERNET_STATUS_REQUEST_COMPLETE: if (This->flags & FLAG_CALLED_SWITCH) return; - This->flags |= FLAG_CALLED_SWITCH; + This->flags |= FLAG_CALLED_SWITCH | FLAG_REQUEST_COMPLETE; /* PROTOCOLDATA same as native */ memset(&data, 0, sizeof(data)); data.dwState = 0xf1000000; - if (!(This->flags & FLAG_REQUEST_COMPLETE)) - { - This->flags |= FLAG_REQUEST_COMPLETE; - data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; - } - else - { + if (This->flags & FLAG_FIRST_CONTINUE_COMPLETE) data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS; - } + else + data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; IInternetProtocolSink_Switch(This->protocol_sink, &data); return; default: @@ -583,14 +579,23 @@ static HRESULT WINAPI HttpProtocol_Continue(IInternetProtocol *iface, PROTOCOLDA { This->content_length = atoiW(content_length); } + + This->flags |= FLAG_FIRST_CONTINUE_COMPLETE; } if (pProtocolData->pData >= (LPVOID)BINDSTATUS_DOWNLOADINGDATA) { if (!InternetQueryDataAvailable(This->request, &This->available_bytes, 0, 0)) { - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); - HTTPPROTOCOL_ReportResult(This, INET_E_DATA_NOT_AVAILABLE); + if (GetLastError() == ERROR_IO_PENDING) + { + This->flags &= ~FLAG_REQUEST_COMPLETE; + } + else + { + WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + HTTPPROTOCOL_ReportResult(This, INET_E_DATA_NOT_AVAILABLE); + } } else { @@ -658,6 +663,7 @@ static HRESULT WINAPI HttpProtocol_Read(IInternetProtocol *iface, void *pv, { if (GetLastError() == ERROR_IO_PENDING) { + This->flags &= ~FLAG_REQUEST_COMPLETE; hres = E_PENDING; } else

1 0

Juan Lang : crypt32: Partially implement updating decode messages.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 2cca297ba657c9ee03a1a7d271a4a0a4b6f599e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cca297ba657c9ee03a1a7d27… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 13 11:45:03 2007 -0700 crypt32: Partially implement updating decode messages. --- dlls/crypt32/msg.c | 111 +++++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/msg.c | 11 ----- 2 files changed, 106 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 78130d2..470bf58 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -607,9 +607,10 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, typedef struct _CDecodeMsg { - CryptMsgBase base; - DWORD type; - HCRYPTPROV crypt_prov; + CryptMsgBase base; + DWORD type; + HCRYPTPROV crypt_prov; + CRYPT_DATA_BLOB msg_data; } CDecodeMsg; static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) @@ -618,13 +619,111 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->crypt_prov, 0); + CryptMemFree(msg->msg_data.pbData); +} + +static BOOL CDecodeMsg_CopyData(CDecodeMsg *msg, const BYTE *pbData, + DWORD cbData) +{ + BOOL ret = TRUE; + + if (cbData) + { + if (msg->msg_data.cbData) + msg->msg_data.pbData = CryptMemRealloc(msg->msg_data.pbData, + msg->msg_data.cbData + cbData); + else + msg->msg_data.pbData = CryptMemAlloc(cbData); + if (msg->msg_data.pbData) + { + memcpy(msg->msg_data.pbData + msg->msg_data.cbData, pbData, cbData); + msg->msg_data.cbData += cbData; + } + else + ret = FALSE; + } + return ret; +} + +/* Decodes the content in blob as the type given, and updates the value + * (type, parameters, etc.) of msg based on what blob contains. + * It doesn't just use msg's type, to allow a recursive call from an implicitly + * typed message once the outer content info has been decoded. + */ +static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, + DWORD type) +{ + BOOL ret; + + switch (type) + { + case CMSG_DATA: + case CMSG_HASHED: + case CMSG_ENVELOPED: + case CMSG_SIGNED: + FIXME("unimplemented for type %s\n", MSG_TYPE_STR(type)); + ret = TRUE; + break; + default: + { + CRYPT_CONTENT_INFO *info; + DWORD size; + + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_CONTENT_INFO, + msg->msg_data.pbData, msg->msg_data.cbData, CRYPT_DECODE_ALLOC_FLAG, + NULL, (LPBYTE)&info, &size); + if (ret) + { + if (!strcmp(info->pszObjId, szOID_RSA_data)) + ret = CDecodeMsg_DecodeContent(msg, &info->Content, CMSG_DATA); + else if (!strcmp(info->pszObjId, szOID_RSA_digestedData)) + ret = CDecodeMsg_DecodeContent(msg, &info->Content, + CMSG_HASHED); + else if (!strcmp(info->pszObjId, szOID_RSA_envelopedData)) + ret = CDecodeMsg_DecodeContent(msg, &info->Content, + CMSG_ENVELOPED); + else if (!strcmp(info->pszObjId, szOID_RSA_signedData)) + ret = CDecodeMsg_DecodeContent(msg, &info->Content, + CMSG_SIGNED); + else + { + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + ret = FALSE; + } + LocalFree(info); + } + } + } + return ret; } static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal) { - FIXME("(%p, %p, %d, %d): stub\n", hCryptMsg, pbData, cbData, fFinal); - return FALSE; + CDecodeMsg *msg = (CDecodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); + + if (msg->base.streamed) + { + ret = CDecodeMsg_CopyData(msg, pbData, cbData); + FIXME("(%p, %p, %d, %d): streamed update stub\n", hCryptMsg, pbData, + cbData, fFinal); + } + else + { + if (!fFinal) + SetLastError(CRYPT_E_MSG_ERROR); + else + { + ret = CDecodeMsg_CopyData(msg, pbData, cbData); + if (ret) + ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, msg->type); + + } + } + return ret; } static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, @@ -673,6 +772,8 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, msg->crypt_prov = CRYPT_GetDefaultProvider(); msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } + msg->msg_data.cbData = 0; + msg->msg_data.pbData = NULL; } return msg; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index a41a310..17beca1 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -989,7 +989,6 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); /* Update with a full message in a final update */ ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* Can't update after a final update */ SetLastError(0xdeadbeef); @@ -1003,12 +1002,10 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), FALSE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); /* A subsequent final update succeeds */ ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); @@ -1035,7 +1032,6 @@ static void test_decode_msg_update(void) /* Empty non-final updates are allowed when streaming.. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* but final updates aren't when not enough data has been received. */ SetLastError(0xdeadbeef); @@ -1051,11 +1047,9 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); for (i = 0, ret = TRUE; ret && i < sizeof(dataEmptyContent); i++) ret = CryptMsgUpdate(msg, &dataEmptyContent[i], 1, FALSE); - todo_wine { ok(ret, "CryptMsgUpdate failed on byte %d: %x\n", i, GetLastError()); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); ok(ret, "CryptMsgUpdate failed on byte %d: %x\n", i, GetLastError()); - } CryptMsgClose(msg); todo_wine check_updates("byte-by-byte empty content", &a4, &accum); @@ -1065,7 +1059,6 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); CryptMsgClose(msg); @@ -1092,7 +1085,6 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* but decoding it as an explicitly typed message fails. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, @@ -1111,7 +1103,6 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, dataEmptyBareContent, sizeof(dataEmptyBareContent), TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); CryptMsgClose(msg); @@ -1120,7 +1111,6 @@ static void test_decode_msg_update(void) NULL); ret = CryptMsgUpdate(msg, dataEmptyBareContent, sizeof(dataEmptyBareContent), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); @@ -1128,7 +1118,6 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, bogusOIDContent, sizeof(bogusOIDContent), TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); CryptMsgClose(msg);

1 0

H. Verbeet : wined3d: Fix STATE_IS_ACTIVELIGHT.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: cb4c9b620840be1c51ea0e99ba4245e876aad3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4c9b620840be1c51ea0e99b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jul 15 23:46:06 2007 +0200 wined3d: Fix STATE_IS_ACTIVELIGHT. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1169310..07a9db3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -467,7 +467,7 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, #define STATE_IS_PIXELSHADERCONSTANT(a) ((a) == STATE_PIXELSHADERCONSTANT) #define STATE_ACTIVELIGHT(a) (STATE_PIXELSHADERCONSTANT + (a) + 1) -#define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_PIXELSHADERCONSTANT(MAX_ACTIVE_LIGHTS)) +#define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS)) #define STATE_SCISSORRECT (STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS - 1) + 1) #define STATE_IS_SCISSORRECT(a) ((a) == STATE_SCISSORRECT)

1 0

Juan Lang : crypt32: Store crypt provider in decode message.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 6a07ca44420076056467742f780b445b91fd0af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a07ca44420076056467742f7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 13 10:58:10 2007 -0700 crypt32: Store crypt provider in decode message. --- dlls/crypt32/msg.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index e97aa0c..78130d2 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -666,6 +666,13 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, CDecodeMsg_Close, CDecodeMsg_GetParam, CDecodeMsg_Update); msg->type = dwMsgType; + if (hCryptProv) + msg->crypt_prov = hCryptProv; + else + { + msg->crypt_prov = CRYPT_GetDefaultProvider(); + msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; + } } return msg; }

1 0

Alec Berryman : itss: Replace malloc/free with HeapAlloc/HeapFree.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 6b266a7610a373de043b4ebd95166056b0bfc156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b266a7610a373de043b4ebd9… Author: Alec Berryman <alec(a)thened.net> Date: Sat Jul 14 12:33:42 2007 -0500 itss: Replace malloc/free with HeapAlloc/HeapFree. --- dlls/itss/chm_lib.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index cd69448..788ec54 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -627,8 +627,8 @@ static void chm_set_param(struct chmFile *h, int i; /* allocate new cached blocks */ - newBlocks = malloc(paramVal * sizeof (UChar *)); - newIndices = malloc(paramVal * sizeof (UInt64)); + newBlocks = HeapAlloc(GetProcessHeap(), 0, paramVal * sizeof (UChar *)); + newIndices = HeapAlloc(GetProcessHeap(), 0, paramVal * sizeof (UInt64)); for (i=0; i<paramVal; i++) { newBlocks[i] = NULL; @@ -647,7 +647,7 @@ static void chm_set_param(struct chmFile *h, /* in case of collision, destroy newcomer */ if (newBlocks[newSlot]) { - free(h->cache_blocks[i]); + HeapFree(GetProcessHeap(), 0, h->cache_blocks[i]); h->cache_blocks[i] = NULL; } else @@ -659,8 +659,8 @@ static void chm_set_param(struct chmFile *h, } } - free(h->cache_blocks); - free(h->cache_block_indices); + HeapFree(GetProcessHeap(), 0, h->cache_blocks); + HeapFree(GetProcessHeap(), 0, h->cache_block_indices); } /* now, set new values */ @@ -692,7 +692,7 @@ struct chmFile *chm_openW(const WCHAR *filename) struct chmLzxcControlData ctlData; /* allocate handle */ - newHandle = malloc(sizeof(struct chmFile)); + newHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(struct chmFile)); newHandle->fd = CHM_NULL_FD; newHandle->lzx_state = NULL; newHandle->cache_blocks = NULL; @@ -708,7 +708,7 @@ struct chmFile *chm_openW(const WCHAR *filename) FILE_ATTRIBUTE_NORMAL, NULL)) == CHM_NULL_FD) { - free(newHandle); + HeapFree(GetProcessHeap(), 0, newHandle); return NULL; } @@ -855,16 +855,16 @@ void chm_close(struct chmFile *h) for (i=0; i<h->cache_num_blocks; i++) { if (h->cache_blocks[i]) - free(h->cache_blocks[i]); + HeapFree(GetProcessHeap(), 0, h->cache_blocks[i]); } - free(h->cache_blocks); + HeapFree(GetProcessHeap(), 0, h->cache_blocks); h->cache_blocks = NULL; } - free(h->cache_block_indices); + HeapFree(GetProcessHeap(), 0, h->cache_block_indices); h->cache_block_indices = NULL; - free(h); + HeapFree(GetProcessHeap(), 0, h); } } @@ -1193,7 +1193,9 @@ static Int64 _chm_decompress_block(struct chmFile *h, indexSlot = (int)((curBlockIdx) % h->cache_num_blocks); h->cache_block_indices[indexSlot] = curBlockIdx; if (! h->cache_blocks[indexSlot]) - h->cache_blocks[indexSlot] = malloc( (unsigned int)(h->reset_table.block_len)); + h->cache_blocks[indexSlot] = + HeapAlloc(GetProcessHeap(), 0, + (unsigned int)(h->reset_table.block_len)); lbuffer = h->cache_blocks[indexSlot]; /* decompress the previous block */ @@ -1231,7 +1233,8 @@ static Int64 _chm_decompress_block(struct chmFile *h, indexSlot = (int)(block % h->cache_num_blocks); h->cache_block_indices[indexSlot] = block; if (! h->cache_blocks[indexSlot]) - h->cache_blocks[indexSlot] = malloc( ((unsigned int)h->reset_table.block_len)); + h->cache_blocks[indexSlot] = + HeapAlloc(GetProcessHeap(), 0, ((unsigned int)h->reset_table.block_len)); lbuffer = h->cache_blocks[indexSlot]; *ubuffer = lbuffer;

1 0

Juan Lang : crypt32: Implement decoding data messages ( when opened in non-streaming mode).
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 76061f403b0a2491803259ef30293fcdfa6a2d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76061f403b0a2491803259ef3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 13 11:47:46 2007 -0700 crypt32: Implement decoding data messages (when opened in non-streaming mode). --- dlls/crypt32/msg.c | 19 ++++++++++++++----- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 470bf58..854ee7c 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -607,10 +607,11 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, typedef struct _CDecodeMsg { - CryptMsgBase base; - DWORD type; - HCRYPTPROV crypt_prov; - CRYPT_DATA_BLOB msg_data; + CryptMsgBase base; + DWORD type; + HCRYPTPROV crypt_prov; + CRYPT_DATA_BLOB msg_data; + PCRYPT_DATA_BLOB data; /* for type == CMSG_DATA */ } CDecodeMsg; static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) @@ -620,6 +621,7 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->crypt_prov, 0); CryptMemFree(msg->msg_data.pbData); + LocalFree(msg->data); } static BOOL CDecodeMsg_CopyData(CDecodeMsg *msg, const BYTE *pbData, @@ -654,10 +656,17 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, DWORD type) { BOOL ret; + DWORD size; switch (type) { case CMSG_DATA: + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, + blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + (LPBYTE)&msg->data, &size); + if (ret) + msg->type = CMSG_DATA; + break; case CMSG_HASHED: case CMSG_ENVELOPED: case CMSG_SIGNED: @@ -667,7 +676,6 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, default: { CRYPT_CONTENT_INFO *info; - DWORD size; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, PKCS_CONTENT_INFO, msg->msg_data.pbData, msg->msg_data.cbData, CRYPT_DECODE_ALLOC_FLAG, @@ -774,6 +782,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, } msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL; + msg->data = NULL; } return msg; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 17beca1..1293070 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1092,7 +1092,6 @@ static void test_decode_msg_update(void) SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); CryptMsgClose(msg);

1 0

Juan Lang : crypt32: Add test showing extra trailing bytes should be tolerated in encoded data.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 01685bca0e3a5eedfda8f5b18a4f769b5450dffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=01685bca0e3a5eedfda8f5b18… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 13 10:08:50 2007 -0700 crypt32: Add test showing extra trailing bytes should be tolerated in encoded data. --- dlls/crypt32/tests/encode.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 52603e5..881f6cb 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -200,6 +200,7 @@ static void test_decodeInt(DWORD dwEncoding) static const BYTE testStr[] = { 0x16, 4, 't', 'e', 's', 't' }; static const BYTE longForm[] = { 2, 0x81, 0x01, 0x01 }; static const BYTE bigBogus[] = { 0x02, 0x84, 0x01, 0xff, 0xff, 0xf9 }; + static const BYTE extraBytes[] = { 2, 1, 1, 0, 0, 0, 0 }; BYTE *buf = NULL; DWORD bufSize = 0; int i; @@ -310,6 +311,15 @@ static void test_decodeInt(DWORD dwEncoding) ok(*(int *)buf == 1, "Expected 1, got %d\n", *(int *)buf); LocalFree(buf); } + /* check with extra bytes at the end */ + ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, extraBytes, + sizeof(extraBytes), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(*(int *)buf == 1, "Expected 1, got %d\n", *(int *)buf); + LocalFree(buf); + } /* Try to decode some bogus large items */ /* The buffer size is smaller than the encoded length, so this should fail * with CRYPT_E_ASN1_EOD if it's being decoded. @@ -969,6 +979,11 @@ static void compareNames(const CERT_NAME_INFO *expected, } } +static const BYTE twoRDNsExtraBytes[] = { + 0x30,0x23,0x31,0x21,0x30,0x0c,0x06,0x03,0x55,0x04,0x04, + 0x13,0x05,0x4c,0x61,0x6e,0x67,0x00,0x30,0x11,0x06,0x03,0x55,0x04,0x03, + 0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0,0,0,0,0,0}; + static void test_decodeName(DWORD dwEncoding) { BYTE *buf = NULL; @@ -1035,6 +1050,11 @@ static void test_decodeName(DWORD dwEncoding) compareNames(&info, (CERT_NAME_INFO *)buf); LocalFree(buf); } + /* test that two RDN attrs with extra bytes succeeds */ + bufSize = 0; + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, twoRDNsExtraBytes, + sizeof(twoRDNsExtraBytes), 0, NULL, NULL, &bufSize); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); /* And, a slightly more complicated name */ buf = NULL; bufSize = 0; @@ -1257,6 +1277,7 @@ static void test_decodeNameValue(DWORD dwEncoding) } static const BYTE emptyURL[] = { 0x30, 0x02, 0x86, 0x00 }; +static const BYTE emptyURLExtraBytes[] = { 0x30, 0x02, 0x86, 0x00, 0, 0, 0 }; static const WCHAR url[] = { 'h','t','t','p',':','/','/','w','i','n','e', 'h','q','.','o','r','g',0 }; static const BYTE encodedURL[] = { 0x30, 0x13, 0x86, 0x11, 0x68, 0x74, @@ -1412,6 +1433,9 @@ static void test_decodeAltName(DWORD dwEncoding) "Expected empty URL\n"); LocalFree(buf); } + ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, + emptyURLExtraBytes, sizeof(emptyURLExtraBytes), 0, NULL, NULL, &bufSize); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedURL, encodedURL[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); @@ -4535,6 +4559,8 @@ static void test_decodeAuthorityKeyId2(DWORD dwEncoding) } static const BYTE emptyPKCSContentInfo[] = { 0x30,0x04,0x06,0x02,0x2a,0x03 }; +static const BYTE emptyPKCSContentInfoExtraBytes[] = { 0x30,0x04,0x06,0x02,0x2a, + 0x03,0,0,0,0,0,0 }; static const BYTE bogusPKCSContentInfo[] = { 0x30,0x07,0x06,0x02,0x2a,0x03, 0xa0,0x01,0x01 }; static const BYTE intPKCSContentInfo[] = { 0x30,0x09,0x06,0x02,0x2a,0x03,0xa0, @@ -4613,6 +4639,11 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) info->Content.cbData); LocalFree(buf); } + ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, + emptyPKCSContentInfoExtraBytes, sizeof(emptyPKCSContentInfoExtraBytes), + 0, NULL, NULL, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, bogusPKCSContentInfo, sizeof(bogusPKCSContentInfo),

1 0

Juan Lang : crypt32: Fix decoding sequences with extra trailing data.
by Alexandre Julliard July 16, 2007

July 16, 2007

Module: wine Branch: master Commit: 8dcd9e4279ef6601440b92fd94a30e046be589da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcd9e4279ef6601440b92fd9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 13 10:35:58 2007 -0700 crypt32: Fix decoding sequences with extra trailing data. --- dlls/crypt32/decode.c | 74 +++++++++++++++++++++++++++++++++---------- dlls/crypt32/tests/crl.c | 8 +--- dlls/crypt32/tests/encode.c | 4 +-- 3 files changed, 60 insertions(+), 26 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d3f3322..3a3a195 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -297,15 +297,21 @@ struct AsnDecodeSequenceItem DWORD size; }; +/* Decodes the items in a sequence, where the items are described in items, + * the encoded data are in pbEncoded with length cbEncoded. Decodes into + * pvStructInfo. nextData is a pointer to the memory location at which the + * first decoded item with a dynamic pointer should point. + * Upon decoding, *cbDecoded is the total number of bytes decoded. + */ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, struct AsnDecodeSequenceItem items[], DWORD cItem, const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, BYTE *nextData) + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, BYTE *nextData, + DWORD *cbDecoded) { BOOL ret; - DWORD i; - const BYTE *ptr; + DWORD i, decoded = 0; + const BYTE *ptr = pbEncoded; - ptr = pbEncoded + 1 + GET_LEN_BYTES(pbEncoded[1]); for (i = 0, ret = TRUE; ret && i < cItem; i++) { if (cbEncoded - (ptr - pbEncoded) != 0) @@ -353,6 +359,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, items[i].size += sizeof(DWORD) - items[i].size % sizeof(DWORD); ptr += 1 + nextItemLenBytes + nextItemLen; + decoded += 1 + nextItemLenBytes + nextItemLen; } else if (items[i].optional && GetLastError() == CRYPT_E_ASN1_BADTAG) @@ -367,7 +374,10 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, GetLastError()); } else + { + decoded += 1 + nextItemLenBytes + nextItemLen; items[i].size = items[i].minSize; + } } else if (items[i].optional) { @@ -395,13 +405,8 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, ret = FALSE; } } - if (cbEncoded - (ptr - pbEncoded) != 0) - { - TRACE("%d remaining bytes, failing\n", cbEncoded - - (ptr - pbEncoded)); - SetLastError(CRYPT_E_ASN1_CORRUPT); - ret = FALSE; - } + if (ret) + *cbDecoded = decoded; return ret; } @@ -412,7 +417,6 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, * data will be stored. If you know the starting offset, you may pass it * here. Otherwise, pass NULL, and one will be inferred from the items. * Each item decoder is never called with CRYPT_DECODE_ALLOC_FLAG set. - * If any undecoded data are left over, fails with CRYPT_E_ASN1_CORRUPT. */ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, struct AsnDecodeSequenceItem items[], DWORD cItem, const BYTE *pbEncoded, @@ -431,13 +435,30 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) { - DWORD i; + DWORD lenBytes = GET_LEN_BYTES(pbEncoded[1]), cbDecoded; + const BYTE *ptr = pbEncoded + 1 + lenBytes; - ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, pbEncoded, - cbEncoded, dwFlags, NULL, NULL); + cbEncoded -= 1 + lenBytes; + if (cbEncoded < dataLen) + { + TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen, + cbEncoded); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else + ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, ptr, + cbEncoded, dwFlags, NULL, NULL, &cbDecoded); + if (ret && cbDecoded != dataLen) + { + TRACE("expected %d decoded, got %d, failing\n", dataLen, + cbDecoded); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } if (ret) { - DWORD bytesNeeded = 0, structSize = 0; + DWORD i, bytesNeeded = 0, structSize = 0; for (i = 0; i < cItem; i++) { @@ -459,7 +480,8 @@ static BOOL CRYPT_AsnDecodeSequence(DWORD dwCertEncodingType, nextData = (BYTE *)pvStructInfo + structSize; memset(pvStructInfo, 0, structSize); ret = CRYPT_AsnDecodeSequenceItems(dwFlags, items, cItem, - pbEncoded, cbEncoded, dwFlags, pvStructInfo, nextData); + ptr, cbEncoded, dwFlags, pvStructInfo, nextData, + &cbDecoded); } } } @@ -872,6 +894,24 @@ static BOOL WINAPI CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType, ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); + if (ret && pvStructInfo) + { + CERT_INFO *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + info = *(CERT_INFO **)pvStructInfo; + else + info = (CERT_INFO *)pvStructInfo; + if (!info->SerialNumber.cbData || !info->Issuer.cbData || + !info->Subject.cbData) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + /* Don't need to deallocate, because it should have failed on the + * first pass (and no memory was allocated.) + */ + ret = FALSE; + } + } TRACE("Returning %d (%08x)\n", ret, GetLastError()); return ret; diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 462d89f..7ecf6d4 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -98,14 +98,10 @@ static void testCreateCRL(void) "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", GLE); context = CertCreateCRLContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); GLE = GetLastError(); - ok(!context && (GLE == CRYPT_E_ASN1_CORRUPT || GLE == OSS_DATA_ERROR), - "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", GLE); + ok(!context, "Expected failure\n"); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL) - 1); - ok(!context && (GLE == CRYPT_E_ASN1_EOD || GLE == CRYPT_E_ASN1_CORRUPT || - GLE == OSS_DATA_ERROR), - "Expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", - GLE); + ok(!context, "Expected failure\n"); context = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL)); ok(context != NULL, "CertCreateCRLContext failed: %08x\n", GetLastError()); diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 881f6cb..8173a12 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2765,8 +2765,7 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, corruptCerts[i], corruptCerts[i][1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT), - "Expected CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); + ok(!ret, "Expected failure\n"); } /* Now check with serial number, subject and issuer specified */ ret = CryptDecodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, bigCert, @@ -4642,7 +4641,6 @@ static void test_decodePKCSContentInfo(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO, emptyPKCSContentInfoExtraBytes, sizeof(emptyPKCSContentInfoExtraBytes), 0, NULL, NULL, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptDecodeObjectEx(dwEncoding, PKCS_CONTENT_INFO,

1 0