December 2008 - Wine-commits

Juan Lang : cryptui: Validate OID in add purpose dialog.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: a958c27cdd431f758a4d2e7971aa1f4e85b3b330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a958c27cdd431f758a4d2e797… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:05:49 2008 -0800 cryptui: Validate OID in add purpose dialog. --- dlls/cryptui/cryptui_En.rc | 2 + dlls/cryptui/cryptuires.h | 2 + dlls/cryptui/main.c | 88 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 91 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 5dcb98a..f904fa7 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -59,6 +59,8 @@ STRINGTABLE DISCARDABLE IDS_PROP_FRIENDLY_NAME "Friendly name" IDS_PROP_DESCRIPTION "Description" IDS_CERTIFICATE_PROPERTIES "Certificate Properties" + IDS_CERTIFICATE_PURPOSE_ERROR "Please enter an OID in the form 1.2.3.4" + IDS_CERTIFICATE_PURPOSE_EXISTS "The OID you entered already exists." IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index a311531..9e18852 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -56,6 +56,8 @@ #define IDS_PROP_FRIENDLY_NAME 1036 #define IDS_PROP_DESCRIPTION 1037 #define IDS_CERTIFICATE_PROPERTIES 1038 +#define IDS_CERTIFICATE_PURPOSE_ERROR 1039 +#define IDS_CERTIFICATE_PURPOSE_EXISTS 1040 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 7bd835f..7b70578 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1593,6 +1593,72 @@ static void add_purpose(HWND hwnd, LPCSTR oid) } } +static BOOL is_valid_oid(LPCSTR oid) +{ + BOOL ret; + + if (oid[0] != '0' && oid[0] != '1' && oid[0] != '2') + ret = FALSE; + else if (oid[1] != '.') + ret = FALSE; + else if (!oid[2]) + ret = FALSE; + else + { + const char *ptr; + BOOL expectNum = TRUE; + + for (ptr = oid + 2, ret = TRUE; ret && *ptr; ptr++) + { + if (expectNum) + { + if (!isdigit(*ptr)) + ret = FALSE; + else if (*(ptr + 1) == '.') + expectNum = FALSE; + } + else + { + if (*ptr != '.') + ret = FALSE; + else if (!(*(ptr + 1))) + ret = FALSE; + else + expectNum = TRUE; + } + } + } + return ret; +} + +static BOOL is_oid_in_list(HWND hwnd, LPCSTR oid) +{ + HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, + (void *)oid, CRYPT_ENHKEY_USAGE_OID_GROUP_ID); + BOOL ret = FALSE; + + if (oidInfo) + { + LVFINDINFOW findInfo; + + findInfo.flags = LVFI_PARAM; + findInfo.lParam = (LPARAM)oidInfo; + if (SendMessageW(lv, LVM_FINDITEMW, -1, (LPARAM)&findInfo) != -1) + ret = TRUE; + } + else + { + LVFINDINFOA findInfo; + + findInfo.flags = LVFI_STRING; + findInfo.psz = oid; + if (SendMessageW(lv, LVM_FINDITEMA, -1, (LPARAM)&findInfo) != -1) + ret = TRUE; + } + return ret; +} + #define MAX_PURPOSE 255 static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, @@ -1636,11 +1702,31 @@ static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, EndDialog(hwnd, IDCANCEL); ret = TRUE; } + else if (!is_valid_oid(buf)) + { + WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; + + LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_ERROR, error, + sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, + sizeof(title) / sizeof(title[0])); + MessageBoxW(hwnd, error, title, MB_ICONERROR | MB_OK); + } + else if (is_oid_in_list( + (HWND)GetWindowLongPtrW(hwnd, DWLP_USER), buf)) + { + WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; + + LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_EXISTS, + error, sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, + sizeof(title) / sizeof(title[0])); + MessageBoxW(hwnd, error, title, MB_ICONEXCLAMATION | MB_OK); + } else { HWND parent = (HWND)GetWindowLongPtrW(hwnd, DWLP_USER); - FIXME("validate %s\n", debugstr_a(buf)); add_purpose(parent, buf); EndDialog(hwnd, wp); ret = TRUE;

1 0

Juan Lang : cryptui: Redraw purposes list based on purpose selection.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: a45c2484e08046653ec8cab077f802a574b82114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45c2484e08046653ec8cab07… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:02:53 2008 -0800 cryptui: Redraw purposes list based on purpose selection. --- dlls/cryptui/main.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f5e0a9a..00a0389 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1665,6 +1665,31 @@ static void redraw_states(HWND list, BOOL enabled) } } +typedef enum { + PurposeEnableAll = 0, + PurposeDisableAll, + PurposeEnableSelected +} PurposeSelection; + +static void select_purposes(HWND hwnd, PurposeSelection selection) +{ + HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); + + switch (selection) + { + case PurposeEnableAll: + case PurposeDisableAll: + EnableWindow(lv, FALSE); + redraw_states(lv, FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_ADD_PURPOSE), FALSE); + break; + case PurposeEnableSelected: + EnableWindow(lv, TRUE); + redraw_states(lv, TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_ADD_PURPOSE), TRUE); + } +} + extern BOOL WINAPI WTHelperGetKnownUsages(DWORD action, PCCRYPT_OID_INFO **usages); @@ -1754,8 +1779,7 @@ static void show_cert_usages(HWND hwnd, struct detail_data *data) WTHelperGetKnownUsages(2, &usages); } } - EnableWindow(lv, FALSE); - redraw_states(lv, FALSE); + select_purposes(hwnd, PurposeEnableAll); } static void set_general_cert_properties(HWND hwnd, struct detail_data *data) @@ -1776,7 +1800,6 @@ static void set_general_cert_properties(HWND hwnd, struct detail_data *data) HeapFree(GetProcessHeap(), 0, str); } show_cert_usages(hwnd, data); - EnableWindow(GetDlgItem(hwnd, IDC_ADD_PURPOSE), FALSE); SendMessageW(GetDlgItem(hwnd, IDC_ENABLE_ALL_PURPOSES), BM_CLICK, 0, 0); } @@ -1823,6 +1846,17 @@ static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, ShowScrollBar(description, SB_VERT, lines > 1); } break; + case BN_CLICKED: + switch (LOWORD(wp)) + { + case IDC_ENABLE_ALL_PURPOSES: + case IDC_DISABLE_ALL_PURPOSES: + case IDC_ENABLE_SELECTED_PURPOSES: + SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0); + select_purposes(hwnd, LOWORD(wp) - IDC_ENABLE_ALL_PURPOSES); + break; + } + break; } break; }

1 0

Juan Lang : cryptui: Set purpose selection radio button based on enhanced key usage value.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 3c7e95ee39ad207048c7d7d5aaf4cae85761a684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7e95ee39ad207048c7d7d5a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:03:30 2008 -0800 cryptui: Set purpose selection radio button based on enhanced key usage value. --- dlls/cryptui/main.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 00a0389..dc1c807 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1716,6 +1716,7 @@ static void show_cert_usages(HWND hwnd, struct detail_data *data) PCCRYPT_OID_INFO *usages; RECT rc; LVCOLUMNW column; + PurposeSelection purposeSelection; GetWindowRect(lv, &rc); column.mask = LVCF_WIDTH; @@ -1738,6 +1739,10 @@ static void show_cert_usages(HWND hwnd, struct detail_data *data) HeapFree(GetProcessHeap(), 0, usage); usage = NULL; } + else if (usage->cUsageIdentifier) + purposeSelection = PurposeEnableSelected; + else + purposeSelection = PurposeDisableAll; } else if (CertGetEnhancedKeyUsage(cert, CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG, NULL, &size)) @@ -1749,9 +1754,16 @@ static void show_cert_usages(HWND hwnd, struct detail_data *data) HeapFree(GetProcessHeap(), 0, usage); usage = NULL; } + else if (usage->cUsageIdentifier) + purposeSelection = PurposeEnableAll; + else + purposeSelection = PurposeDisableAll; } else + { + purposeSelection = PurposeEnableAll; usage = NULL; + } if (usage) { DWORD i; @@ -1779,7 +1791,9 @@ static void show_cert_usages(HWND hwnd, struct detail_data *data) WTHelperGetKnownUsages(2, &usages); } } - select_purposes(hwnd, PurposeEnableAll); + select_purposes(hwnd, purposeSelection); + SendMessageW(GetDlgItem(hwnd, IDC_ENABLE_ALL_PURPOSES + purposeSelection), + BM_CLICK, 0, 0); } static void set_general_cert_properties(HWND hwnd, struct detail_data *data) @@ -1800,7 +1814,6 @@ static void set_general_cert_properties(HWND hwnd, struct detail_data *data) HeapFree(GetProcessHeap(), 0, str); } show_cert_usages(hwnd, data); - SendMessageW(GetDlgItem(hwnd, IDC_ENABLE_ALL_PURPOSES), BM_CLICK, 0, 0); } #define MAX_FRIENDLY_NAME 40

1 0

Juan Lang : cryptui: Show a cert's allowed usages in cert properties dialog .
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 0bb4f7e3c439de0622bff8ca3c4d95af2b9ed4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb4f7e3c439de0622bff8ca3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:02:15 2008 -0800 cryptui: Show a cert's allowed usages in cert properties dialog. --- dlls/cryptui/cryptui.rc | 3 + dlls/cryptui/main.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 253 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bb4f7e3c439de0622bff…

1 0

Juan Lang : cryptui: Show cert' s friendly name and description in edit properties dialog.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 53fc5b850de4c600ac92022eac1522e0e4445877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53fc5b850de4c600ac92022ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 13:54:04 2008 -0800 cryptui: Show cert's friendly name and description in edit properties dialog. --- dlls/cryptui/main.c | 79 ++++++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 2767b5b..c38bf1a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1554,6 +1554,49 @@ static void create_cert_details_list(HWND hwnd, struct detail_data *data) set_fields_selection(hwnd, data, 0); } +static WCHAR *get_cert_property_as_string(PCCERT_CONTEXT cert, DWORD prop) +{ + WCHAR *name = NULL; + DWORD cb; + + if (CertGetCertificateContextProperty(cert, prop, NULL, &cb)) + { + name = HeapAlloc(GetProcessHeap(), 0, cb); + if (name) + { + if (!CertGetCertificateContextProperty(cert, prop, (LPBYTE)name, + &cb)) + { + HeapFree(GetProcessHeap(), 0, name); + name = NULL; + } + } + } + return name; +} + +static void set_general_cert_properties(HWND hwnd, struct detail_data *data) +{ + PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; + WCHAR *str; + + if ((str = get_cert_property_as_string(cert, CERT_FRIENDLY_NAME_PROP_ID))) + { + SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), WM_SETTEXT, 0, + (LPARAM)str); + HeapFree(GetProcessHeap(), 0, str); + } + if ((str = get_cert_property_as_string(cert, CERT_DESCRIPTION_PROP_ID))) + { + SendMessageW(GetDlgItem(hwnd, IDC_DESCRIPTION), WM_SETTEXT, 0, + (LPARAM)str); + HeapFree(GetProcessHeap(), 0, str); + } + FIXME("show cert usages\n"); + EnableWindow(GetDlgItem(hwnd, IDC_ADD_PURPOSE), FALSE); + SendMessageW(GetDlgItem(hwnd, IDC_ENABLE_ALL_PURPOSES), BM_CLICK, 0, 0); +} + #define MAX_FRIENDLY_NAME 40 #define MAX_DESCRIPTION 255 @@ -1577,23 +1620,10 @@ static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, MAX_FRIENDLY_NAME, 0); SendMessageW(description, EM_SETLIMITTEXT, MAX_DESCRIPTION, 0); ShowScrollBar(description, SB_VERT, FALSE); - FIXME("set general properties\n"); + set_general_cert_properties(hwnd, data); SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); break; } - case WM_COMMAND: - switch (HIWORD(wp)) - { - case BN_CLICKED: - switch (LOWORD(wp)) - { - case IDC_ADD_PURPOSE: - FIXME("show add purpose dialog\n"); - break; - } - break; - } - break; } return 0; } @@ -1827,27 +1857,6 @@ static struct hierarchy_data *get_hierarchy_data_from_tree_item(HWND tree, return data; } -static WCHAR *get_cert_property_as_string(PCCERT_CONTEXT cert, DWORD prop) -{ - WCHAR *name = NULL; - DWORD cb; - - if (CertGetCertificateContextProperty(cert, prop, NULL, &cb)) - { - name = HeapAlloc(GetProcessHeap(), 0, cb); - if (name) - { - if (!CertGetCertificateContextProperty(cert, prop, (LPBYTE)name, - &cb)) - { - HeapFree(GetProcessHeap(), 0, name); - name = NULL; - } - } - } - return name; -} - static WCHAR *get_cert_display_name(PCCERT_CONTEXT cert) { WCHAR *name = get_cert_property_as_string(cert, CERT_FRIENDLY_NAME_PROP_ID);

1 0

Juan Lang : cryptui: Show/hide description' s scrollbar depending on how much text it has.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: c489ce31ba45b2787dd9b0764a751d1a10a3f54e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c489ce31ba45b2787dd9b0764… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 13:54:28 2008 -0800 cryptui: Show/hide description's scrollbar depending on how much text it has. --- dlls/cryptui/main.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index c38bf1a..820d0a5 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1624,6 +1624,24 @@ static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); break; } + case WM_COMMAND: + switch (HIWORD(wp)) + { + case EN_CHANGE: + SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0); + if (LOWORD(wp) == IDC_DESCRIPTION) + { + /* Show/hide scroll bar on description depending on how much + * text it has. + */ + HWND description = GetDlgItem(hwnd, IDC_DESCRIPTION); + int lines = SendMessageW(description, EM_GETLINECOUNT, 0, 0); + + ShowScrollBar(description, SB_VERT, lines > 1); + } + break; + } + break; } return 0; }

1 0

Juan Lang : cryptui: Show cert when it' s double-clicked in the hierarchy page.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 63be2a038e2c032e73ba0fa8c185bd6a85368265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63be2a038e2c032e73ba0fa8c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 13:52:03 2008 -0800 cryptui: Show cert when it's double-clicked in the hierarchy page. --- dlls/cryptui/main.c | 108 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 44 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 011d531..43c5992 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1866,13 +1866,58 @@ static void show_cert_hierarchy(HWND hwnd, struct hierarchy_data *data) set_certificate_status_for_end_cert(hwnd, data->pCertViewInfo); } +static void show_dialog_for_selected_cert(HWND hwnd) +{ + HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); + TVITEMW item; + struct hierarchy_data *data; + DWORD selection; + + memset(&item, 0, sizeof(item)); + item.mask = TVIF_HANDLE | TVIF_PARAM; + item.hItem = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, TVGN_CARET, + (LPARAM)NULL); + SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); + data = get_hierarchy_data_from_tree_item(tree, item.hItem); + selection = lparam_to_index(data, item.lParam); + if (selection != 0) + { + CRYPT_PROVIDER_SGNR *provSigner; + CRYPTUI_VIEWCERTIFICATE_STRUCTW viewInfo; + BOOL changed = FALSE; + + provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, + data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + memset(&viewInfo, 0, sizeof(viewInfo)); + viewInfo.dwSize = sizeof(viewInfo); + viewInfo.dwFlags = data->pCertViewInfo->dwFlags; + viewInfo.szTitle = data->pCertViewInfo->szTitle; + viewInfo.pCertContext = provSigner->pasCertChain[selection].pCert; + viewInfo.cStores = data->pCertViewInfo->cStores; + viewInfo.rghStores = data->pCertViewInfo->rghStores; + viewInfo.cPropSheetPages = data->pCertViewInfo->cPropSheetPages; + viewInfo.rgPropSheetPages = data->pCertViewInfo->rgPropSheetPages; + viewInfo.nStartPage = data->pCertViewInfo->nStartPage; + CryptUIDlgViewCertificateW(&viewInfo, &changed); + if (changed) + { + /* Delete the contents of the tree */ + SendMessageW(tree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); + /* Reinitialize the tree */ + show_cert_hierarchy(hwnd, data); + } + } +} + static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { PROPSHEETPAGEW *page; struct hierarchy_data *data; - HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); - DWORD selection; + LRESULT ret = 0; TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -1885,13 +1930,18 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; case WM_NOTIFY: { - NMTREEVIEWW *nm; - CRYPT_PROVIDER_SGNR *provSigner; + NMHDR *hdr; - nm = (NMTREEVIEWW*)lp; - switch (nm->hdr.code) + hdr = (NMHDR *)lp; + switch (hdr->code) { case TVN_SELCHANGEDW: + { + NMTREEVIEWW *nm = (NMTREEVIEWW*)lp; + HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); + DWORD selection; + CRYPT_PROVIDER_SGNR *provSigner; + data = get_hierarchy_data_from_tree_item(tree, nm->itemNew.hItem); selection = lparam_to_index(data, nm->itemNew.lParam); provSigner = WTHelperGetProvSignerFromChain( @@ -1904,54 +1954,24 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, &provSigner->pasCertChain[selection]); break; } + case NM_DBLCLK: + show_dialog_for_selected_cert(hwnd); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); + ret = 1; + break; + } break; } case WM_COMMAND: switch (wp) { case IDC_VIEWCERTIFICATE: - { - TVITEMW item; - CRYPT_PROVIDER_SGNR *provSigner; - CRYPTUI_VIEWCERTIFICATE_STRUCTW viewInfo; - BOOL changed = FALSE; - - memset(&item, 0, sizeof(item)); - item.mask = TVIF_HANDLE | TVIF_PARAM; - item.hItem = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, - TVGN_CARET, (LPARAM)NULL); - SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); - data = get_hierarchy_data_from_tree_item(tree, item.hItem); - selection = lparam_to_index(data, item.lParam); - provSigner = WTHelperGetProvSignerFromChain( - (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, - data->pCertViewInfo->idxSigner, - data->pCertViewInfo->fCounterSigner, - data->pCertViewInfo->idxCounterSigner); - memset(&viewInfo, 0, sizeof(viewInfo)); - viewInfo.dwSize = sizeof(viewInfo); - viewInfo.dwFlags = data->pCertViewInfo->dwFlags; - viewInfo.szTitle = data->pCertViewInfo->szTitle; - viewInfo.pCertContext = provSigner->pasCertChain[selection].pCert; - viewInfo.cStores = data->pCertViewInfo->cStores; - viewInfo.rghStores = data->pCertViewInfo->rghStores; - viewInfo.cPropSheetPages = data->pCertViewInfo->cPropSheetPages; - viewInfo.rgPropSheetPages = data->pCertViewInfo->rgPropSheetPages; - viewInfo.nStartPage = data->pCertViewInfo->nStartPage; - CryptUIDlgViewCertificateW(&viewInfo, &changed); - if (changed) - { - /* Delete the contents of the tree */ - SendMessageW(tree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); - /* Reinitialize the tree */ - show_cert_hierarchy(hwnd, data); - } + show_dialog_for_selected_cert(hwnd); break; } - } break; } - return 0; + return ret; } static UINT CALLBACK hierarchy_callback(HWND hwnd, UINT msg,

1 0

Juan Lang : cryptui: Add (empty) edit cert properties dialog.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 7153a6fb87a3cbd2a8cb032a9ba73804d210d84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7153a6fb87a3cbd2a8cb032a9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 13:53:38 2008 -0800 cryptui: Add (empty) edit cert properties dialog. --- dlls/cryptui/cryptui_En.rc | 23 ++++++++++++ dlls/cryptui/cryptuires.h | 10 +++++ dlls/cryptui/main.c | 83 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 08e79e6..70ed0f1 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -58,6 +58,7 @@ STRINGTABLE DISCARDABLE IDS_PROP_ENHKEY_USAGE "Enhanced key usage (property)" IDS_PROP_FRIENDLY_NAME "Friendly name" IDS_PROP_DESCRIPTION "Description" + IDS_CERTIFICATE_PROPERTIES "Certificate Properties" IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" @@ -147,3 +148,25 @@ BEGIN PUSHBUTTON "Close", IDOK,103,216,70,14 PUSHBUTTON "More &Info", IDC_CPS,177,216,70,14 END + +IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "General" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Friendly name:", stc1, 6,14,60,14 + EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Description:", stc2, 6,32,60,14 + EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Certificate purposes", grp1,6,48,245,165, BS_GROUPBOX + AUTORADIOBUTTON "&Enable all purposes for this certificate", + IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "D&isable all purposes for this certificate", + IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Enable &only the following purposes for this certificate:", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 24,100,220,90 + PUSHBUTTON "Add &Purpose...", IDC_ADD_PURPOSE,184,194,60,14 +END diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 66206d0..eb26e15 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -55,6 +55,7 @@ #define IDS_PROP_ENHKEY_USAGE 1035 #define IDS_PROP_FRIENDLY_NAME 1036 #define IDS_PROP_DESCRIPTION 1037 +#define IDS_CERTIFICATE_PROPERTIES 1038 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 @@ -87,6 +88,7 @@ #define IDD_DETAIL 101 #define IDD_HIERARCHY 102 #define IDD_USERNOTICE 103 +#define IDD_CERT_PROPERTIES_GENERAL 104 #define IDB_SMALL_ICONS 200 #define IDB_CERT 201 @@ -116,4 +118,12 @@ #define IDC_USERNOTICE 2300 #define IDC_CPS 2301 +#define IDC_FRIENDLY_NAME 2400 +#define IDC_DESCRIPTION 2401 +#define IDC_ENABLE_ALL_PURPOSES 2402 +#define IDC_DISABLE_ALL_PURPOSES 2403 +#define IDC_ENABLE_SELECTED_PURPOSES 2404 +#define IDC_CERTIFICATE_USAGES 2405 +#define IDC_ADD_PURPOSE 2406 + #endif /* ndef __CRYPTUIRES_H_ */ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 43c5992..2767b5b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1554,6 +1554,76 @@ static void create_cert_details_list(HWND hwnd, struct detail_data *data) set_fields_selection(hwnd, data, 0); } +#define MAX_FRIENDLY_NAME 40 +#define MAX_DESCRIPTION 255 + +static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, + WPARAM wp, LPARAM lp) +{ + PROPSHEETPAGEW *page; + struct detail_data *data; + + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + { + HWND description = GetDlgItem(hwnd, IDC_DESCRIPTION); + + page = (PROPSHEETPAGEW *)lp; + data = (struct detail_data *)page->lParam; + SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), EM_SETLIMITTEXT, + MAX_FRIENDLY_NAME, 0); + SendMessageW(description, EM_SETLIMITTEXT, MAX_DESCRIPTION, 0); + ShowScrollBar(description, SB_VERT, FALSE); + FIXME("set general properties\n"); + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + break; + } + case WM_COMMAND: + switch (HIWORD(wp)) + { + case BN_CLICKED: + switch (LOWORD(wp)) + { + case IDC_ADD_PURPOSE: + FIXME("show add purpose dialog\n"); + break; + } + break; + } + break; + } + return 0; +} + +static void show_edit_cert_properties_dialog(HWND parent, + struct detail_data *data) +{ + PROPSHEETHEADERW hdr; + PROPSHEETPAGEW page; /* FIXME: need to add a cross-certificate page */ + + TRACE("(%p)\n", data); + + memset(&page, 0, sizeof(PROPSHEETPAGEW)); + page.dwSize = sizeof(page); + page.hInstance = hInstance; + page.u.pszTemplate = MAKEINTRESOURCEW(IDD_CERT_PROPERTIES_GENERAL); + page.pfnDlgProc = cert_properties_general_dlg_proc; + page.lParam = (LPARAM)data; + + memset(&hdr, 0, sizeof(hdr)); + hdr.dwSize = sizeof(hdr); + hdr.hwndParent = parent; + hdr.dwFlags = PSH_PROPSHEETPAGE; + hdr.hInstance = hInstance; + hdr.pszCaption = MAKEINTRESOURCEW(IDS_CERTIFICATE_PROPERTIES); + hdr.u3.ppsp = &page; + hdr.nPages = 1; + PropertySheetW(&hdr); +} + static void free_detail_fields(struct detail_data *data) { DWORD i; @@ -1649,8 +1719,19 @@ static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, FIXME("call CryptUIWizExport\n"); break; case IDC_EDITPROPERTIES: - FIXME("show edit properties dialog\n"); + { + HWND cb = GetDlgItem(hwnd, IDC_DETAIL_SELECT); + int curSel; + + curSel = SendMessageW(cb, CB_GETCURSEL, 0, 0); + /* Actually, any index will do, since they all store the same + * data value + */ + data = (struct detail_data *)SendMessageW(cb, CB_GETITEMDATA, + curSel, 0); + show_edit_cert_properties_dialog(GetParent(hwnd), data); break; + } case ((CBN_SELCHANGE << 16) | IDC_DETAIL_SELECT): refresh_details_view(hwnd); break;

1 0

Juan Lang : cryptui: Remove code duplication in formatting an enhanced key usage value.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 93f4c49ea5c2b1fa5fbf8eecfb7f6b0f9cb0384a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f4c49ea5c2b1fa5fbf8eecf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 13:50:46 2008 -0800 cryptui: Remove code duplication in formatting an enhanced key usage value. --- dlls/cryptui/main.c | 67 ++++---------------------------------------------- 1 files changed, 6 insertions(+), 61 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 8a251b4..011d531 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1418,68 +1418,13 @@ struct prop_id_to_string_id static WCHAR *format_enhanced_key_usage_value(void *pb, DWORD cb) { - static const WCHAR sep[] = { ',',' ',0 }; - const CERT_ENHKEY_USAGE *usage = (const CERT_ENHKEY_USAGE *)pb; - static WCHAR *str = NULL; - DWORD i, chars = 0; + CERT_EXTENSION ext; - for (i = 0; i < usage->cUsageIdentifier; i++) - { - PCCRYPT_OID_INFO info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, - usage->rgpszUsageIdentifier[i], CRYPT_ENHKEY_USAGE_OID_GROUP_ID); - - if (info) - { - chars += strlenW(info->pwszName); - if (i < usage->cUsageIdentifier - 1) - chars += strlenW(sep); - if (!str) - { - str = HeapAlloc(GetProcessHeap(), 0, - (chars + 1) * sizeof(WCHAR)); - if (str) - *str = '\0'; - } - else - str = HeapReAlloc(GetProcessHeap(), 0, str, - (chars + 1) * sizeof(WCHAR)); - if (str) - { - if (i < usage->cUsageIdentifier - 1) - strcatW(str, sep); - strcatW(str, info->pwszName); - } - } - else - { - chars += strlen(usage->rgpszUsageIdentifier[i]); - if (i < usage->cUsageIdentifier - 1) - chars += strlenW(sep); - if (!str) - { - str = HeapAlloc(GetProcessHeap(), 0, - (chars + 1) * sizeof(WCHAR)); - if (str) - *str = '\0'; - } - else - str = HeapReAlloc(GetProcessHeap(), 0, str, - (chars + 1) * sizeof(WCHAR)); - if (str) - { - WCHAR *dst; - const char *src; - - if (i < usage->cUsageIdentifier - 1) - strcatW(str, sep); - for (src = usage->rgpszUsageIdentifier[i], - dst = str + strlenW(str); *src; src++, dst++) - *dst = *src; - *dst = '\0'; - } - } - } - return str; + ext.pszObjId = (LPSTR)X509_ENHANCED_KEY_USAGE; + ext.fCritical = FALSE; + ext.Value.pbData = pb; + ext.Value.cbData = cb; + return crypt_format_extension(&ext, 0); } /* Logically the access state should also be checked, and IDC_EDITPROPERTIES

1 0

Paul Vriens : msvfw32/tests: Fix a test failure on W2K3.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: d743ff88156c304c8c1ffddfbd5cc0e552dd8f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d743ff88156c304c8c1ffddfb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 19 08:55:25 2008 +0100 msvfw32/tests: Fix a test failure on W2K3. --- dlls/msvfw32/tests/msvfw.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index ce3a908..537c230 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -28,26 +28,26 @@ static void test_OpenCase(void) { HIC h; - /* ICOpen(fcc: vidc , handler: cvid) */ - /* ICTYPE_VIDEO is vidc: lowercase */ - /* Officially registered fcc for Cinepak is CVID: uppercase */ - h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('c','v','i','d'),ICMODE_DECOMPRESS); - ok(0!=h,"ICOpen(vidc.cvid) failed\n"); + /* Open a compressor with combinations of lowercase + * and uppercase compressortype and handler. + */ + h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('m','s','v','c'),ICMODE_DECOMPRESS); + ok(0!=h,"ICOpen(vidc.msvc) failed\n"); if (h) { ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } - h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('C','V','I','D'),ICMODE_DECOMPRESS); - ok(0!=h,"ICOpen(vidc.CVID) failed\n"); + h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('M','S','V','C'),ICMODE_DECOMPRESS); + ok(0!=h,"ICOpen(vidc.MSVC) failed\n"); if (h) { ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } - h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('c','v','i','d'),ICMODE_DECOMPRESS); - todo_wine ok(0!=h,"ICOpen(VIDC.cvid) failed\n"); + h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('m','s','v','c'),ICMODE_DECOMPRESS); + todo_wine ok(0!=h,"ICOpen(VIDC.msvc) failed\n"); if (h) { ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } - h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('C','V','I','D'),ICMODE_DECOMPRESS); - todo_wine ok(0!=h,"ICOpen(VIDC.CVID) failed\n"); + h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('M','S','V','C'),ICMODE_DECOMPRESS); + todo_wine ok(0!=h,"ICOpen(VIDC.MSVC) failed\n"); if (h) { ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); }

1 0