August 2008 - Wine-commits - list.winehq.org

Roy Shea : mstask/tests: Conformance test for (Set|Get)Parameters.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: cd8ac273046614430cf6d4359886442b7acd4bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8ac273046614430cf6d4359… Author: Roy Shea <royshea(a)gmail.com> Date: Wed Aug 20 17:44:30 2008 -0700 mstask/tests: Conformance test for (Set|Get)Parameters. --- dlls/mstask/tests/task.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 48f87f2..ac797a1 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -230,10 +230,81 @@ static void test_CreateTrigger(void) return; } +static void test_SetParameters_GetParameters(void) +{ + BOOL setup; + HRESULT hres; + LPWSTR parameters; + const WCHAR parameters_a[] = {'f','o','o','.','t','x','t', 0}; + const WCHAR parameters_b[] = {'f','o','o','.','t','x','t',' ', + 'b','a','r','.','t','x','t', 0}; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + /* Get parameters before setting them */ + hres = ITask_GetParameters(test_task, &parameters); + todo_wine ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(parameters, empty), + "Got %s, expected empty string\n", dbgstr_w(parameters)); + CoTaskMemFree(parameters); + } + + /* Set parameters to a simple string */ + hres = ITask_SetParameters(test_task, parameters_a); + todo_wine ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + dbgstr_w(parameters_a), hres); + hres = ITask_GetParameters(test_task, &parameters); + todo_wine ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(parameters, parameters_a), "Got %s, expected %s\n", + dbgstr_w(parameters), dbgstr_w(parameters_a)); + CoTaskMemFree(parameters); + } + + /* Update parameters to a different simple string */ + hres = ITask_SetParameters(test_task, parameters_b); + todo_wine ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + dbgstr_w(parameters_b), hres); + hres = ITask_GetParameters(test_task, &parameters); + todo_wine ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(parameters, parameters_b), "Got %s, expected %s\n", + dbgstr_w(parameters), dbgstr_w(parameters_b)); + CoTaskMemFree(parameters); + } + + /* Clear parameters */ + hres = ITask_SetParameters(test_task, empty); + todo_wine ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + dbgstr_w(empty), hres); + hres = ITask_GetParameters(test_task, &parameters); + todo_wine ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(parameters, empty), + "Got %s, expected empty string\n", dbgstr_w(parameters)); + CoTaskMemFree(parameters); + } + + cleanup_task(); + return; +} + START_TEST(task) { CoInitialize(NULL); test_SetApplicationName_GetApplicationName(); test_CreateTrigger(); + test_SetParameters_GetParameters(); CoUninitialize(); }

1 0

Roy Shea : mstask/tests: Conformance test for (Set|Get)Comment.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 7cca21426adbc0fda58adff763d5fc5409283a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cca21426adbc0fda58adff76… Author: Roy Shea <royshea(a)gmail.com> Date: Wed Aug 20 17:45:03 2008 -0700 mstask/tests: Conformance test for (Set|Get)Comment. --- dlls/mstask/tests/task.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index ac797a1..749eb55 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -300,11 +300,82 @@ static void test_SetParameters_GetParameters(void) return; } +static void test_SetComment_GetComment(void) +{ + BOOL setup; + HRESULT hres; + LPWSTR comment; + const WCHAR comment_a[] = {'C','o','m','m','e','n','t','.', 0}; + const WCHAR comment_b[] = {'L','o','n','g','e','r',' ', + 'c','o','m','m','e','n','t','.', 0}; + + setup = setup_task(); + ok(setup, "Failed to setup test_task\n"); + if (!setup) + { + skip("Failed to create task. Skipping tests.\n"); + return; + } + + /* Get comment before setting it*/ + hres = ITask_GetComment(test_task, &comment); + todo_wine ok(hres == S_OK, "GetComment failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(comment, empty), + "Got %s, expected empty string\n", dbgstr_w(comment)); + CoTaskMemFree(comment); + } + + /* Set comment to a simple string */ + hres = ITask_SetComment(test_task, comment_a); + todo_wine ok(hres == S_OK, "Failed setting comment %s: %08x\n", + dbgstr_w(comment_a), hres); + hres = ITask_GetComment(test_task, &comment); + todo_wine ok(hres == S_OK, "GetComment failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(comment, comment_a), "Got %s, expected %s\n", + dbgstr_w(comment), dbgstr_w(comment_a)); + CoTaskMemFree(comment); + } + + /* Update comment to a different simple string */ + hres = ITask_SetComment(test_task, comment_b); + todo_wine ok(hres == S_OK, "Failed setting comment %s: %08x\n", + dbgstr_w(comment_b), hres); + hres = ITask_GetComment(test_task, &comment); + todo_wine ok(hres == S_OK, "GetComment failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(comment, comment_b), "Got %s, expected %s\n", + dbgstr_w(comment), dbgstr_w(comment_b)); + CoTaskMemFree(comment); + } + + /* Clear comment */ + hres = ITask_SetComment(test_task, empty); + todo_wine ok(hres == S_OK, "Failed setting comment %s: %08x\n", + dbgstr_w(empty), hres); + hres = ITask_GetComment(test_task, &comment); + todo_wine ok(hres == S_OK, "GetComment failed: %08x\n", hres); + if (hres == S_OK) + { + todo_wine ok(!lstrcmpW(comment, empty), + "Got %s, expected empty string\n", dbgstr_w(comment)); + CoTaskMemFree(comment); + } + + cleanup_task(); + return; +} + START_TEST(task) { CoInitialize(NULL); test_SetApplicationName_GetApplicationName(); test_CreateTrigger(); test_SetParameters_GetParameters(); + test_SetComment_GetComment(); CoUninitialize(); }

1 0

H. Verbeet : mountmgr: Include the terminating NULL in mount ids.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 5ab440e3987542b57ad1075451cbd256aec5b6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab440e3987542b57ad107545… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Aug 20 22:46:10 2008 +0200 mountmgr: Include the terminating NULL in mount ids. Some "protection" schemes expect these to be at least 2 bytes long. --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 73e2554..b9e96dc 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -423,7 +423,7 @@ static void create_drive_mount_points( DRIVER_OBJECT *driver ) { *p = 'a' + i; if (!(link = read_symlink( buffer ))) continue; - add_mount_point( driver, DRIVE_FIXED, i, link, strlen(link) ); + add_mount_point( driver, DRIVE_FIXED, i, link, strlen(link) + 1 ); RtlFreeHeap( GetProcessHeap(), 0, link ); } RtlFreeHeap( GetProcessHeap(), 0, buffer );

1 0

Huw Davies : crypt32: Initialize the size to zero.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: b77ba1babf147d50c7b50f064838e4a70032ad01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77ba1babf147d50c7b50f064… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 20 14:32:09 2008 +0100 crypt32: Initialize the size to zero. --- dlls/crypt32/serialize.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index f55302d..32a9ca0 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -798,7 +798,7 @@ static BOOL CRYPT_SaveSerializedToMem(HCERTSTORE store, DWORD dwMsgAndCertEncodingType, void *handle) { CERT_BLOB *blob = (CERT_BLOB *)handle; - DWORD size; + DWORD size = 0; BOOL ret; ret = CRYPT_WriteSerializedStoreToStream(store, CRYPT_CountSerializedBytes,

1 0

H. Verbeet : wined3d: Don't free backends if they're not created yet.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: c33e03cca36a60b15f82cc2a802cf719489bdf7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c33e03cca36a60b15f82cc2a8… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Aug 20 22:45:02 2008 +0200 wined3d: Don't free backends if they're not created yet. This would crash if CreateAdditionalSwapChain() failed. --- dlls/wined3d/device.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e1e01e2..69a7642 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2259,9 +2259,15 @@ err_out: IWineD3DStateBlock_Release((IWineD3DStateBlock *) This->stateBlock); This->stateBlock = NULL; } - This->blitter->free_private(iface); - This->frag_pipe->free_private(iface); - This->shader_backend->shader_free_private(iface); + if (This->blit_priv) { + This->blitter->free_private(iface); + } + if (This->fragment_priv) { + This->frag_pipe->free_private(iface); + } + if (This->shader_priv) { + This->shader_backend->shader_free_private(iface); + } return hr; }

1 0

H. Verbeet : wined3d: Don't allocate This-> draw_buffers in the error path for Init3D().
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 040c33de5ad0215e4816f9187c1aded582482d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=040c33de5ad0215e4816f9187… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Aug 20 22:45:11 2008 +0200 wined3d: Don't allocate This->draw_buffers in the error path for Init3D(). --- dlls/wined3d/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 69a7642..b6a9d7a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2254,7 +2254,6 @@ err_out: if(swapchain) { IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); } - This->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLenum) * GL_LIMITS(buffers)); if(This->stateBlock) { IWineD3DStateBlock_Release((IWineD3DStateBlock *) This->stateBlock); This->stateBlock = NULL;

1 0

Juan Lang : crypt32: Add support for decoding PKCS_SMIME_CAPABILITIES.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: ac5c7d22d02ca6dc88b209573051dbb61c65ce83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5c7d22d02ca6dc88b209573… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:11:41 2008 -0700 crypt32: Add support for decoding PKCS_SMIME_CAPABILITIES. --- dlls/crypt32/decode.c | 111 +++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/encode.c | 4 -- 2 files changed, 106 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 8df801a..64d4818 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1997,13 +1997,18 @@ static BOOL CRYPT_AsnDecodeCopyBytes(const BYTE *pbEncoded, *pcbStructInfo = bytesNeeded; blob->cbData = encodedLen; - if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) - blob->pbData = (LPBYTE)pbEncoded; - else + if (encodedLen) { - assert(blob->pbData); - memcpy(blob->pbData, pbEncoded, blob->cbData); + if (dwFlags & CRYPT_DECODE_NOCOPY_FLAG) + blob->pbData = (LPBYTE)pbEncoded; + else + { + assert(blob->pbData); + memcpy(blob->pbData, pbEncoded, blob->cbData); + } } + else + blob->pbData = NULL; } if (pcbDecoded) *pcbDecoded = encodedLen; @@ -2028,6 +2033,97 @@ static BOOL CRYPT_DecodeDERArray(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } +static BOOL CRYPT_AsnDecodeSMIMECapability(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret; + struct AsnDecodeSequenceItem items[] = { + { ASN_OBJECTIDENTIFIER, offsetof(CRYPT_SMIME_CAPABILITY, pszObjId), + CRYPT_AsnDecodeOidIgnoreTag, sizeof(LPSTR), FALSE, TRUE, + offsetof(CRYPT_SMIME_CAPABILITY, pszObjId), 0 }, + { 0, offsetof(CRYPT_SMIME_CAPABILITY, Parameters), + CRYPT_AsnDecodeCopyBytes, sizeof(CRYPT_OBJID_BLOB), TRUE, TRUE, + offsetof(CRYPT_SMIME_CAPABILITY, Parameters.pbData), 0 }, + }; + PCRYPT_SMIME_CAPABILITY capability = (PCRYPT_SMIME_CAPABILITY)pvStructInfo; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, + pcbDecoded, capability ? capability->pszObjId : NULL); + TRACE("returning %d\n", ret); + return ret; +} + +static BOOL CRYPT_AsnDecodeSMIMECapabilitiesInternal(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + struct AsnArrayDescriptor arrayDesc = { 0, + CRYPT_AsnDecodeSMIMECapability, sizeof(CRYPT_SMIME_CAPABILITY), TRUE, + offsetof(CRYPT_SMIME_CAPABILITY, pszObjId) }; + PCRYPT_SMIME_CAPABILITIES capabilities = + (PCRYPT_SMIME_CAPABILITIES)pvStructInfo; + BOOL ret; + + ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + NULL, pvStructInfo, pcbStructInfo, pcbDecoded, + capabilities ? capabilities->rgCapability : NULL); + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeSMIMECapabilities(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, *pcbStructInfo); + + __TRY + { + DWORD bytesNeeded; + + if (!cbEncoded) + SetLastError(CRYPT_E_ASN1_EOD); + else if (pbEncoded[0] != ASN_SEQUENCEOF) + SetLastError(CRYPT_E_ASN1_CORRUPT); + else if ((ret = CRYPT_AsnDecodeSMIMECapabilitiesInternal(pbEncoded, + cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, + NULL))) + { + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + PCRYPT_SMIME_CAPABILITIES capabilities; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + capabilities = (PCRYPT_SMIME_CAPABILITIES)pvStructInfo; + capabilities->rgCapability = + (PCRYPT_SMIME_CAPABILITY)((BYTE *)pvStructInfo + + sizeof(CRYPT_SMIME_CAPABILITIES)); + ret = CRYPT_AsnDecodeSMIMECapabilitiesInternal(pbEncoded, + cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, pvStructInfo, + &bytesNeeded, NULL); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CRYPT_AsnDecodePKCSAttributeInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -4603,6 +4699,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(X509_ENHANCED_KEY_USAGE): decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage; break; + case LOWORD(PKCS_SMIME_CAPABILITIES): + decodeFunc = CRYPT_AsnDecodeSMIMECapabilities; + break; case LOWORD(PKCS_ATTRIBUTES): decodeFunc = CRYPT_AsnDecodePKCSAttributes; break; @@ -4624,6 +4723,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeExtensions; else if (!strcmp(lpszStructType, szOID_RSA_signingTime)) decodeFunc = CRYPT_AsnDecodeUtcTime; + else if (!strcmp(lpszStructType, szOID_RSA_SMIMECapabilities)) + decodeFunc = CRYPT_AsnDecodeSMIMECapabilities; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER)) decodeFunc = CRYPT_AsnDecodeAuthorityKeyId; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER2)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9214609..d6bcf61 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5262,7 +5262,6 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&ptr, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -5274,7 +5273,6 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, singleCapability, sizeof(singleCapability), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&ptr, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -5289,7 +5287,6 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, singleCapabilitywithNULL, sizeof(singleCapabilitywithNULL), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&ptr, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -5307,7 +5304,6 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, twoCapabilities, sizeof(twoCapabilities), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&ptr, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Huw Davies : crypt32: Don't write to pvStructInfo if it's NULL.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 3b306c8d6eb216fd5a142b5618bf5407301436ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b306c8d6eb216fd5a142b561… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 20 11:21:24 2008 +0100 crypt32: Don't write to pvStructInfo if it's NULL. --- dlls/crypt32/decode.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 64d4818..a624823 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3942,7 +3942,9 @@ static BOOL WINAPI CRYPT_AsnDecodeSequenceOfAny(DWORD dwCertEncodingType, BYTE *nextPtr; DWORD i; - if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, bytesNeeded))) { if (dwFlags & CRYPT_DECODE_ALLOC_FLAG)

1 0

Juan Lang : crypt32: Rewrite CDecodeMsg_Update for better detached data handling.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 0a8d14c2e67d8e95c0057da1c996dbf103b047fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8d14c2e67d8e95c0057da1c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:03:37 2008 -0700 crypt32: Rewrite CDecodeMsg_Update for better detached data handling. --- dlls/crypt32/msg.c | 68 +++++++++++++++++++++++++++------------------- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index be12218..d657b87 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1491,6 +1491,7 @@ typedef struct _CDecodeMsg CSignedMsgData signed_data; } u; CRYPT_DATA_BLOB msg_data; + CRYPT_DATA_BLOB detached_data; PCONTEXT_PROPERTY_LIST properties; } CDecodeMsg; @@ -1515,6 +1516,7 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) break; } CryptMemFree(msg->msg_data.pbData); + CryptMemFree(msg->detached_data.pbData); ContextPropertyList_Free(msg->properties); } @@ -1763,30 +1765,38 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, { FIXME("(%p, %p, %d, %d): streamed update stub\n", hCryptMsg, pbData, cbData, fFinal); - if (fFinal) + switch (msg->base.state) { - if (msg->base.open_flags & CMSG_DETACHED_FLAG && - msg->base.state != MsgStateDataFinalized) + case MsgStateInit: + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); + if (fFinal) { - ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); - msg->base.state = MsgStateDataFinalized; - if (ret) - ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, - msg->type); + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + msg->base.state = MsgStateDataFinalized; + else + msg->base.state = MsgStateFinalized; } else + msg->base.state = MsgStateUpdated; + break; + case MsgStateUpdated: + ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); + if (fFinal) { - FIXME("(%p, %p, %d, %d): detached update stub\n", hCryptMsg, - pbData, cbData, fFinal); - ret = TRUE; - msg->base.state = MsgStateFinalized; + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + msg->base.state = MsgStateDataFinalized; + else + msg->base.state = MsgStateFinalized; } - } - else - { - ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); - if (msg->base.state == MsgStateInit) - msg->base.state = MsgStateUpdated; + break; + case MsgStateDataFinalized: + ret = CDecodeMsg_CopyData(&msg->detached_data, pbData, cbData); + if (fFinal) + msg->base.state = MsgStateFinalized; + break; + default: + SetLastError(CRYPT_E_MSG_ERROR); + break; } } else @@ -1795,26 +1805,26 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, SetLastError(CRYPT_E_MSG_ERROR); else { - if (msg->base.state == MsgStateInit) + switch (msg->base.state) { + case MsgStateInit: ret = CDecodeMsg_CopyData(&msg->msg_data, pbData, cbData); - if (ret) - ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, - msg->type); if (msg->base.open_flags & CMSG_DETACHED_FLAG) msg->base.state = MsgStateDataFinalized; else msg->base.state = MsgStateFinalized; - } - else if (msg->base.state == MsgStateDataFinalized) - { - FIXME("(%p, %p, %d, %d): detached update stub\n", hCryptMsg, - pbData, cbData, fFinal); - ret = TRUE; + break; + case MsgStateDataFinalized: + ret = CDecodeMsg_CopyData(&msg->detached_data, pbData, cbData); msg->base.state = MsgStateFinalized; + break; + default: + SetLastError(CRYPT_E_MSG_ERROR); } } } + if (ret && msg->base.state == MsgStateFinalized) + ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, msg->type); return ret; } @@ -2648,6 +2658,8 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, memset(&msg->u, 0, sizeof(msg->u)); msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL; + msg->detached_data.cbData = 0; + msg->detached_data.pbData = NULL; msg->properties = ContextPropertyList_Create(); } return msg; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 410a180..369576d 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2080,7 +2080,6 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); 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);

1 0

Juan Lang : crypt32: Handle the detached portion of detached signed messages.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: aa265b4165d799aed483e12a043b0108f872adaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa265b4165d799aed483e12a0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:07:08 2008 -0700 crypt32: Handle the detached portion of detached signed messages. --- dlls/crypt32/msg.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d657b87..6c59845 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1658,20 +1658,30 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, msg->crypt_prov); if (ret) { + CRYPT_DATA_BLOB *content; + /* Now that we have all the content, update the hash handles with - * it. Have to decode it if the type is szOID_RSA_data. + * it. If the message is a detached message, the content is stored + * in msg->detached_data rather than in the signed message's + * content. */ - if (msg->u.signed_data.info->content.Content.cbData) + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + content = &msg->detached_data; + else + content = &msg->u.signed_data.info->content.Content; + if (content->cbData) { - if (!strcmp(msg->u.signed_data.info->content.pszObjId, + /* If the message is not detached, have to decode the message's + * content if the type is szOID_RSA_data. + */ + if (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && + !strcmp(msg->u.signed_data.info->content.pszObjId, szOID_RSA_data)) { CRYPT_DATA_BLOB *blob; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, - X509_OCTET_STRING, - msg->u.signed_data.info->content.Content.pbData, - msg->u.signed_data.info->content.Content.cbData, + X509_OCTET_STRING, content->pbData, content->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, (LPBYTE)&blob, &size); if (ret) { @@ -1682,14 +1692,13 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, } else ret = CSignedMsgData_Update(&msg->u.signed_data, - msg->u.signed_data.info->content.Content.pbData, - msg->u.signed_data.info->content.Content.cbData, TRUE, - Verify); + content->pbData, content->cbData, TRUE, Verify); } } } 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

1 0