Juan Lang : crypt32: Implement getting content for data messages opened to encode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f75b86f02be0d3caa030b6c89dc66e6338d5717c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f75b86f02be0d3caa030b6c89dc66e6338d5717c

Author: Juan Lang <juan.lang at gmail.com>
Date:   Thu Jun 28 17:19:45 2007 -0700

crypt32: Implement getting content for data messages opened to encode.

---

 dlls/crypt32/msg.c       |   11 ++++++++++-
 dlls/crypt32/tests/msg.c |    5 -----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c
index c92d6ef..4ac5cf0 100644
--- a/dlls/crypt32/msg.c
+++ b/dlls/crypt32/msg.c
@@ -118,8 +118,17 @@ static BOOL CDataEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,
     switch (dwParamType)
     {
     case CMSG_CONTENT_PARAM:
-        FIXME("stub\n");
+    {
+        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)
         {
diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c
index da534da..16ab7f6 100644
--- a/dlls/crypt32/tests/msg.c
+++ b/dlls/crypt32/tests/msg.c
@@ -384,7 +384,6 @@ static void test_data_msg_get_param(void)
     /* Content and bare content are always gettable */
     size = 0;
     ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size);
-    todo_wine
     ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError());
     size = 0;
     ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size);
@@ -426,14 +425,12 @@ static void test_data_msg_encoding(void)
      NULL);
     check_param("data empty bare content", msg, CMSG_BARE_CONTENT_PARAM,
      dataEmptyBareContent, sizeof(dataEmptyBareContent));
-    todo_wine
     check_param("data empty 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));
-    todo_wine
     check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent,
      sizeof(dataContent));
     CryptMsgClose(msg);
@@ -442,14 +439,12 @@ static void test_data_msg_encoding(void)
      CMSG_DATA, NULL, NULL, NULL);
     check_param("data empty bare content", msg, CMSG_BARE_CONTENT_PARAM,
      dataEmptyBareContent, sizeof(dataEmptyBareContent));
-    todo_wine
     check_param("data empty 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));
-    todo_wine
     check_param("data content", msg, CMSG_CONTENT_PARAM, dataContent,
      sizeof(dataContent));
     CryptMsgClose(msg);