October 2008 - Wine-commits

Michael Stefaniuc : comctl32: Just use 0 instead of casting NULL twice to an integer type.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 758f7992057ba4c012af2a3b4c1c3ff78c516093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758f7992057ba4c012af2a3b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 25 00:12:00 2008 +0200 comctl32: Just use 0 instead of casting NULL twice to an integer type. --- dlls/comctl32/treeview.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 2505042..6605060 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1220,7 +1220,7 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i if (!TREEVIEW_ValidItem(infoPtr, parentItem)) { WARN("invalid parent %p\n", parentItem); - return (LRESULT)(HTREEITEM)NULL; + return 0; } } @@ -1251,13 +1251,13 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i newItem = TREEVIEW_AllocateItem(infoPtr); if (newItem == NULL) - return (LRESULT)(HTREEITEM)NULL; + return 0; newItem->parent = parentItem; newItem->iIntegral = 1; if (!TREEVIEW_DoSetItemT(infoPtr, newItem, tvItem, isW)) - return (LRESULT)(HTREEITEM)NULL; + return 0; /* After this point, nothing can fail. (Except for TVI_SORT.) */ @@ -3461,14 +3461,14 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) if (status) { lpht->flags = status; - return (LRESULT)(HTREEITEM)NULL; + return 0; } wineItem = TREEVIEW_HitTestPoint(infoPtr, lpht->pt); if (!wineItem) { lpht->flags = TVHT_NOWHERE; - return (LRESULT)(HTREEITEM)NULL; + return 0; } if (x >= wineItem->textOffset + wineItem->textWidth)

1 0

Michael Stefaniuc : advapi32/tests: Use 0 instead of casting NULL to a handle of integer type.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: dfb8e7cba3f6ce53f8a3798e7e4141d6147292fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb8e7cba3f6ce53f8a3798e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 25 00:11:21 2008 +0200 advapi32/tests: Use 0 instead of casting NULL to a handle of integer type. --- dlls/advapi32/tests/crypt.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 1d2cfa2..09a23fc 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -274,11 +274,11 @@ static void test_incorrect_api_usage(void) ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); dwLen = 1; - result = pCryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, &temp, &dwLen); + result = pCryptDecrypt(hKey, 0, TRUE, 0, &temp, &dwLen); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); dwLen = 1; - result = pCryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, &temp, &dwLen, 1); + result = pCryptEncrypt(hKey, 0, TRUE, 0, &temp, &dwLen, 1); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = pCryptDeriveKey(hProv, CALG_RC4, hHash, 0, &hKey2); @@ -293,7 +293,7 @@ static void test_incorrect_api_usage(void) #endif dwLen = 1; - result = pCryptExportKey(hKey, (HCRYPTPROV)NULL, 0, 0, &temp, &dwLen); + result = pCryptExportKey(hKey, 0, 0, 0, &temp, &dwLen); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey2); @@ -320,7 +320,7 @@ static void test_incorrect_api_usage(void) result = pCryptHashSessionKey(hHash, hKey, 0); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); - result = pCryptImportKey(hProv, &temp, 1, (HCRYPTKEY)NULL, 0, &hKey2); + result = pCryptImportKey(hProv, &temp, 1, 0, 0, &hKey2); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); if (pCryptSignHashW)

1 0

Michael Stefaniuc : rsaenh: Use 0 instead of casting NULL to a handle of integer type.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 9cafb9c1685ebb84da0b65f119f2e1027ff994a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cafb9c1685ebb84da0b65f11… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 25 00:11:47 2008 +0200 rsaenh: Use 0 instead of casting NULL to a handle of integer type. --- dlls/rsaenh/rsaenh.c | 4 +- dlls/rsaenh/tests/rsaenh.c | 74 ++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9cafb9c1685ebb84da0b6…

1 0

Juan Lang : cryptui: Support importing certificate contexts.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 3f705af9614b5a43993bf2349213c3d7c28c50cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f705af9614b5a43993bf2349… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 24 14:35:39 2008 -0700 cryptui: Support importing certificate contexts. --- dlls/cryptui/main.c | 32 +++++++++++++++++++++++--------- dlls/cryptui/tests/cryptui.c | 6 +----- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index e55a8ba..ba1e33d 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -146,12 +146,11 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT BOOL ret; HCERTSTORE store; const CERT_CONTEXT *cert; + BOOL freeCert = FALSE; TRACE("(0x%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), pImportSrc, hDestCertStore); - FIXME("only certificate files are supported\n"); - if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) FIXME("UI not implemented\n"); if (!pImportSrc || @@ -161,14 +160,28 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT return FALSE; } - if (pImportSrc->dwSubjectChoice != CRYPTUI_WIZ_IMPORT_SUBJECT_FILE) + switch (pImportSrc->dwSubjectChoice) { + case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE: + if (!(cert = make_cert_from_file(pImportSrc->pwszFileName))) + { + WARN("unable to create certificate context\n"); + return FALSE; + } + else + freeCert = TRUE; + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: + cert = pImportSrc->pCertContext; + if (!cert) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + break; + default: FIXME("source type not implemented: %u\n", pImportSrc->dwSubjectChoice); - return FALSE; - } - if (!(cert = make_cert_from_file(pImportSrc->pwszFileName))) - { - WARN("unable to create certificate context\n"); + SetLastError(E_INVALIDARG); return FALSE; } if (hDestCertStore) store = hDestCertStore; @@ -185,6 +198,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT ret = CertAddCertificateContextToStore(store, cert, CERT_STORE_ADD_REPLACE_EXISTING, NULL); if (!hDestCertStore) CertCloseStore(store, 0); - CertFreeCertificateContext(cert); + if (freeCert) + CertFreeCertificateContext(cert); return ret; } diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 75e78be..ea3f848 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -202,19 +202,16 @@ static void test_crypt_ui_wiz_import(void) info.dwSize = sizeof(info); SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); info.dwSubjectChoice = CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT; SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); /* Imports the following cert--self-signed, with no basic constraints set-- @@ -287,10 +284,9 @@ static void test_crypt_ui_wiz_import(void) } ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE, 0, NULL, &info, store); - todo_wine ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); find_and_delete_cert_in_store(store, "memory", info.u.pCertContext, - "iTunesCert3", TRUE); + "iTunesCert3", FALSE); CertFreeCertificateContext(info.u.pCertContext); CertCloseStore(store, 0);

1 0

Juan Lang : cryptui: Test the import destination of a couple more certs.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 4b66952b7afad261ebfdf639fb38ff9a343d951d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b66952b7afad261ebfdf639f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 24 14:36:07 2008 -0700 cryptui: Test the import destination of a couple more certs. --- dlls/cryptui/tests/cryptui.c | 194 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 194 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b66952b7afad261ebfdf…

1 0

Juan Lang : cryptui: Choose appropriate destination store for a cert.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: ab9a53f68551072119d40f15041d796cfa864708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9a53f68551072119d40f150… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 24 14:37:02 2008 -0700 cryptui: Choose appropriate destination store for a cert. --- dlls/cryptui/main.c | 74 ++++++++++++++++++++++++++++++++++++++++-- dlls/cryptui/tests/cryptui.c | 9 ++--- 2 files changed, 74 insertions(+), 9 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index ba1e33d..3b116f0 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -139,10 +139,79 @@ static PCCERT_CONTEXT make_cert_from_file(LPCWSTR fileName) return cert; } +/* Decodes a cert's basic constraints extension (either szOID_BASIC_CONSTRAINTS + * or szOID_BASIC_CONSTRAINTS2, whichever is present) to determine if it + * should be a CA. If neither extension is present, returns + * defaultIfNotSpecified. + */ +static BOOL is_ca_cert(PCCERT_CONTEXT cert, BOOL defaultIfNotSpecified) +{ + BOOL isCA = defaultIfNotSpecified; + PCERT_EXTENSION ext = CertFindExtension(szOID_BASIC_CONSTRAINTS, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); + + if (ext) + { + CERT_BASIC_CONSTRAINTS_INFO *info; + DWORD size = 0; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, szOID_BASIC_CONSTRAINTS, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, + NULL, (LPBYTE)&info, &size)) + { + if (info->SubjectType.cbData == 1) + isCA = info->SubjectType.pbData[0] & CERT_CA_SUBJECT_FLAG; + LocalFree(info); + } + } + else + { + ext = CertFindExtension(szOID_BASIC_CONSTRAINTS2, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); + if (ext) + { + CERT_BASIC_CONSTRAINTS2_INFO info; + DWORD size = sizeof(CERT_BASIC_CONSTRAINTS2_INFO); + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, + szOID_BASIC_CONSTRAINTS2, ext->Value.pbData, ext->Value.cbData, + 0, NULL, &info, &size)) + isCA = info.fCA; + } + } + return isCA; +} + +static inline BOOL is_cert_self_signed(PCCERT_CONTEXT cert) +{ + return CertCompareCertificateName(cert->dwCertEncodingType, + &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); +} + +static HCERTSTORE choose_store_for_cert(PCCERT_CONTEXT cert) +{ + static const WCHAR Root[] = {'R','o','o','t',0}; + static const WCHAR AddressBook[] = { 'A','d','d','r','e','s','s', + 'B','o','o','k',0 }; + static const WCHAR CA[] = { 'C','A',0 }; + LPCWSTR storeName; + + if (is_ca_cert(cert, TRUE)) + { + if (is_cert_self_signed(cert)) + storeName = Root; + else + storeName = CA; + } + else + storeName = AddressBook; + return CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, storeName); +} + BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore) { - static const WCHAR Root[] = {'R','o','o','t',0}; BOOL ret; HCERTSTORE store; const CERT_CONTEXT *cert; @@ -187,8 +256,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT if (hDestCertStore) store = hDestCertStore; else { - FIXME("certificate store should be determined dynamically, picking Root store\n"); - if (!(store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, Root))) + if (!(store = choose_store_for_cert(cert))) { WARN("unable to open certificate store\n"); CertFreeCertificateContext(cert); diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index b70011a..2ffc83e 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -396,7 +396,6 @@ static void test_crypt_ui_wiz_import(void) info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert3, sizeof(iTunesCert3)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); - todo_wine ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { @@ -408,7 +407,7 @@ static void test_crypt_ui_wiz_import(void) if (addressBook) { find_and_delete_cert_in_store(addressBook, "AddressBook", - info.u.pCertContext, "iTunesCert3", TRUE); + info.u.pCertContext, "iTunesCert3", FALSE); CertCloseStore(addressBook, 0); } } @@ -446,7 +445,6 @@ static void test_crypt_ui_wiz_import(void) info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert1, sizeof(iTunesCert1)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); - todo_wine ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { @@ -458,7 +456,7 @@ static void test_crypt_ui_wiz_import(void) if (addressBook) { find_and_delete_cert_in_store(addressBook, "AddressBook", - info.u.pCertContext, "iTunesCert1", TRUE); + info.u.pCertContext, "iTunesCert1", FALSE); CertCloseStore(addressBook, 0); } } @@ -467,7 +465,6 @@ static void test_crypt_ui_wiz_import(void) info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert2, sizeof(iTunesCert2)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); - todo_wine ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) { @@ -478,7 +475,7 @@ static void test_crypt_ui_wiz_import(void) if (ca) { find_and_delete_cert_in_store(ca, "CA", - info.u.pCertContext, "iTunesCert2", TRUE); + info.u.pCertContext, "iTunesCert2", FALSE); CertCloseStore(ca, 0); } }

1 0

Juan Lang : crypt32: Fix a failing test on Windows.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 80b33c8aebee52095b359789d0d934a5dc98dbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b33c8aebee52095b359789d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 24 15:33:23 2008 -0700 crypt32: Fix a failing test on Windows. --- dlls/crypt32/tests/chain.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index cafe814..5bfc58c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1509,8 +1509,12 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus4 }, 0 }, + /* Windows versions prior to Vista/2008 incorrectly set + * CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT on this chain, so ignore it. + */ { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, - { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus5 }, 0 }, { { sizeof(chain6) / sizeof(chain6[0]), chain6 },

1 0

Juan Lang : cryptui: Add tests for CryptUIWizImport.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 7e0e1a1f9d9de4d5f28f9b39b2199c805541f7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0e1a1f9d9de4d5f28f9b39b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 24 14:34:27 2008 -0700 cryptui: Add tests for CryptUIWizImport. --- configure | 9 ++ configure.ac | 1 + dlls/cryptui/tests/Makefile.in | 13 ++ dlls/cryptui/tests/cryptui.c | 312 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 335 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e0e1a1f9d9de4d5f28f9…

1 0

Juan Lang : cryptui: Improve parameter checking.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: caa64b4d03e2bf70fb3e1dedab0717f29b16a111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa64b4d03e2bf70fb3e1deda… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 24 14:34:52 2008 -0700 cryptui: Improve parameter checking. --- dlls/cryptui/main.c | 3 ++- dlls/cryptui/tests/cryptui.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b31763d..065bd6d 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -117,7 +117,8 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) FIXME("UI not implemented\n"); - if (!pImportSrc) + if (!pImportSrc || + pImportSrc->dwSize != sizeof(CRYPTUI_WIZ_IMPORT_SRC_INFO)) { SetLastError(E_INVALIDARG); return FALSE; diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index d2d4c6f..75e78be 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -197,7 +197,6 @@ static void test_crypt_ui_wiz_import(void) memset(&info, 0, sizeof(info)); SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); info.dwSize = sizeof(info);

1 0

Juan Lang : cryptui: Move cert creation to a helper function.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: dd815611235f16ffd94570205fb1d82ce66ba7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd815611235f16ffd94570205… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 24 14:35:14 2008 -0700 cryptui: Move cert creation to a helper function. --- dlls/cryptui/main.c | 76 +++++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 065bd6d..e55a8ba 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -99,15 +99,52 @@ BOOL WINAPI CryptUIDlgViewCertificateW(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertVi return TRUE; } +static PCCERT_CONTEXT make_cert_from_file(LPCWSTR fileName) +{ + HANDLE file; + DWORD size, encoding = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + BYTE *buffer; + PCCERT_CONTEXT cert; + + file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, 0, NULL); + if (file == INVALID_HANDLE_VALUE) + { + WARN("can't open certificate file %s\n", debugstr_w(fileName)); + return NULL; + } + if ((size = GetFileSize(file, NULL))) + { + if ((buffer = HeapAlloc(GetProcessHeap(), 0, size))) + { + DWORD read; + if (!ReadFile(file, buffer, size, &read, NULL) || read != size) + { + WARN("can't read certificate file %s\n", debugstr_w(fileName)); + HeapFree(GetProcessHeap(), 0, buffer); + CloseHandle(file); + return NULL; + } + } + } + else + { + WARN("empty file %s\n", debugstr_w(fileName)); + CloseHandle(file); + return NULL; + } + CloseHandle(file); + cert = CertCreateCertificateContext(encoding, buffer, size); + HeapFree(GetProcessHeap(), 0, buffer); + return cert; +} + BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore) { static const WCHAR Root[] = {'R','o','o','t',0}; BOOL ret; - HANDLE file; HCERTSTORE store; - BYTE *buffer; - DWORD size, encoding = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; const CERT_CONTEXT *cert; TRACE("(0x%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), @@ -129,38 +166,9 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT FIXME("source type not implemented: %u\n", pImportSrc->dwSubjectChoice); return FALSE; } - file = CreateFileW(pImportSrc->pwszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - { - WARN("can't open certificate file %s\n", debugstr_w(pImportSrc->pwszFileName)); - return FALSE; - } - if ((size = GetFileSize(file, NULL))) - { - if ((buffer = HeapAlloc(GetProcessHeap(), 0, size))) - { - DWORD read; - if (!ReadFile(file, buffer, size, &read, NULL) || read != size) - { - WARN("can't read certificate file %s\n", debugstr_w(pImportSrc->pwszFileName)); - HeapFree(GetProcessHeap(), 0, buffer); - CloseHandle(file); - return FALSE; - } - } - } - else - { - WARN("empty file %s\n", debugstr_w(pImportSrc->pwszFileName)); - CloseHandle(file); - return FALSE; - } - CloseHandle(file); - if (!(cert = CertCreateCertificateContext(encoding, buffer, size))) + if (!(cert = make_cert_from_file(pImportSrc->pwszFileName))) { WARN("unable to create certificate context\n"); - HeapFree(GetProcessHeap(), 0, buffer); return FALSE; } if (hDestCertStore) store = hDestCertStore; @@ -171,7 +179,6 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT { WARN("unable to open certificate store\n"); CertFreeCertificateContext(cert); - HeapFree(GetProcessHeap(), 0, buffer); return FALSE; } } @@ -179,6 +186,5 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT if (!hDestCertStore) CertCloseStore(store, 0); CertFreeCertificateContext(cert); - HeapFree(GetProcessHeap(), 0, buffer); return ret; }

1 0