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

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

Aug. 21, 2008

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

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

Aug. 21, 2008

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

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

Aug. 21, 2008

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

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

Aug. 21, 2008

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

Huw Davies : crypt32: Initialize the size to zero.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

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 allocate This-> draw_buffers in the error path for Init3D().
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

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

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

Aug. 21, 2008

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: Add support for decoding PKCS_SMIME_CAPABILITIES.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

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

Juan Lang : crypt32: Add support for encoding PKCS_SMIME_CAPABILITIES.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: db6c8e23b6abc13dafcaeae001203d51c9288a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6c8e23b6abc13dafcaeae00… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:11:15 2008 -0700 crypt32: Add support for encoding PKCS_SMIME_CAPABILITIES. --- dlls/crypt32/encode.c | 95 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 4 -- 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 5658ba2..c935396 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1404,6 +1404,96 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicodeName(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeSMIMECapability(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CRYPT_SMIME_CAPABILITY *capability = + (const CRYPT_SMIME_CAPABILITY *)pvStructInfo; + + if (!capability->pszObjId) + SetLastError(E_INVALIDARG); + else + { + struct AsnEncodeSequenceItem items[] = { + { capability->pszObjId, CRYPT_AsnEncodeOid, 0 }, + { &capability->Parameters, CRYPT_CopyEncodedBlob, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeSMIMECapabilities(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + DWORD bytesNeeded, dataLen, lenBytes, i; + const CRYPT_SMIME_CAPABILITIES *capabilities = + (const CRYPT_SMIME_CAPABILITIES *)pvStructInfo; + + ret = TRUE; + for (i = 0, dataLen = 0; ret && i < capabilities->cCapability; i++) + { + DWORD size; + + ret = CRYPT_AsnEncodeSMIMECapability(dwCertEncodingType, NULL, + &capabilities->rgCapability[i], 0, NULL, NULL, &size); + if (ret) + dataLen += size; + } + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, + pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < capabilities->cCapability; i++) + { + DWORD size = dataLen; + + ret = CRYPT_AsnEncodeSMIMECapability(dwCertEncodingType, + NULL, &capabilities->rgCapability[i], 0, NULL, pbEncoded, + &size); + pbEncoded += size; + dataLen -= size; + } + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodePKCSAttribute(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -3684,6 +3774,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(X509_ENHANCED_KEY_USAGE): encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage; break; + case LOWORD(PKCS_SMIME_CAPABILITIES): + encodeFunc = CRYPT_AsnEncodeSMIMECapabilities; + break; case LOWORD(PKCS_ATTRIBUTES): encodeFunc = CRYPT_AsnEncodePKCSAttributes; break; @@ -3705,6 +3798,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodeExtensions; else if (!strcmp(lpszStructType, szOID_RSA_signingTime)) encodeFunc = CRYPT_AsnEncodeUtcTime; + else if (!strcmp(lpszStructType, szOID_RSA_SMIMECapabilities)) + encodeFunc = CRYPT_AsnEncodeUtcTime; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER)) encodeFunc = CRYPT_AsnEncodeAuthorityKeyId; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER2)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index efb72f3..9214609 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5180,7 +5180,6 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) capabilities.cCapability = 0; ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { @@ -5198,13 +5197,11 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); capability[0].pszObjId = oid1; ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { @@ -5217,7 +5214,6 @@ static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) capabilities.cCapability = 2; ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) {

1 0

Juan Lang : crypt32: Add tests for encoding/ decoding PKCS_SMIME_CAPABILITIES. With help from Huw Davies.
by Alexandre Julliard Aug. 21, 2008

Aug. 21, 2008

Module: wine Branch: master Commit: 70744f07d11d09114b66d67f29ed5463f888e135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70744f07d11d09114b66d67f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:10:57 2008 -0700 crypt32: Add tests for encoding/decoding PKCS_SMIME_CAPABILITIES. With help from Huw Davies. --- dlls/crypt32/tests/encode.c | 166 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 28542aa..efb72f3 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5160,6 +5160,170 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) } } +static const BYTE singleCapability[] = { +0x30,0x06,0x30,0x04,0x06,0x02,0x2d,0x06 }; +static const BYTE twoCapabilities[] = { +0x30,0x0c,0x30,0x04,0x06,0x02,0x2d,0x06,0x30,0x04,0x06,0x02,0x2a,0x03 }; +static const BYTE singleCapabilitywithNULL[] = { +0x30,0x08,0x30,0x06,0x06,0x02,0x2d,0x06,0x05,0x00 }; + +static void test_encodePKCSSMimeCapabilities(DWORD dwEncoding) +{ + static char oid1[] = "1.5.6", oid2[] = "1.2.3"; + BOOL ret; + LPBYTE buf = NULL; + DWORD size = 0; + CRYPT_SMIME_CAPABILITY capability[2]; + CRYPT_SMIME_CAPABILITIES capabilities; + + /* An empty capabilities is allowed */ + capabilities.cCapability = 0; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(emptySequence), "unexpected size %d\n", size); + ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); + LocalFree(buf); + } + /* A non-empty capabilities with an empty capability (lacking an OID) is + * not allowed + */ + capability[0].pszObjId = NULL; + capability[0].Parameters.cbData = 0; + capabilities.cCapability = 1; + capabilities.rgCapability = capability; + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + capability[0].pszObjId = oid1; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(singleCapability), "unexpected size %d\n", size); + ok(!memcmp(buf, singleCapability, size), "unexpected value\n"); + LocalFree(buf); + } + capability[1].pszObjId = oid2; + capability[1].Parameters.cbData = 0; + capabilities.cCapability = 2; + ret = CryptEncodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + &capabilities, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(twoCapabilities), "unexpected size %d\n", size); + ok(!memcmp(buf, twoCapabilities, size), "unexpected value\n"); + LocalFree(buf); + } +} + +static void compareSMimeCapabilities(LPCSTR header, + const CRYPT_SMIME_CAPABILITIES *expected, const CRYPT_SMIME_CAPABILITIES *got) +{ + DWORD i; + + ok(got->cCapability == expected->cCapability, + "%s: expected %d capabilities, got %d\n", header, expected->cCapability, + got->cCapability); + for (i = 0; i < expected->cCapability; i++) + { + ok(!strcmp(expected->rgCapability[i].pszObjId, + got->rgCapability[i].pszObjId), "%s[%d]: expected %s, got %s\n", + header, i, expected->rgCapability[i].pszObjId, + got->rgCapability[i].pszObjId); + ok(expected->rgCapability[i].Parameters.cbData == + got->rgCapability[i].Parameters.cbData, + "%s[%d]: expected %d bytes, got %d\n", header, i, + expected->rgCapability[i].Parameters.cbData, + got->rgCapability[i].Parameters.cbData); + if (expected->rgCapability[i].Parameters.cbData) + ok(!memcmp(expected->rgCapability[i].Parameters.pbData, + got->rgCapability[i].Parameters.pbData, + expected->rgCapability[i].Parameters.cbData), + "%s[%d]: unexpected value\n", header, i); + } +} + +static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) +{ + static char oid1[] = "1.5.6", oid2[] = "1.2.3"; + BOOL ret; + DWORD size = 0; + CRYPT_SMIME_CAPABILITY capability[2]; + CRYPT_SMIME_CAPABILITIES capabilities, *ptr; + + SetLastError(0xdeadbeef); + 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) + { + capabilities.cCapability = 0; + compareSMimeCapabilities("empty capabilities", &capabilities, ptr); + LocalFree(ptr); + } + SetLastError(0xdeadbeef); + 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) + { + capability[0].pszObjId = oid1; + capability[0].Parameters.cbData = 0; + capabilities.cCapability = 1; + capabilities.rgCapability = capability; + compareSMimeCapabilities("single capability", &capabilities, ptr); + LocalFree(ptr); + } + SetLastError(0xdeadbeef); + 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) + { + BYTE NULLparam[] = {0x05, 0x00}; + capability[0].pszObjId = oid1; + capability[0].Parameters.cbData = 2; + capability[0].Parameters.pbData = NULLparam; + capabilities.cCapability = 1; + capabilities.rgCapability = capability; + compareSMimeCapabilities("single capability with NULL", &capabilities, + ptr); + LocalFree(ptr); + } + SetLastError(0xdeadbeef); + 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) + { + capability[0].Parameters.cbData = 0; + capability[1].pszObjId = oid2; + capability[1].Parameters.cbData = 0; + capabilities.cCapability = 2; + compareSMimeCapabilities("two capabilities", &capabilities, ptr); + LocalFree(ptr); + } +} + static BYTE encodedCommonNameNoNull[] = { 0x30,0x14,0x31,0x12,0x30,0x10, 0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, 0x67 }; @@ -6283,6 +6447,8 @@ START_TEST(encode) test_decodePKCSAttribute(encodings[i]); test_encodePKCSAttributes(encodings[i]); test_decodePKCSAttributes(encodings[i]); + test_encodePKCSSMimeCapabilities(encodings[i]); + test_decodePKCSSMimeCapabilities(encodings[i]); test_encodePKCSSignerInfo(encodings[i]); test_decodePKCSSignerInfo(encodings[i]); test_encodeCMSSignerInfo(encodings[i]);

1 0