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

Evan Stade : gdiplus: Make LineCapArrowAnchor look more like it does in windows.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 30084db2ce2ba20800610726954533eddb9abcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30084db2ce2ba208006107269… Author: Evan Stade <estade(a)evanstade.smo.corp.google.com> Date: Mon Jul 9 20:32:29 2007 -0700 gdiplus: Make LineCapArrowAnchor look more like it does in windows. --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 40975b2..4f7d1ef 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -71,7 +71,7 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, if(!path || !points) return InvalidParameter; - if(!lengthen_path(path, count + (path->newfigure ? 1 : 0))) + if(!lengthen_path(path, count)) return OutOfMemory; for(i = 0; i < count; i++){

1 0

Evan Stade : gdiplus: Added constructor and destructor test for gdiplus paths.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: fec9e5e8031ba35e840ad2804027e29d4d2b9c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec9e5e8031ba35e840ad2804… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:38 2007 -0700 gdiplus: Added constructor and destructor test for gdiplus paths. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/graphicspath.c | 58 +++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 45853f6..4d8662a 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = gdiplus kernel32 CTESTS = \ brush.c \ + graphicspath.c \ pen.c @MAKE_TEST_RULES@ diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c new file mode 100644 index 0000000..8dd9adf --- /dev/null +++ b/dlls/gdiplus/tests/graphicspath.c @@ -0,0 +1,58 @@ +/* + * Unit test suite for paths + * + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static void test_constructor_destructor(void) +{ + GpStatus status; + GpPath* path = NULL; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + ok(path != NULL, "Expected path to be initialized\n"); + + status = GdipDeletePath(NULL); + expect(InvalidParameter, status); + + status = GdipDeletePath(path); + expect(Ok, status); +} + +START_TEST(graphicspath) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_constructor_destructor(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Evan Stade : gdiplus: Fixed bug in GdipGetPathPoints().
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 1fc841f6555d9700499dcc59adf0e6b1d6bc5795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc841f6555d9700499dcc59a… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 9 20:54:43 2007 -0700 gdiplus: Fixed bug in GdipGetPathPoints(). --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4f7d1ef..7c0e826 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -152,7 +152,7 @@ GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count) if(count < path->pathdata.Count) return InsufficientBuffer; - memcpy(points, path->pathdata.Points, path->pathdata.Count); + memcpy(points, path->pathdata.Points, path->pathdata.Count * sizeof(GpPointF)); return Ok; }

1 0

Juan Lang : crypt32: Test and fix CryptMsgGetParam for streamed messages.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: e557d36320bad7768271e1774bb3e9acbb7bc8c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e557d36320bad7768271e1774… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 11:19:44 2007 -0700 crypt32: Test and fix CryptMsgGetParam for streamed messages. --- dlls/crypt32/msg.c | 27 ++++++++++++++++----------- dlls/crypt32/tests/msg.c | 22 +++++++++++++++++++++- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 7280642..7c7a8e0 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -132,19 +132,24 @@ static BOOL CDataEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, switch (dwParamType) { case CMSG_CONTENT_PARAM: - { - CRYPT_CONTENT_INFO info; - char rsa_data[] = "1.2.840.113549.1.7.1"; - - info.pszObjId = rsa_data; - info.Content.cbData = msg->bare_content_len; - info.Content.pbData = msg->bare_content; - ret = CryptEncodeObject(X509_ASN_ENCODING, PKCS_CONTENT_INFO, &info, - pvData, pcbData); + if (msg->base.streamed) + SetLastError(E_INVALIDARG); + else + { + CRYPT_CONTENT_INFO info; + char rsa_data[] = "1.2.840.113549.1.7.1"; + + info.pszObjId = rsa_data; + info.Content.cbData = msg->bare_content_len; + info.Content.pbData = msg->bare_content; + ret = CryptEncodeObject(X509_ASN_ENCODING, PKCS_CONTENT_INFO, &info, + pvData, pcbData); + } break; - } case CMSG_BARE_CONTENT_PARAM: - if (!pvData) + if (msg->base.streamed) + SetLastError(E_INVALIDARG); + else if (!pvData) { *pcbData = msg->bare_content_len; ret = TRUE; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index ed54e82..2b0bc18 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -345,6 +345,12 @@ static void test_data_msg_open(void) static const BYTE msgData[] = { 1, 2, 3, 4 }; +static BOOL WINAPI nop_stream_output(const void *pvArg, BYTE *pb, DWORD cb, + BOOL final) +{ + return TRUE; +} + static void test_data_msg_update(void) { HCRYPTMSG msg; @@ -403,11 +409,12 @@ static void test_data_msg_get_param(void) HCRYPTMSG msg; DWORD size; BOOL ret; + CMSG_STREAM_INFO streamInfo = { 0, nop_stream_output, NULL }; msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); - /* Content and bare content are always gettable */ + /* Content and bare content are always gettable when not streaming */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); @@ -430,6 +437,19 @@ static void test_data_msg_get_param(void) ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); CryptMsgClose(msg); + + /* Can't get content or bare content when streaming */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, + NULL, &streamInfo); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %x\n", GetLastError()); + CryptMsgClose(msg); } static const BYTE dataEmptyBareContent[] = { 0x04,0x00 };

1 0

Juan Lang : crypt32: Add a stub decode message implementation.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 656d960dd4b01e1ef1f293e1214f8b1629c7c2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=656d960dd4b01e1ef1f293e12… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 11:20:34 2007 -0700 crypt32: Add a stub decode message implementation. --- dlls/crypt32/msg.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/msg.c | 15 +++++---------- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 7c7a8e0..dbe14b5 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -244,11 +244,43 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, return msg; } +typedef struct _CDecodeMsg +{ + CryptMsgBase base; + DWORD type; + HCRYPTPROV crypt_prov; +} CDecodeMsg; + +static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) +{ + CDecodeMsg *msg = (CDecodeMsg *)hCryptMsg; + + if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) + CryptReleaseContext(msg->crypt_prov, 0); +} + +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; +} + +static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + FIXME("(%p, %d, %d, %p, %p): stub\n", hCryptMsg, dwParamType, dwIndex, + pvData, pcbData); + return FALSE; +} + HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, HCRYPTPROV hCryptProv, PCERT_INFO pRecipientInfo, PCMSG_STREAM_INFO pStreamInfo) { - FIXME("(%08x, %08x, %08x, %08lx, %p, %p): stub\n", dwMsgEncodingType, + CDecodeMsg *msg; + + TRACE("(%08x, %08x, %08x, %08lx, %p, %p)\n", dwMsgEncodingType, dwFlags, dwMsgType, hCryptProv, pRecipientInfo, pStreamInfo); if (GET_CMSG_ENCODING_TYPE(dwMsgEncodingType) != PKCS_7_ASN_ENCODING) @@ -256,7 +288,14 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, SetLastError(E_INVALIDARG); return NULL; } - return NULL; + msg = CryptMemAlloc(sizeof(CDecodeMsg)); + if (msg) + { + CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, + CDecodeMsg_Close, CDecodeMsg_GetParam, CDecodeMsg_Update); + msg->type = dwMsgType; + } + return msg; } HCRYPTMSG WINAPI CryptMsgDuplicate(HCRYPTMSG hCryptMsg) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 2b0bc18..be1963e 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -95,7 +95,6 @@ static void test_msg_open_to_decode(void) /* The message type can be explicit... */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, NULL); - todo_wine { ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, 0, NULL, @@ -125,7 +124,6 @@ static void test_msg_open_to_decode(void) CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 1000, 0, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); - } CryptMsgClose(msg); /* And even though the stream info parameter "must be set to NULL" for @@ -133,7 +131,6 @@ static void test_msg_open_to_decode(void) */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, &streamInfo); - todo_wine ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); CryptMsgClose(msg); } @@ -154,7 +151,6 @@ static void test_msg_get_param(void) /* Decoded messages */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); - todo_wine ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); /* For decoded messages, the type is always available */ size = 0; @@ -171,7 +167,6 @@ static void test_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, NULL); - todo_wine ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); /* For explicitly typed messages, the type is known. */ size = sizeof(value); @@ -190,10 +185,10 @@ static void test_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, 0, NULL, NULL); - todo_wine { ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); + todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_ENVELOPED, "Expected CMSG_ENVELOPED, got %d\n", value); } @@ -207,10 +202,10 @@ static void test_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, NULL); - todo_wine { ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); + todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_HASHED, "Expected CMSG_HASHED, got %d\n", value); } @@ -224,10 +219,10 @@ static void test_msg_get_param(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, NULL); - todo_wine { ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); + todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_SIGNED, "Expected CMSG_SIGNED, got %d\n", value); } @@ -242,20 +237,20 @@ static void test_msg_get_param(void) /* Explicitly typed messages get their types set, even if they're invalid */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_ENCRYPTED, 0, NULL, NULL); - todo_wine { ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); + todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_ENCRYPTED, "Expected CMSG_ENCRYPTED, got %d\n", value); } CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 1000, 0, NULL, NULL); - todo_wine { ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); + todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == 1000, "Expected 1000, got %d\n", value); }

1 0

Juan Lang : crypt32: Implement getting the type of a decode message.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 8ca755915b6f677d51837b5e00658617474bd68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca755915b6f677d51837b5e0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 11:22:08 2007 -0700 crypt32: Implement getting the type of a decode message. --- dlls/crypt32/msg.c | 31 ++++++++++++++++++++++++++++--- dlls/crypt32/tests/msg.c | 14 -------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index dbe14b5..63f6671 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -269,9 +269,34 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { - FIXME("(%p, %d, %d, %p, %p): stub\n", hCryptMsg, dwParamType, dwIndex, - pvData, pcbData); - return FALSE; + CDecodeMsg *msg = (CDecodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + switch (dwParamType) + { + case CMSG_TYPE_PARAM: + if (!pvData) + { + *pcbData = sizeof(DWORD); + ret = TRUE; + } + else if (*pcbData < sizeof(DWORD)) + { + *pcbData = sizeof(DWORD); + SetLastError(ERROR_MORE_DATA); + } + else + { + *pcbData = sizeof(DWORD); + *(DWORD *)pvData = msg->type; + ret = TRUE; + } + break; + default: + FIXME("unimplemented for parameter %d\n", dwParamType); + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + return ret; } HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index be1963e..80ba79c 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -155,14 +155,12 @@ static void test_msg_get_param(void) /* For decoded messages, the type is always available */ size = 0; ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); /* For this (empty) message, the type isn't set */ ok(value == 0, "Expected type 0, got %d\n", value); - } CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, @@ -171,10 +169,8 @@ static void test_msg_get_param(void) /* For explicitly typed messages, the type is known. */ size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_DATA, "Expected CMSG_DATA, got %d\n", value); - } for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) { size = 0; @@ -188,10 +184,8 @@ static void test_msg_get_param(void) ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_ENVELOPED, "Expected CMSG_ENVELOPED, got %d\n", value); - } for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) { size = 0; @@ -205,10 +199,8 @@ static void test_msg_get_param(void) ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_HASHED, "Expected CMSG_HASHED, got %d\n", value); - } for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) { size = 0; @@ -222,10 +214,8 @@ static void test_msg_get_param(void) ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_SIGNED, "Expected CMSG_SIGNED, got %d\n", value); - } for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) { size = 0; @@ -240,20 +230,16 @@ static void test_msg_get_param(void) ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_ENCRYPTED, "Expected CMSG_ENCRYPTED, got %d\n", value); - } CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 1000, 0, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToDecode failed: %x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, (LPBYTE)&value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == 1000, "Expected 1000, got %d\n", value); - } CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Add some tests for updating decode messages.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: acc0bec41ff75632442e38725e86a20f884e57fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc0bec41ff75632442e38725… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 11:25:24 2007 -0700 crypt32: Add some tests for updating decode messages. --- dlls/crypt32/tests/msg.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 80ba79c..3c9fc7e 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -632,6 +632,77 @@ static void test_data_msg(void) test_data_msg_encoding(); } +static void test_decode_msg_update(void) +{ + HCRYPTMSG msg; + BOOL ret; + CMSG_STREAM_INFO streamInfo = { 0 }; + DWORD i; + + 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); + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); + CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + /* Can't send a non-final update without streaming */ + 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); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); + /* Updating a message that has a NULL stream callback fails */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), + FALSE); + todo_wine + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError()); + /* Changing the callback pointer after the fact yields the same error (so + * the message must copy the stream info, not just store a pointer to it) + */ + streamInfo.pfnStreamOutput = nop_stream_output; + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), + FALSE); + todo_wine + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %x\n", GetLastError()); + CryptMsgClose(msg); + + /* Updating the message byte by byte is legal */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, &streamInfo); + todo_wine { + for (i = 0, ret = TRUE; ret && i < sizeof(dataEmptyContent); i++) + ret = CryptMsgUpdate(msg, &dataEmptyContent[i], 1, FALSE); + 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); +} + +static void test_decode_msg(void) +{ + test_decode_msg_update(); +} + START_TEST(msg) { /* Basic parameter checking tests */ @@ -642,4 +713,5 @@ START_TEST(msg) /* Message-type specific tests */ test_data_msg(); + test_decode_msg(); }

1 0

Juan Lang : crypt32: Make a copy of a passed-in stream info rather than assuming the pointer will live forever .
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 7e65d9439cd0141459cf3f0f3e1553c66518a71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e65d9439cd0141459cf3f0f3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 10:55:42 2007 -0700 crypt32: Make a copy of a passed-in stream info rather than assuming the pointer will live forever. --- dlls/crypt32/msg.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f5f1491..7280642 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -39,7 +39,8 @@ typedef struct _CryptMsgBase { LONG ref; DWORD open_flags; - PCMSG_STREAM_INFO stream_info; + BOOL streamed; + CMSG_STREAM_INFO stream_info; BOOL finalized; CryptMsgCloseFunc close; CryptMsgUpdateFunc update; @@ -52,7 +53,16 @@ static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags, { msg->ref = 1; msg->open_flags = dwFlags; - msg->stream_info = pStreamInfo; + if (pStreamInfo) + { + msg->streamed = TRUE; + memcpy(&msg->stream_info, pStreamInfo, sizeof(msg->stream_info)); + } + else + { + msg->streamed = FALSE; + memset(&msg->stream_info, 0, sizeof(msg->stream_info)); + } msg->close = close; msg->get_param = get_param; msg->update = update; @@ -106,7 +116,7 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, &blob, CRYPT_ENCODE_ALLOC_FLAG, NULL, &msg->bare_content, &msg->bare_content_len); - if (ret && msg->base.stream_info) + if (ret && msg->base.streamed) FIXME("stream info unimplemented\n"); } }

1 0

Juan Lang : crypt32: Test that inner content OID is ignored for data messages.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: aa99cf8ec04801945f4c11f880f6fe64ec6c9dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa99cf8ec04801945f4c11f88… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 10:56:20 2007 -0700 crypt32: Test that inner content OID is ignored for data messages. --- dlls/crypt32/tests/msg.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 96489bc..d67767f 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -429,7 +429,6 @@ static void test_data_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); - CryptMsgClose(msg); } @@ -446,6 +445,7 @@ static void test_data_msg_encoding(void) { HCRYPTMSG msg; BOOL ret; + static char oid[] = "1.2.3"; msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); @@ -474,6 +474,20 @@ static void test_data_msg_encoding(void) check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, sizeof(dataContent)); CryptMsgClose(msg); + /* The inner OID is apparently ignored */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, oid, + NULL); + check_param("data bogus oid bare content", msg, CMSG_BARE_CONTENT_PARAM, + dataEmptyBareContent, sizeof(dataEmptyBareContent)); + check_param("data bogus oid content", msg, CMSG_CONTENT_PARAM, + dataEmptyContent, sizeof(dataEmptyContent)); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + check_param("data bare content", msg, CMSG_BARE_CONTENT_PARAM, + dataBareContent, sizeof(dataBareContent)); + check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, + sizeof(dataContent)); + CryptMsgClose(msg); } static void test_data_msg(void)

1 0

Juan Lang : crypt32: Add tests for streamed encoding of data messages.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: b18b05f53c08ae1ffc87c83447b9e562ea6bacd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18b05f53c08ae1ffc87c8344… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 9 11:17:35 2007 -0700 crypt32: Add tests for streamed encoding of data messages. --- dlls/crypt32/tests/msg.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index d67767f..ed54e82 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -441,11 +441,113 @@ static const BYTE dataContent[] = { 0x30,0x13,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x06, 0x04,0x04,0x01,0x02,0x03,0x04 }; +struct update_accum +{ + DWORD cUpdates; + CRYPT_DATA_BLOB *updates; +}; + +static BOOL WINAPI accumulating_stream_output(const void *pvArg, BYTE *pb, + DWORD cb, BOOL final) +{ + struct update_accum *accum = (struct update_accum *)pvArg; + BOOL ret = FALSE; + + if (accum->cUpdates) + accum->updates = CryptMemRealloc(accum->updates, + (accum->cUpdates + 1) * sizeof(CRYPT_DATA_BLOB)); + else + accum->updates = CryptMemAlloc(sizeof(CRYPT_DATA_BLOB)); + if (accum->updates) + { + CRYPT_DATA_BLOB *blob = &accum->updates[accum->cUpdates]; + + blob->pbData = CryptMemAlloc(cb); + if (blob->pbData) + { + memcpy(blob->pbData, pb, cb); + blob->cbData = cb; + ret = TRUE; + } + accum->cUpdates++; + } + return ret; +} + +/* The updates of a (bogus) definite-length encoded message */ +static BYTE u1[] = { 0x30,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, + 0x07,0x01,0xa0,0x02,0x04,0x00 }; +static BYTE u2[] = { 0x01,0x02,0x03,0x04 }; +static CRYPT_DATA_BLOB b1[] = { + { sizeof(u1), u1 }, + { sizeof(u2), u2 }, + { sizeof(u2), u2 }, +}; +static const struct update_accum a1 = { sizeof(b1) / sizeof(b1[0]), b1 }; +/* The updates of a definite-length encoded message */ +static BYTE u3[] = { 0x30,0x13,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, + 0x07,0x01,0xa0,0x06,0x04,0x04 }; +static CRYPT_DATA_BLOB b2[] = { + { sizeof(u3), u3 }, + { sizeof(u2), u2 }, +}; +static const struct update_accum a2 = { sizeof(b2) / sizeof(b2[0]), b2 }; +/* The updates of an indefinite-length encoded message */ +static BYTE u4[] = { 0x30,0x80,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, + 0x07,0x01,0xa0,0x80,0x24,0x80 }; +static BYTE u5[] = { 0x04,0x04 }; +static BYTE u6[] = { 0x00,0x00,0x00,0x00,0x00,0x00 }; +static CRYPT_DATA_BLOB b3[] = { + { sizeof(u4), u4 }, + { sizeof(u5), u5 }, + { sizeof(u2), u2 }, + { sizeof(u5), u5 }, + { sizeof(u2), u2 }, + { sizeof(u6), u6 }, +}; +static const struct update_accum a3 = { sizeof(b3) / sizeof(b3[0]), b3 }; + +static void check_updates(LPCSTR header, const struct update_accum *expected, + const struct update_accum *got) +{ + DWORD i; + + ok(expected->cUpdates == got->cUpdates, + "%s: expected %d updates, got %d\n", header, expected->cUpdates, + got->cUpdates); + if (expected->cUpdates == got->cUpdates) + for (i = 0; i < min(expected->cUpdates, got->cUpdates); i++) + { + ok(expected->updates[i].cbData == got->updates[i].cbData, + "%s, update %d: expected %d bytes, got %d\n", header, i, + expected->updates[i].cbData, got->updates[i].cbData); + if (expected->updates[i].cbData && expected->updates[i].cbData == + got->updates[i].cbData) + ok(!memcmp(expected->updates[i].pbData, got->updates[i].pbData, + got->updates[i].cbData), "%s, update %d: unexpected value\n", + header, i); + } +} + +/* Frees the updates stored in accum */ +static void free_updates(struct update_accum *accum) +{ + DWORD i; + + for (i = 0; i < accum->cUpdates; i++) + CryptMemFree(accum->updates[i].pbData); + CryptMemFree(accum->updates); + accum->updates = NULL; + accum->cUpdates = 0; +} + static void test_data_msg_encoding(void) { HCRYPTMSG msg; BOOL ret; static char oid[] = "1.2.3"; + struct update_accum accum = { 0, NULL }; + CMSG_STREAM_INFO streamInfo = { 0, accumulating_stream_output, &accum }; msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); @@ -488,6 +590,37 @@ static void test_data_msg_encoding(void) check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent, sizeof(dataContent)); CryptMsgClose(msg); + /* A streaming message is DER encoded if the length is not 0xffffffff, but + * curiously, updates aren't validated to make sure they don't exceed the + * stated length. (The resulting output will of course fail to decode.) + */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, + NULL, &streamInfo); + CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + CryptMsgClose(msg); + todo_wine + check_updates("bogus data message with definite length", &a1, &accum); + free_updates(&accum); + /* A valid definite-length encoding: */ + streamInfo.cbContent = sizeof(msgData); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, + NULL, &streamInfo); + CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + CryptMsgClose(msg); + todo_wine + check_updates("data message with definite length", &a2, &accum); + free_updates(&accum); + /* An indefinite-length encoding: */ + streamInfo.cbContent = 0xffffffff; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, + NULL, &streamInfo); + CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + CryptMsgClose(msg); + todo_wine + check_updates("data message with indefinite length", &a3, &accum); + free_updates(&accum); } static void test_data_msg(void)

1 0