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

Juan Lang : crypt32: Implement CryptMsgGetAndVerifySigner.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: fc8545b43a2929a9bc337a2f3acca2cc7441354c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8545b43a2929a9bc337a2f3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 5 11:06:17 2008 -0700 crypt32: Implement CryptMsgGetAndVerifySigner. --- dlls/crypt32/msg.c | 112 ++++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/msg.c | 16 ------- 2 files changed, 109 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 1ad6a96..ff4e0f4 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2446,12 +2446,118 @@ BOOL WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, return msg->control(hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara); } +static CERT_INFO *CRYPT_GetSignerCertInfoFromMsg(HCRYPTMSG msg, + DWORD dwSignerIndex) +{ + CERT_INFO *certInfo = NULL; + DWORD size; + + if (CryptMsgGetParam(msg, CMSG_SIGNER_CERT_INFO_PARAM, dwSignerIndex, NULL, + &size)) + { + certInfo = CryptMemAlloc(size); + if (certInfo) + { + if (!CryptMsgGetParam(msg, CMSG_SIGNER_CERT_INFO_PARAM, + dwSignerIndex, certInfo, &size)) + { + CryptMemFree(certInfo); + certInfo = NULL; + } + } + } + return certInfo; +} + BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, HCERTSTORE *rghSignerStore, DWORD dwFlags, PCCERT_CONTEXT *ppSigner, DWORD *pdwSignerIndex) { - FIXME("(%p, %d, %p, %08x, %p, %p): stub\n", hCryptMsg, cSignerStore, + HCERTSTORE store; + DWORD i, signerIndex; + PCCERT_CONTEXT signerCert = NULL; + BOOL ret = FALSE; + + TRACE("(%p, %d, %p, %08x, %p, %p)\n", hCryptMsg, cSignerStore, rghSignerStore, dwFlags, ppSigner, pdwSignerIndex); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + /* Clear output parameters */ + if (ppSigner) + *ppSigner = NULL; + if (pdwSignerIndex && !(dwFlags & CMSG_USE_SIGNER_INDEX_FLAG)) + *pdwSignerIndex = 0; + + /* Create store to search for signer certificates */ + store = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (!(dwFlags & CMSG_TRUSTED_SIGNER_FLAG)) + { + HCERTSTORE msgStore = CertOpenStore(CERT_STORE_PROV_MSG, 0, 0, 0, + hCryptMsg); + + CertAddStoreToCollection(store, msgStore, 0, 0); + CertCloseStore(msgStore, 0); + } + for (i = 0; i < cSignerStore; i++) + CertAddStoreToCollection(store, rghSignerStore[i], 0, 0); + + /* Find signer cert */ + if (dwFlags & CMSG_USE_SIGNER_INDEX_FLAG) + { + CERT_INFO *signer = CRYPT_GetSignerCertInfoFromMsg(hCryptMsg, + *pdwSignerIndex); + + if (signer) + { + signerIndex = *pdwSignerIndex; + signerCert = CertFindCertificateInStore(store, X509_ASN_ENCODING, + 0, CERT_FIND_SUBJECT_CERT, signer, NULL); + CryptMemFree(signer); + } + } + else + { + DWORD count, size = sizeof(count); + + if (CryptMsgGetParam(hCryptMsg, CMSG_SIGNER_COUNT_PARAM, 0, &count, + &size)) + { + for (i = 0; !signerCert && i < count; i++) + { + CERT_INFO *signer = CRYPT_GetSignerCertInfoFromMsg(hCryptMsg, + i); + + if (signer) + { + signerCert = CertFindCertificateInStore(store, + X509_ASN_ENCODING, 0, CERT_FIND_SUBJECT_CERT, signer, + NULL); + if (signerCert) + signerIndex = i; + CryptMemFree(signer); + } + } + } + if (!signerCert) + SetLastError(CRYPT_E_NO_TRUSTED_SIGNER); + } + if (signerCert) + { + if (!(dwFlags & CMSG_SIGNER_ONLY_FLAG)) + ret = CryptMsgControl(hCryptMsg, 0, CMSG_CTRL_VERIFY_SIGNATURE, + signerCert->pCertInfo); + else + ret = TRUE; + if (ret) + { + if (ppSigner) + *ppSigner = CertDuplicateCertificateContext(signerCert); + if (pdwSignerIndex) + *pdwSignerIndex = signerIndex; + } + CertFreeCertificateContext(signerCert); + } + + CertCloseStore(store, 0); + return ret; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 53652c6..0f7dcb6 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2580,26 +2580,21 @@ static void test_msg_get_and_verify_signer(void) /* An empty message has no signer */ SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); /* The signer is cleared on error */ signer = (PCCERT_CONTEXT)0xdeadbeef; SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, &signer, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); - todo_wine ok(!signer, "expected signer to be NULL\n"); /* The signer index is also cleared on error */ signerIndex = 0xdeadbeef; SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, &signerIndex); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); - todo_wine ok(!signerIndex, "expected 0, got %d\n", signerIndex); /* An unsigned message (msgData isn't a signed message at all) * likewise has no signer. @@ -2607,7 +2602,6 @@ static void test_msg_get_and_verify_signer(void) CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); CryptMsgClose(msg); @@ -2617,7 +2611,6 @@ static void test_msg_get_and_verify_signer(void) CryptMsgUpdate(msg, signedEmptyContent, sizeof(signedEmptyContent), TRUE); SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); CryptMsgClose(msg); @@ -2627,21 +2620,16 @@ static void test_msg_get_and_verify_signer(void) CryptMsgUpdate(msg, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent), TRUE); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); - todo_wine ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); /* the signer index can be retrieved, .. */ signerIndex = 0xdeadbeef; ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, &signerIndex); - todo_wine ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); - todo_wine ok(signerIndex == 0, "expected 0, got %d\n", signerIndex); /* as can the signer cert. */ signer = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, &signer, NULL); - todo_wine ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); - todo_wine ok(signer != NULL && signer != (PCCERT_CONTEXT)0xdeadbeef, "expected a valid signer\n"); if (signer && signer != (PCCERT_CONTEXT)0xdeadbeef) @@ -2652,7 +2640,6 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, CMSG_USE_SIGNER_INDEX_FLAG, NULL, &signerIndex); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "expected CRYPT_E_INVALID_INDEX, got 0x%08x\n", GetLastError()); /* Specifying CMSG_TRUSTED_SIGNER_FLAG and no cert stores causes the @@ -2661,7 +2648,6 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); /* Specifying CMSG_TRUSTED_SIGNER_FLAG and an empty cert store also causes @@ -2672,7 +2658,6 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 1, &store, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, @@ -2686,7 +2671,6 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 1, &store, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - todo_wine ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); CertCloseStore(store, 0); CryptMsgClose(msg);

1 0

Alistair Leslie-Hughes : advapi32: Fix two tests for w2k8.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 4d6d09553b8ecc08593bf9bd47ba98f11f5f86d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6d09553b8ecc08593bf9bd4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 7 20:57:44 2008 +1000 advapi32: Fix two tests for w2k8. --- dlls/advapi32/tests/security.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index fd3407f..6b0ecfa 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -586,8 +586,9 @@ static void test_lookupPrivilegeName(void) luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; cchName = sizeof(buf); ret = pLookupPrivilegeNameA("b0gu5.Nam3", &luid, buf, &cchName); - ok( !ret && GetLastError() == RPC_S_SERVER_UNAVAILABLE, - "LookupPrivilegeNameA didn't fail with RPC_S_SERVER_UNAVAILABLE: %d\n", + ok( !ret && (GetLastError() == RPC_S_SERVER_UNAVAILABLE || + GetLastError() == RPC_S_INVALID_NET_ADDR) /* w2k8 */, + "LookupPrivilegeNameA didn't fail with RPC_S_SERVER_UNAVAILABLE or RPC_S_INVALID_NET_ADDR: %d\n", GetLastError()); } @@ -644,8 +645,9 @@ static void test_lookupPrivilegeValue(void) /* check a bogus system name */ ret = pLookupPrivilegeValueA("b0gu5.Nam3", "SeCreateTokenPrivilege", &luid); - ok( !ret && GetLastError() == RPC_S_SERVER_UNAVAILABLE, - "LookupPrivilegeValueA didn't fail with RPC_S_SERVER_UNAVAILABLE: %d\n", + ok( !ret && (GetLastError() == RPC_S_SERVER_UNAVAILABLE || + GetLastError() == RPC_S_INVALID_NET_ADDR) /* w2k8 */, + "LookupPrivilegeValueA didn't fail with RPC_S_SERVER_UNAVAILABLE or RPC_S_INVALID_NET_ADDR: %d\n", GetLastError()); /* check a NULL string */ ret = pLookupPrivilegeValueA(NULL, 0, &luid);

1 0

Alistair Leslie-Hughes : advapi32: Fix test under w2k8.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 905817a5891b106fa1df9dd262a4fc2d20e7c6ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=905817a5891b106fa1df9dd26… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 7 21:01:58 2008 +1000 advapi32: Fix test under w2k8. --- dlls/advapi32/tests/service.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index cd6d82c..829cfe7 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -66,7 +66,8 @@ static void test_open_scm(void) scm_handle = OpenSCManagerA("DOESNOTEXIST", SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CONNECT); ok(!scm_handle, "Expected failure\n"); todo_wine - ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE, "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == RPC_S_INVALID_NET_ADDR /* w2k8 */, + "Expected RPC_S_SERVER_UNAVAILABLE or RPC_S_INVALID_NET_ADDR, got %d\n", GetLastError()); CloseServiceHandle(scm_handle); /* Just in case */ /* Proper call with an empty hostname */

1 0

James Hawkins : msi: Also check the LocalPackage install property when searching for the product package .
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 6e63953b4c8c0f50a102d7ea4847352a6aedc346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e63953b4c8c0f50a102d7ea4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Aug 5 10:28:27 2008 -0500 msi: Also check the LocalPackage install property when searching for the product package. --- dlls/msi/msi.c | 59 +++++++++++++++++++++++++++++++++++++-------- dlls/msi/tests/install.c | 16 ++++-------- 2 files changed, 53 insertions(+), 22 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c5dd57d..9055c59 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -372,6 +372,53 @@ done: return r; } +static UINT msi_open_package(LPCWSTR product, MSIINSTALLCONTEXT context, + MSIPACKAGE **package) +{ + UINT r; + DWORD sz; + HKEY props; + LPWSTR localpack; + WCHAR sourcepath[MAX_PATH]; + WCHAR filename[MAX_PATH]; + + static const WCHAR szLocalPackage[] = { + 'L','o','c','a','l','P','a','c','k','a','g','e',0}; + + if (context == MSIINSTALLCONTEXT_MACHINE) + r = MSIREG_OpenLocalSystemInstallProps(product, &props, FALSE); + else + r = MSIREG_OpenCurrentUserInstallProps(product, &props, FALSE); + + if (r != ERROR_SUCCESS) + return ERROR_BAD_CONFIGURATION; + + localpack = msi_reg_get_val_str(props, szLocalPackage); + if (localpack) + { + lstrcpyW(sourcepath, localpack); + msi_free(localpack); + } + + if (!localpack || GetFileAttributesW(sourcepath) == INVALID_FILE_ATTRIBUTES) + { + sz = sizeof(sourcepath); + MsiSourceListGetInfoW(product, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); + + sz = sizeof(filename); + MsiSourceListGetInfoW(product, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); + + lstrcatW(sourcepath, filename); + } + + if (GetFileAttributesW(sourcepath) == INVALID_FILE_ATTRIBUTES) + return ERROR_INSTALL_SOURCE_ABSENT; + + return MSI_OpenPackageW(sourcepath, package); +} + UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, INSTALLSTATE eInstallState, LPCWSTR szCommandLine) { @@ -380,7 +427,6 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, UINT r; DWORD sz; WCHAR sourcepath[MAX_PATH]; - WCHAR filename[MAX_PATH]; LPWSTR commandline; static const WCHAR szInstalled[] = { @@ -407,16 +453,7 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (r != ERROR_SUCCESS) return r; - sz = sizeof(sourcepath); - MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, - INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); - - sz = sizeof(filename); - MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, - INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); - - lstrcatW(sourcepath, filename); - r = MSI_OpenPackageW(sourcepath, &package); + r = msi_open_package(szProduct, context, &package); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index cf65abe..6f15720 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5118,9 +5118,9 @@ static void test_MsiConfigureProductEx(void) r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); todo_wine { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); @@ -5154,11 +5154,8 @@ static void test_MsiConfigureProductEx(void) r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); - todo_wine - { - ok(r == ERROR_INSTALL_SOURCE_ABSENT, - "Expected ERROR_INSTALL_SOURCE_ABSENT, got %d\n", r); - } + ok(r == ERROR_INSTALL_SOURCE_ABSENT, + "Expected ERROR_INSTALL_SOURCE_ABSENT, got %d\n", r); ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); ok(pf_exists("msitest\\helium"), "File not installed\n"); ok(pf_exists("msitest\\lithium"), "File not installed\n"); @@ -5219,11 +5216,8 @@ static void test_MsiConfigureProductEx(void) r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); - todo_wine - { - ok(r == ERROR_INSTALL_SOURCE_ABSENT, - "Expected ERROR_INSTALL_SOURCE_ABSENT, got %d\n", r); - } + ok(r == ERROR_INSTALL_SOURCE_ABSENT, + "Expected ERROR_INSTALL_SOURCE_ABSENT, got %d\n", r); ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); ok(pf_exists("msitest\\helium"), "File not installed\n"); ok(pf_exists("msitest\\lithium"), "File not installed\n");

1 0

Kirill K. Smirnov : winhlp32: Set correct font size while generating rtf stream.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: e8eb6d1b4227fa40391299ba3e5e806c575f6ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8eb6d1b4227fa40391299ba3… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Tue Aug 5 19:50:27 2008 +0400 winhlp32: Set correct font size while generating rtf stream. --- programs/winhlp32/hlpfile.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 7f1a931..05d5347 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1290,12 +1290,14 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, WINE_TRACE("Changing font to %d\n", font); format += 3; + /* Font size in hlpfile is given in the same units as + rtf control word \fs uses (half-points). */ switch (rd->font_scale) { - case 0: fs = (4 * page->file->fonts[font].LogFont.lfHeight - 13) / 5; break; + case 0: fs = page->file->fonts[font].LogFont.lfHeight - 4; break; default: - case 1: fs = (4 * page->file->fonts[font].LogFont.lfHeight - 3) / 5; break; - case 2: fs = (4 * page->file->fonts[font].LogFont.lfHeight + 17) / 5; break; + case 1: fs = page->file->fonts[font].LogFont.lfHeight; break; + case 2: fs = page->file->fonts[font].LogFont.lfHeight + 4; break; } /* FIXME: missing at least colors, also bold attribute looses information */

1 0

Andrew Talbot : dmime: Indirection levels fix.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 3bf289aecc914edb379393ca8a817afc6f79e415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf289aecc914edb379393ca8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 5 21:56:33 2008 +0100 dmime: Indirection levels fix. --- dlls/dmime/performance.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index ad3d740..2c4560e 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -620,13 +620,13 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetGlobalParam (LPDIRECTMUSIC TRACE("(%p, %s, %p, %d): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) - memcpy(pParam, &This->fAutoDownload, sizeof(&This->fAutoDownload)); + memcpy(pParam, &This->fAutoDownload, sizeof(This->fAutoDownload)); if (IsEqualGUID (rguidType, &GUID_PerfMasterGrooveLevel)) - memcpy(pParam, &This->cMasterGrooveLevel, sizeof(&This->cMasterGrooveLevel)); + memcpy(pParam, &This->cMasterGrooveLevel, sizeof(This->cMasterGrooveLevel)); if (IsEqualGUID (rguidType, &GUID_PerfMasterTempo)) - memcpy(pParam, &This->fMasterTempo, sizeof(&This->fMasterTempo)); + memcpy(pParam, &This->fMasterTempo, sizeof(This->fMasterTempo)); if (IsEqualGUID (rguidType, &GUID_PerfMasterVolume)) - memcpy(pParam, &This->lMasterVolume, sizeof(&This->lMasterVolume)); + memcpy(pParam, &This->lMasterVolume, sizeof(This->lMasterVolume)); return S_OK; }

1 0

Juan Lang : crypt32: Add stub for CryptMsgGetAndVerifySigner.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 35b126a0330594ecf2d2f7983acfc93175594419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b126a0330594ecf2d2f7983… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 4 22:13:56 2008 -0700 crypt32: Add stub for CryptMsgGetAndVerifySigner. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index a5ef37d..485421f 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -148,7 +148,7 @@ @ stub CryptMsgCountersignEncoded @ stdcall CryptMsgDuplicate(ptr) @ stub CryptMsgEncodeAndSignCTL -@ stub CryptMsgGetAndVerifySigner +@ stdcall CryptMsgGetAndVerifySigner(ptr long ptr long ptr ptr) @ stdcall CryptMsgGetParam(ptr long long ptr ptr) @ stdcall CryptMsgOpenToDecode(long long long long ptr ptr) @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4571607..1ad6a96 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2445,3 +2445,13 @@ BOOL WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, pvCtrlPara); return msg->control(hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara); } + +BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, + HCERTSTORE *rghSignerStore, DWORD dwFlags, PCCERT_CONTEXT *ppSigner, + DWORD *pdwSignerIndex) +{ + FIXME("(%p, %d, %p, %08x, %p, %p): stub\n", hCryptMsg, cSignerStore, + rghSignerStore, dwFlags, ppSigner, pdwSignerIndex); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Juan Lang : crypt32: Add tests for CryptMsgGetAndVerifySigner.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: d677f6084d9a1436f85f85a61277c4a6f1f2fd55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d677f6084d9a1436f85f85a61… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 5 10:20:59 2008 -0700 crypt32: Add tests for CryptMsgGetAndVerifySigner. --- 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 bfebeaa..53652c6 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2561,6 +2561,137 @@ static BOOL detect_nt(void) return TRUE; } +static void test_msg_get_and_verify_signer(void) +{ + BOOL ret; + HCRYPTMSG msg; + PCCERT_CONTEXT signer; + DWORD signerIndex; + HCERTSTORE store; + + /* Crash */ + if (0) + { + ret = CryptMsgGetAndVerifySigner(NULL, 0, NULL, 0, NULL, NULL); + ret = CryptMsgGetAndVerifySigner(NULL, 0, NULL, 0, NULL, &signerIndex); + } + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + /* An empty message has no signer */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + /* The signer is cleared on error */ + signer = (PCCERT_CONTEXT)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, &signer, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + todo_wine + ok(!signer, "expected signer to be NULL\n"); + /* The signer index is also cleared on error */ + signerIndex = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, &signerIndex); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + todo_wine + ok(!signerIndex, "expected 0, got %d\n", signerIndex); + /* An unsigned message (msgData isn't a signed message at all) + * likewise has no signer. + */ + CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + /* A "signed" message created with no signer cert likewise has no signer */ + CryptMsgUpdate(msg, signedEmptyContent, sizeof(signedEmptyContent), TRUE); + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + /* A signed message succeeds, .. */ + CryptMsgUpdate(msg, signedWithCertWithValidPubKeyContent, + sizeof(signedWithCertWithValidPubKeyContent), TRUE); + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); + todo_wine + ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); + /* the signer index can be retrieved, .. */ + signerIndex = 0xdeadbeef; + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, &signerIndex); + todo_wine + ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); + todo_wine + ok(signerIndex == 0, "expected 0, got %d\n", signerIndex); + /* as can the signer cert. */ + signer = (PCCERT_CONTEXT)0xdeadbeef; + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, &signer, NULL); + todo_wine + ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); + todo_wine + ok(signer != NULL && signer != (PCCERT_CONTEXT)0xdeadbeef, + "expected a valid signer\n"); + if (signer && signer != (PCCERT_CONTEXT)0xdeadbeef) + CertFreeCertificateContext(signer); + /* Specifying CMSG_USE_SIGNER_INDEX_FLAG and an invalid signer index fails + */ + signerIndex = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, CMSG_USE_SIGNER_INDEX_FLAG, + NULL, &signerIndex); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "expected CRYPT_E_INVALID_INDEX, got 0x%08x\n", GetLastError()); + /* Specifying CMSG_TRUSTED_SIGNER_FLAG and no cert stores causes the + * message signer not to be found. + */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, CMSG_TRUSTED_SIGNER_FLAG, + NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + /* Specifying CMSG_TRUSTED_SIGNER_FLAG and an empty cert store also causes + * the message signer not to be found. + */ + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 1, &store, CMSG_TRUSTED_SIGNER_FLAG, + NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, + v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey), + CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCertificateToStore failed: 0x%08x\n", + GetLastError()); + /* Specifying CMSG_TRUSTED_SIGNER_FLAG with a cert store that contains + * the signer succeeds. + */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetAndVerifySigner(msg, 1, &store, CMSG_TRUSTED_SIGNER_FLAG, + NULL, NULL); + todo_wine + ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); + CertCloseStore(store, 0); + CryptMsgClose(msg); +} + START_TEST(msg) { init_function_pointers(); @@ -2578,4 +2709,6 @@ START_TEST(msg) test_hash_msg(); test_signed_msg(); test_decode_msg(); + + test_msg_get_and_verify_signer(); }

1 0

Paul Vriens : ole32/tests: Fix a test on win98 and W2K.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: d46f93669d043dd7d294390a621a3c5d72cd3502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46f93669d043dd7d294390a6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 5 17:25:28 2008 +0200 ole32/tests: Fix a test on win98 and W2K. --- dlls/ole32/tests/ole2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 5ca6009..cc3476d 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -844,9 +844,8 @@ static void test_OleLoad(IStorage *pStorage) trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); ok(hr == S_OK || - broken(hr == E_INVALIDARG), /* win2k */ + broken(hr == E_INVALIDARG), /* win98 and win2k */ "OleLoad failed with error 0x%08x\n", hr); - ok_ole_success(hr, "OleLoad"); if (pObject) { IOleObject_Release(pObject);

1 0

James Hawkins : msi: Test how MsiConfigureProductEx locates the source package.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: d500dc4f317c7067a2c9ab63375b3529a59e4408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d500dc4f317c7067a2c9ab633… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Aug 5 10:27:50 2008 -0500 msi: Test how MsiConfigureProductEx locates the source package. --- dlls/msi/tests/install.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6e91adc..cf65abe 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4987,6 +4987,11 @@ static void test_sourcepath(void) static void test_MsiConfigureProductEx(void) { UINT r; + LONG res; + DWORD type, size; + HKEY props, source; + CHAR keypath[MAX_PATH * 2]; + CHAR localpack[MAX_PATH]; CreateDirectoryA("msitest", NULL); create_file("msitest\\hydrogen", 500); @@ -5099,7 +5104,152 @@ static void test_MsiConfigureProductEx(void) ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + /* install the product, machine */ + r = MsiInstallProductA(msifile, "ALLUSERS=1 INSTALLLEVEL=10 PROPVAR=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); + ok(pf_exists("msitest\\helium"), "File not installed\n"); + ok(pf_exists("msitest\\lithium"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + DeleteFileA(msifile); + + /* local msifile is removed */ + r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", + INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, + "PROPVAR=42"); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest", FALSE), "File not removed\n"); + } + + create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table)); + + /* install the product, machine */ + r = MsiInstallProductA(msifile, "ALLUSERS=1 INSTALLLEVEL=10 PROPVAR=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); + ok(pf_exists("msitest\\helium"), "File not installed\n"); + ok(pf_exists("msitest\\lithium"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + DeleteFileA(msifile); + + lstrcpyA(keypath, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\"); + lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\"); + lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties"); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &props); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, + (const BYTE *)"C:\\idontexist.msi", 18); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* LocalPackage is used to find the cached msi package */ + r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", + INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, + "PROPVAR=42"); + todo_wine + { + ok(r == ERROR_INSTALL_SOURCE_ABSENT, + "Expected ERROR_INSTALL_SOURCE_ABSENT, got %d\n", r); + } + ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); + ok(pf_exists("msitest\\helium"), "File not installed\n"); + ok(pf_exists("msitest\\lithium"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + RegCloseKey(props); + create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table)); + + /* LastUsedSource (local msi package) can be used as a last resort */ + r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", + INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, + "PROPVAR=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest", FALSE), "File not removed\n"); + } + + /* install the product, machine */ + r = MsiInstallProductA(msifile, "ALLUSERS=1 INSTALLLEVEL=10 PROPVAR=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); + ok(pf_exists("msitest\\helium"), "File not installed\n"); + ok(pf_exists("msitest\\lithium"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + lstrcpyA(keypath, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\"); + lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\"); + lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties"); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &props); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, + (const BYTE *)"C:\\idontexist.msi", 18); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + lstrcpyA(keypath, "SOFTWARE\\Classes\\Installer\\Products\\"); + lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\SourceList"); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &source); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + type = REG_SZ; + size = MAX_PATH; + res = RegQueryValueExA(source, "PackageName", NULL, &type, + (LPBYTE)localpack, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegSetValueExA(source, "PackageName", 0, REG_SZ, + (const BYTE *)"idontexist.msi", 15); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* SourceList is altered */ + r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", + INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, + "PROPVAR=42"); + todo_wine + { + ok(r == ERROR_INSTALL_SOURCE_ABSENT, + "Expected ERROR_INSTALL_SOURCE_ABSENT, got %d\n", r); + } + ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); + ok(pf_exists("msitest\\helium"), "File not installed\n"); + ok(pf_exists("msitest\\lithium"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + /* restore the SourceList */ + res = RegSetValueExA(source, "PackageName", 0, REG_SZ, + (const BYTE *)localpack, lstrlenA(localpack) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* finally remove the product */ + r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", + INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, + "PROPVAR=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest", FALSE), "File not removed\n"); + } + DeleteFileA(msifile); + RegCloseKey(source); + RegCloseKey(props); DeleteFileA("msitest\\hydrogen"); DeleteFileA("msitest\\helium"); DeleteFileA("msitest\\lithium");

1 0