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

James Hawkins : msi: Add a test for installing from different current working directories.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: ba257f0ceac03397702d75e3404408b0d692d71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba257f0ceac03397702d75e34… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 12 20:07:26 2007 -0700 msi: Add a test for installing from different current working directories. --- dlls/msi/tests/install.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 19cf266..f28e4fd 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -414,6 +414,11 @@ static const CHAR tp_component_dat[] = "Component\tComponentId\tDirectory_\tAttr "Component\tComponent\n" "augustus\t\tMSITESTDIR\t0\tprop=\"val\"\taugustus\n"; +static const CHAR cwd_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "augustus\t\tMSITESTDIR\t0\t\taugustus\n"; + typedef struct _msi_table { const CHAR *filename; @@ -612,6 +617,18 @@ static const msi_table tp_tables[] = ADD_TABLE(property), }; +static const msi_table cwd_tables[] = +{ + ADD_TABLE(cwd_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2464,6 +2481,63 @@ static void test_transformprop(void) RemoveDirectory("msitest"); } +static void test_currentworkingdir(void) +{ + UINT r; + CHAR path[MAX_PATH]; + LPSTR ptr, ptr2; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\augustus", 500); + + create_database(msifile, cwd_tables, sizeof(cwd_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + CreateDirectoryA("diffdir", NULL); + SetCurrentDirectoryA("diffdir"); + + sprintf(path, "..\\%s", msifile); + r = MsiInstallProductA(path, NULL); + todo_wine + { + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "File installed\n"); + } + + sprintf(path, "%s\\%s", CURR_DIR, msifile); + r = MsiInstallProductA(path, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + lstrcpyA(path, CURR_DIR); + if (path[lstrlenA(path) - 1] != '\\') + lstrcatA(path, "\\"); + lstrcatA(path, "msitest.msi"); + + ptr2 = strrchr(path, '\\'); + *ptr2 = '\0'; + ptr = strrchr(path, '\\'); + *ptr2 = '\\'; + *(ptr++) = '\0'; + + SetCurrentDirectoryA(path); + + r = MsiInstallProductA(ptr, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + SetCurrentDirectoryA(CURR_DIR); + + DeleteFile(msifile); + DeleteFile("msitest\\augustus"); + RemoveDirectory("msitest"); + RemoveDirectory("diffdir"); +} + START_TEST(install) { DWORD len; @@ -2497,6 +2571,7 @@ START_TEST(install) test_publish(); test_publishsourcelist(); test_transformprop(); + test_currentworkingdir(); SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : msi: Fix three tests that were failing in Windows.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: ed281b725aeaab3df51e8f6b438758878248b6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed281b725aeaab3df51e8f6b4… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 12 20:05:02 2007 -0700 msi: Fix three tests that were failing in Windows. --- dlls/msi/tests/install.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 341f02d..19cf266 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1879,7 +1879,7 @@ static void test_publish(void) state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); } r = MsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, @@ -1937,7 +1937,7 @@ static void test_publish(void) state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); } r = MsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, @@ -1995,7 +1995,7 @@ static void test_publish(void) state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); } r = MsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,

1 0

James Hawkins : msi: Fix automation.c compile for MSVC.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: c7b53d37e15487ca7cd1fe141f4bcbde36c7c846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b53d37e15487ca7cd1fe141… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 12 20:04:19 2007 -0700 msi: Fix automation.c compile for MSVC. --- dlls/msi/tests/automation.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 0189062..e7d1847 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -37,6 +37,8 @@ static const WCHAR szMSITEST[] = { 'M','S','I','T','E','S','T',0 }; static const WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; static const WCHAR szUpgradeCode[] = { '{','C','E','0','6','7','E','8','D','-','2','E','1','A','-','4','3','6','7','-','B','7','3','4','-','4','E','B','2','B','D','A','D','6','5','6','5','}',0 }; static const WCHAR szProductInfoException[] = { 'P','r','o','d','u','c','t','I','n','f','o',',','P','r','o','d','u','c','t',',','A','t','t','r','i','b','u','t','e',0 }; +static const WCHAR WINE_INSTALLPROPERTY_PACKAGENAMEW[] = {'P','a','c','k','a','g','e','N','a','m','e',0}; +static const WCHAR WINE_INSTALLPROPERTY_PRODUCTNAMEW[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; static FILETIME systemtime; static CHAR CURR_DIR[MAX_PATH]; static EXCEPINFO excepinfo; @@ -2128,13 +2130,13 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) /* Package name */ memset(szString, 0, sizeof(szString)); - hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szString); + hr = Installer_ProductInfo(szProductCode, WINE_INSTALLPROPERTY_PACKAGENAMEW, szString); todo_wine ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); todo_wine ok_w2("Installer_ProductInfo returned %s but expected %s\n", szString, szMsifile); /* Product name */ memset(szString, 0, sizeof(szString)); - hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PRODUCTNAMEW, szString); + hr = Installer_ProductInfo(szProductCode, WINE_INSTALLPROPERTY_PRODUCTNAMEW, szString); ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); ok_w2("Installer_ProductInfo returned %s but expected %s\n", szString, szMSITEST); @@ -2341,7 +2343,7 @@ static void test_Installer(void) /* Package name */ memset(szPath, 0, sizeof(szPath)); - hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szPath); + hr = Installer_ProductInfo(szProductCode, WINE_INSTALLPROPERTY_PACKAGENAMEW, szPath); ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); ok_exception(hr, szProductInfoException);

1 0

Juan Lang : crypt32: Update comments about hash message version numbers.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: d1bd2ea907bb8d80b324794715416447d4dccff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1bd2ea907bb8d80b32479471… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 15:06:21 2007 -0700 crypt32: Update comments about hash message version numbers. --- dlls/crypt32/msg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d8ab55a..e97aa0c 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -348,7 +348,7 @@ static BOOL CRYPT_EncodePKCSDigestedData(CHashEncodeMsg *msg, void *pvData, if (ret) { CRYPT_ALGORITHM_IDENTIFIER algoId = { 0 }; - DWORD version = 0; /* FIXME */ + DWORD version = CMSG_HASHED_DATA_PKCS_1_5_VERSION; struct AsnEncodeSequenceItem items[7] = { { 0 } }; DWORD cItem = 0; CRYPT_DATA_BLOB hash = { 0, NULL }; @@ -455,9 +455,11 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, SetLastError(CRYPT_E_MSG_ERROR); else { - /* FIXME: under what circumstances is this CMSG_HASHED_DATA_V2? */ DWORD version = CMSG_HASHED_DATA_PKCS_1_5_VERSION; + /* Since the data are always encoded as octets, the version is + * always 0 (see rfc3852, section 7) + */ ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&version, sizeof(version)); }

1 0

Juan Lang : crypt32: Introduce an updated state, and use it to remove boolean "begun".
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: a8e135f4c6b39ea6e0c4cee846815fb23333eeec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e135f4c6b39ea6e0c4cee84… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 15:05:45 2007 -0700 crypt32: Introduce an updated state, and use it to remove boolean "begun". --- dlls/crypt32/msg.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 001e128..d8ab55a 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -40,6 +40,7 @@ typedef BOOL (*CryptMsgUpdateFunc)(HCRYPTMSG hCryptMsg, const BYTE *pbData, typedef enum _CryptMsgState { MsgStateInit, + MsgStateUpdated, MsgStateFinalized } CryptMsgState; @@ -82,7 +83,6 @@ typedef struct _CDataEncodeMsg CryptMsgBase base; DWORD bare_content_len; LPBYTE bare_content; - BOOL begun; } CDataEncodeMsg; static const BYTE empty_data_content[] = { 0x04,0x00 }; @@ -170,11 +170,10 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, { __TRY { - if (!msg->begun) + if (msg->base.state != MsgStateUpdated) { CRYPT_DATA_BLOB header; - msg->begun = TRUE; ret = CRYPT_EncodeDataContentInfoHeader(msg, &header); if (ret) { @@ -316,7 +315,6 @@ static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, CDataEncodeMsg_Close, CDataEncodeMsg_GetParam, CDataEncodeMsg_Update); msg->bare_content_len = sizeof(empty_data_content); msg->bare_content = (LPBYTE)empty_data_content; - msg->begun = FALSE; } return (HCRYPTMSG)msg; } @@ -327,7 +325,6 @@ typedef struct _CHashEncodeMsg HCRYPTPROV prov; HCRYPTHASH hash; CRYPT_DATA_BLOB data; - BOOL begun; } CHashEncodeMsg; static void CHashEncodeMsg_Close(HCRYPTMSG hCryptMsg) @@ -367,7 +364,7 @@ static BOOL CRYPT_EncodePKCSDigestedData(CHashEncodeMsg *msg, void *pvData, items[cItem].encodeFunc = CRYPT_AsnEncodeAlgorithmIdWithNullParams; cItem++; /* Quirk: OID is only encoded messages if an update has happened */ - if (msg->begun) + if (msg->base.state != MsgStateInit) contentInfo.pszObjId = oid_rsa_data; if (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && msg->data.cbData) { @@ -479,7 +476,6 @@ static BOOL CHashEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); - msg->begun = TRUE; if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) { /* Doesn't do much, as stream output is never called, and you @@ -544,7 +540,6 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, msg->prov = prov; msg->data.cbData = 0; msg->data.pbData = NULL; - msg->begun = FALSE; if (!CryptCreateHash(prov, algID, 0, 0, &msg->hash)) { CryptMsgClose(msg); @@ -718,6 +713,7 @@ BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, else { ret = msg->update(hCryptMsg, pbData, cbData, fFinal); + msg->state = MsgStateUpdated; if (fFinal) msg->state = MsgStateFinalized; }

1 0

Juan Lang : crypt32: Change finalized from a boolean to a state and use it to simplify message updating .
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 09c4faf159c1a6897926ea559f687aa552b26d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c4faf159c1a6897926ea559… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 15:05:02 2007 -0700 crypt32: Change finalized from a boolean to a state and use it to simplify message updating. --- dlls/crypt32/msg.c | 76 +++++++++++++++++++++++---------------------- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4c495de..001e128 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -38,13 +38,18 @@ typedef BOOL (*CryptMsgGetParamFunc)(HCRYPTMSG hCryptMsg, DWORD dwParamType, typedef BOOL (*CryptMsgUpdateFunc)(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal); +typedef enum _CryptMsgState { + MsgStateInit, + MsgStateFinalized +} CryptMsgState; + typedef struct _CryptMsgBase { LONG ref; DWORD open_flags; BOOL streamed; CMSG_STREAM_INFO stream_info; - BOOL finalized; + CryptMsgState state; CryptMsgCloseFunc close; CryptMsgUpdateFunc update; CryptMsgGetParamFunc get_param; @@ -69,7 +74,7 @@ static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags, msg->close = close; msg->get_param = get_param; msg->update = update; - msg->finalized = FALSE; + msg->state = MsgStateInit; } typedef struct _CDataEncodeMsg @@ -161,12 +166,8 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, CDataEncodeMsg *msg = (CDataEncodeMsg *)hCryptMsg; BOOL ret = FALSE; - if (msg->base.finalized) - SetLastError(CRYPT_E_MSG_ERROR); - else if (msg->base.streamed) + if (msg->base.streamed) { - if (fFinal) - msg->base.finalized = TRUE; __TRY { if (!msg->begun) @@ -223,7 +224,6 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } else { - msg->base.finalized = TRUE; if (!cbData) SetLastError(E_INVALIDARG); else @@ -380,7 +380,7 @@ static BOOL CRYPT_EncodePKCSDigestedData(CHashEncodeMsg *msg, void *pvData, items[cItem].encodeFunc = CRYPT_AsnEncodePKCSContentInfoInternal; cItem++; - if (msg->base.finalized) + if (msg->base.state == MsgStateFinalized) { size = sizeof(DWORD); ret = CryptGetHashParam(msg->hash, HP_HASHSIZE, @@ -454,7 +454,7 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, 0); break; case CMSG_VERSION_PARAM: - if (!msg->base.finalized) + if (msg->base.state != MsgStateFinalized) SetLastError(CRYPT_E_MSG_ERROR); else { @@ -479,39 +479,31 @@ static BOOL CHashEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); - if (msg->base.finalized) - SetLastError(CRYPT_E_MSG_ERROR); + msg->begun = TRUE; + if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) + { + /* Doesn't do much, as stream output is never called, and you + * can't get the content. + */ + ret = CryptHashData(msg->hash, pbData, cbData, 0); + } else { - msg->begun = TRUE; - if (fFinal) - msg->base.finalized = TRUE; - if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) - { - /* Doesn't do much, as stream output is never called, and you - * can't get the content. - */ - ret = CryptHashData(msg->hash, pbData, cbData, 0); - } + if (!fFinal) + SetLastError(CRYPT_E_MSG_ERROR); else { - if (!fFinal) - SetLastError(CRYPT_E_MSG_ERROR); - else + ret = CryptHashData(msg->hash, pbData, cbData, 0); + if (ret) { - ret = CryptHashData(msg->hash, pbData, cbData, 0); - if (ret) + msg->data.pbData = CryptMemAlloc(cbData); + if (msg->data.pbData) { - msg->data.pbData = CryptMemAlloc(cbData); - if (msg->data.pbData) - { - memcpy(msg->data.pbData + msg->data.cbData, pbData, - cbData); - msg->data.cbData += cbData; - } - else - ret = FALSE; + memcpy(msg->data.pbData + msg->data.cbData, pbData, cbData); + msg->data.cbData += cbData; } + else + ret = FALSE; } } } @@ -717,9 +709,19 @@ BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal) { CryptMsgBase *msg = (CryptMsgBase *)hCryptMsg; + BOOL ret = FALSE; TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); - return msg->update(hCryptMsg, pbData, cbData, fFinal); + + if (msg->state == MsgStateFinalized) + SetLastError(CRYPT_E_MSG_ERROR); + else + { + ret = msg->update(hCryptMsg, pbData, cbData, fFinal); + if (fFinal) + msg->state = MsgStateFinalized; + } + return ret; } BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 688ae83..a41a310 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -994,7 +994,6 @@ static void test_decode_msg_update(void) /* 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);

1 0

Juan Lang : crypt32: Relax a test, the specific error isn't so important.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 9bdb084eb6945d349fcde825629c7a67ea18b9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdb084eb6945d349fcde8256… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 15:00:04 2007 -0700 crypt32: Relax a test, the specific error isn't so important. --- dlls/crypt32/tests/msg.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 5831d7b..688ae83 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -795,9 +795,7 @@ static void test_hash_msg_get_param(void) ok(value == 0, "Expected version 0, got %d\n", value); /* As usual, the type isn't available. */ ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); - todo_wine - ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, - "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + ok(!ret, "Expected failure\n"); CryptMsgClose(msg); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo,

1 0

Juan Lang : crypt32: Implement retrieving a hashed message's content.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 8599fd77487c9aa7c4a7fbda244a35fe953efc6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8599fd77487c9aa7c4a7fbda2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:59:27 2007 -0700 crypt32: Implement retrieving a hashed message's content. --- dlls/crypt32/crypt32_private.h | 17 ++++++- dlls/crypt32/encode.c | 68 +++++++++++++-------------- dlls/crypt32/msg.c | 102 +++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/msg.c | 20 -------- 4 files changed, 150 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8599fd77487c9aa7c4a7f…

1 0

Juan Lang : crypt32: Introduce an algorithm id encoding function that encodes missing parameters as NULL
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 678fb8ac14b3062a3221247f66075c5ca02862de URL: http://source.winehq.org/git/wine.git/?a=commit;h=678fb8ac14b3062a3221247f6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:58:08 2007 -0700 crypt32: Introduce an algorithm id encoding function that encodes missing parameters as NULL and use it to match native encoding (and simplify PKCS signer tests). --- dlls/crypt32/encode.c | 37 ++++++++++++++++++++++++--- dlls/crypt32/tests/encode.c | 59 ++++-------------------------------------- 2 files changed, 39 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=678fb8ac14b3062a32212…

1 0

Juan Lang : crypt32: Add tests for retrieving the content of a non-finalized (detached) message .
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 880507d9069365317a2b7fc7435e8907b3af911f URL: http://source.winehq.org/git/wine.git/?a=commit;h=880507d9069365317a2b7fc74… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:57:20 2007 -0700 crypt32: Add tests for retrieving the content of a non-finalized (detached) message. --- dlls/crypt32/tests/msg.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 03028e4..e1fcd7a 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -853,6 +853,15 @@ static const BYTE hashContent[] = { 0x07,0x01,0xa0,0x06,0x04,0x04,0x01,0x02,0x03,0x04,0x04,0x10,0x08,0xd6,0xc0, 0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; +static const BYTE detachedHashNonFinalBareContent[] = { +0x30,0x20,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x07,0x01,0x04,0x00 }; +static const BYTE detachedHashNonFinalContent[] = { +0x30,0x2f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x05,0xa0,0x22, +0x30,0x20,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x07,0x01,0x04,0x00 }; static const BYTE detachedHashBareContent[] = { 0x30,0x30,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, 0x02,0x05,0x05,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, @@ -920,9 +929,24 @@ static void test_hash_msg_encoding(void) check_param("detached hash empty content", msg, CMSG_CONTENT_PARAM, hashEmptyContent, sizeof(hashEmptyContent)); } - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); todo_wine { + check_param("detached hash not final bare content", msg, + CMSG_BARE_CONTENT_PARAM, detachedHashNonFinalBareContent, + sizeof(detachedHashNonFinalBareContent)); + check_param("detached hash not final content", msg, CMSG_CONTENT_PARAM, + detachedHashNonFinalContent, sizeof(detachedHashNonFinalContent)); + } + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + todo_wine { + check_param("detached hash bare content", msg, CMSG_BARE_CONTENT_PARAM, + detachedHashBareContent, sizeof(detachedHashBareContent)); + check_param("detached hash content", msg, CMSG_CONTENT_PARAM, + detachedHashContent, sizeof(detachedHashContent)); + } + todo_wine { check_param("detached hash bare content", msg, CMSG_BARE_CONTENT_PARAM, detachedHashBareContent, sizeof(detachedHashBareContent)); check_param("detached hash content", msg, CMSG_CONTENT_PARAM,

1 0