wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Vincent Povirk : shell32: Use ShellExecuteEx instead of ShellExecute in the run dialog.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 47298e25a1d22711ed5019ca5270818cee5759d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47298e25a1d22711ed5019ca5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 18 15:18:47 2008 -0600 shell32: Use ShellExecuteEx instead of ShellExecute in the run dialog. --- dlls/shell32/dialogs.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 0fdc951..a7f056a 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -211,19 +211,27 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR if ((ic = GetWindowTextLengthW (htxt))) { WCHAR *psz, *parent=NULL ; - LPCWSTR working_dir ; + SHELLEXECUTEINFOW sei ; + + ZeroMemory (&sei, sizeof(sei)) ; + sei.cbSize = sizeof(sei) ; psz = HeapAlloc( GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR) ); GetWindowTextW (htxt, psz, ic + 1) ; /* according to http://www.codeproject.com/KB/shell/runfiledlg.aspx we should send a * WM_NOTIFY before execution */ + sei.hwnd = hwnd; + sei.nShow = SW_SHOWNORMAL; + sei.lpFile = psz; + sei.fMask = SEE_MASK_FLAG_NO_UI; + if (prfdp->lpstrDirectory) - working_dir = prfdp->lpstrDirectory; + sei.lpDirectory = prfdp->lpstrDirectory; else - working_dir = parent = RunDlg_GetParentDir(psz); + sei.lpDirectory = parent = RunDlg_GetParentDir(sei.lpFile); - if (ShellExecuteW(hwnd, NULL, psz, NULL, working_dir, SW_SHOWNORMAL) < (HINSTANCE)33) + if (ShellExecuteExW( &sei ) < 33) { char *pszSysMsg = NULL ; char szMsg[256];

1 0

Vincent Povirk : shell32: Display error messages in ShellExecuteEx.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 5c24f70c8bcee41e7a4dd3c0142d170b2042f59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c24f70c8bcee41e7a4dd3c01… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 15 10:10:07 2008 -0600 shell32: Display error messages in ShellExecuteEx. --- dlls/shell32/shlexec.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 4dc3f12..8a65636 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1447,6 +1447,16 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, return retval; } +static void do_error_dialog( UINT_PTR retval, HWND hwnd ) +{ + WCHAR msg[2048]; + int error_code=GetLastError(); + + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL); + + MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); +} + /************************************************************************* * SHELL_execute [Internal] */ @@ -1458,7 +1468,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) static const WCHAR wHttp[] = {'h','t','t','p',':','/','/',0}; static const DWORD unsupportedFlags = SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY | - SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI | + SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; @@ -1592,6 +1602,8 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { retval = SHELL_execute_class( wszApplicationName, &sei_tmp, sei, execfunc ); + if (retval <= 32 && !(sei_tmp.fMask & SEE_MASK_FLAG_NO_UI)) + do_error_dialog(retval, sei_tmp.hwnd); HeapFree(GetProcessHeap(), 0, wszApplicationName); if (wszParameters != parametersBuffer) HeapFree(GetProcessHeap(), 0, wszParameters); @@ -1815,6 +1827,9 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) HeapFree(GetProcessHeap(), 0, wcmd); sei->hInstApp = (HINSTANCE)(retval > 32 ? 33 : retval); + + if (retval <= 32 && !(sei_tmp.fMask & SEE_MASK_FLAG_NO_UI)) + do_error_dialog(retval, sei_tmp.hwnd); return retval > 32; }

1 0

Vincent Povirk : shell32: Use the NO_UI flag in ShellExecute.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 0a2ffa08f556805f9c14be98b81f3bd9382f77e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2ffa08f556805f9c14be98b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 18 15:01:58 2008 -0600 shell32: Use the NO_UI flag in ShellExecute. In my testing on Windows, I wasn't able to make ShellExecute display any error dialogs. --- dlls/shell32/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 515bb48..4dc3f12 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1831,7 +1831,7 @@ HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, debugstr_a(lpParameters), debugstr_a(lpDirectory), iShowCmd); sei.cbSize = sizeof(sei); - sei.fMask = 0; + sei.fMask = SEE_MASK_FLAG_NO_UI; sei.hwnd = hWnd; sei.lpVerb = lpOperation; sei.lpFile = lpFile; @@ -1917,7 +1917,7 @@ HINSTANCE WINAPI ShellExecuteW(HWND hwnd, LPCWSTR lpOperation, LPCWSTR lpFile, TRACE("\n"); sei.cbSize = sizeof(sei); - sei.fMask = 0; + sei.fMask = SEE_MASK_FLAG_NO_UI; sei.hwnd = hwnd; sei.lpVerb = lpOperation; sei.lpFile = lpFile;

1 0

Vincent Povirk : shell32: Fix a memory leak in the run dialog code.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 061fb815d6fa8180898d770818478173bd10e70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=061fb815d6fa8180898d77081… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 18 15:52:52 2008 -0600 shell32: Fix a memory leak in the run dialog code. --- dlls/shell32/dialogs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 844b8f4..0fdc951 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -240,6 +240,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR MessageBoxA (hwnd, szMsg, "Nix", MB_OK | MB_ICONEXCLAMATION) ; HeapFree(GetProcessHeap(), 0, psz); + HeapFree(GetProcessHeap(), 0, parent); SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; return TRUE ; }

1 0

Juan Lang : cryptui: Refresh tabs in response to cert properties changes being applied.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 96a95bba25f2a738118ed2384e18de9d34ff4560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a95bba25f2a738118ed2384… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 15:34:25 2008 -0800 cryptui: Refresh tabs in response to cert properties changes being applied. --- dlls/cryptui/main.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index c90bd34..83fffb1 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -2004,6 +2004,15 @@ static void set_cert_string_property(PCCERT_CONTEXT cert, DWORD prop, CertSetCertificateContextProperty(cert, prop, 0, NULL); } +#define WM_REFRESH_VIEW WM_USER + 0 + +static BOOL CALLBACK refresh_propsheet_pages(HWND hwnd, LPARAM lParam) +{ + if ((GetClassLongW(hwnd, GCW_ATOM) == WC_DIALOG)) + SendMessageW(hwnd, WM_REFRESH_VIEW, 0, 0); + return TRUE; +} + #define MAX_FRIENDLY_NAME 40 #define MAX_DESCRIPTION 255 @@ -2070,6 +2079,7 @@ static void apply_general_changes(HWND hwnd) CertSetEnhancedKeyUsage(data->pCertViewInfo->pCertContext, &usage); HeapFree(GetProcessHeap(), 0, usage.rgpszUsageIdentifier); } + EnumChildWindows(GetParent(GetParent(hwnd)), refresh_propsheet_pages, 0); if (data->pfPropertiesChanged) *data->pfPropertiesChanged = TRUE; } @@ -2330,6 +2340,9 @@ static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; } break; + case WM_REFRESH_VIEW: + refresh_details_view(hwnd); + break; } return 0; } @@ -2601,6 +2614,7 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, PROPSHEETPAGEW *page; struct hierarchy_data *data; LRESULT ret = 0; + HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -2621,7 +2635,6 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case TVN_SELCHANGEDW: { NMTREEVIEWW *nm = (NMTREEVIEWW*)lp; - HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); DWORD selection; CRYPT_PROVIDER_SGNR *provSigner; @@ -2653,6 +2666,22 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; } break; + case WM_REFRESH_VIEW: + { + TVITEMW item; + + /* Get hierarchy data */ + memset(&item, 0, sizeof(item)); + item.mask = TVIF_HANDLE | TVIF_PARAM; + item.hItem = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, TVGN_ROOT, + (LPARAM)NULL); + data = get_hierarchy_data_from_tree_item(tree, item.hItem); + /* Delete the contents of the tree */ + SendMessageW(tree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); + /* Reinitialize the tree */ + show_cert_hierarchy(hwnd, data); + break; + } } return ret; }

1 0

Juan Lang : cryptui: Apply changes to enabled usages in response to applying the edit cert properties dialog .
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 11e770169677b7d92d7440617f27a0b4356d1ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e770169677b7d92d7440617… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:07:33 2008 -0800 cryptui: Apply changes to enabled usages in response to applying the edit cert properties dialog. --- dlls/cryptui/main.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 2c0d453..c90bd34 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -2021,7 +2021,55 @@ static void apply_general_changes(HWND hwnd) sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); set_cert_string_property(data->pCertViewInfo->pCertContext, CERT_DESCRIPTION_PROP_ID, buf); - FIXME("apply usage state\n"); + if (IsDlgButtonChecked(hwnd, IDC_ENABLE_ALL_PURPOSES)) + { + /* Setting a NULL usage removes the enhanced key usage property. */ + CertSetEnhancedKeyUsage(data->pCertViewInfo->pCertContext, NULL); + } + else if (IsDlgButtonChecked(hwnd, IDC_DISABLE_ALL_PURPOSES)) + { + CERT_ENHKEY_USAGE usage = { 0, NULL }; + + CertSetEnhancedKeyUsage(data->pCertViewInfo->pCertContext, &usage); + } + else if (IsDlgButtonChecked(hwnd, IDC_ENABLE_SELECTED_PURPOSES)) + { + HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); + CERT_ENHKEY_USAGE usage = { 0, NULL }; + int purposes = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0), i; + LVITEMW item; + + item.mask = LVIF_STATE | LVIF_PARAM; + item.iSubItem = 0; + item.stateMask = LVIS_STATEIMAGEMASK; + for (i = 0; i < purposes; i++) + { + item.iItem = i; + if (SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item)) + { + int state = item.state >> 12; + + if (state == CheckBitmapIndexChecked) + { + CRYPT_OID_INFO *info = (CRYPT_OID_INFO *)item.lParam; + + if (usage.cUsageIdentifier) + usage.rgpszUsageIdentifier = + HeapReAlloc(GetProcessHeap(), 0, + usage.rgpszUsageIdentifier, + (usage.cUsageIdentifier + 1) * sizeof(LPSTR)); + else + usage.rgpszUsageIdentifier = + HeapAlloc(GetProcessHeap(), 0, sizeof(LPSTR)); + if (usage.rgpszUsageIdentifier) + usage.rgpszUsageIdentifier[usage.cUsageIdentifier++] = + (LPSTR)info->pszOID; + } + } + } + CertSetEnhancedKeyUsage(data->pCertViewInfo->pCertContext, &usage); + HeapFree(GetProcessHeap(), 0, usage.rgpszUsageIdentifier); + } if (data->pfPropertiesChanged) *data->pfPropertiesChanged = TRUE; }

1 0

Juan Lang : cryptui: Set cert friendly name and description in response to applying the edit cert properties dialog .
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 2d2aafbcfa3e1e7b90fc0fd0947b7ee61eb0e942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2aafbcfa3e1e7b90fc0fd09… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:06:53 2008 -0800 cryptui: Set cert friendly name and description in response to applying the edit cert properties dialog. --- dlls/cryptui/main.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 275526b..2c0d453 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1989,9 +1989,43 @@ static void toggle_usage(HWND hwnd, int iItem) } } +static void set_cert_string_property(PCCERT_CONTEXT cert, DWORD prop, + LPWSTR str) +{ + if (str && strlenW(str)) + { + CRYPT_DATA_BLOB blob; + + blob.pbData = (BYTE *)str; + blob.cbData = (strlenW(str) + 1) * sizeof(WCHAR); + CertSetCertificateContextProperty(cert, prop, 0, &blob); + } + else + CertSetCertificateContextProperty(cert, prop, 0, NULL); +} + #define MAX_FRIENDLY_NAME 40 #define MAX_DESCRIPTION 255 +static void apply_general_changes(HWND hwnd) +{ + WCHAR buf[MAX_DESCRIPTION + 1]; + struct detail_data *data = + (struct detail_data *)GetWindowLongPtrW(hwnd, DWLP_USER); + + SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), WM_GETTEXT, + sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + set_cert_string_property(data->pCertViewInfo->pCertContext, + CERT_FRIENDLY_NAME_PROP_ID, buf); + SendMessageW(GetDlgItem(hwnd, IDC_DESCRIPTION), WM_GETTEXT, + sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + set_cert_string_property(data->pCertViewInfo->pCertContext, + CERT_DESCRIPTION_PROP_ID, buf); + FIXME("apply usage state\n"); + if (data->pfPropertiesChanged) + *data->pfPropertiesChanged = TRUE; +} + static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -2028,6 +2062,9 @@ static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, toggle_usage(hwnd, nm->iItem); SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0); break; + case PSN_APPLY: + apply_general_changes(hwnd); + break; } break; }

1 0

Juan Lang : cryptui: Toggle a usage when it's clicked.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: ef8d6d8a966b7829d7969a5fd2b425873d175752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8d6d8a966b7829d7969a5fd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:06:09 2008 -0800 cryptui: Toggle a usage when it's clicked. --- dlls/cryptui/main.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 7b70578..275526b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1967,6 +1967,28 @@ static void set_general_cert_properties(HWND hwnd, struct detail_data *data) show_cert_usages(hwnd, data); } +static void toggle_usage(HWND hwnd, int iItem) +{ + LVITEMW item; + int res; + HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); + + item.mask = LVIF_STATE; + item.iItem = iItem; + item.iSubItem = 0; + item.stateMask = LVIS_STATEIMAGEMASK; + res = SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item); + if (res) + { + int state = item.state >> 12; + + item.state = INDEXTOSTATEIMAGEMASK( + state == CheckBitmapIndexChecked ? CheckBitmapIndexUnchecked : + CheckBitmapIndexChecked); + SendMessageW(lv, LVM_SETITEMSTATE, iItem, (LPARAM)&item); + } +} + #define MAX_FRIENDLY_NAME 40 #define MAX_DESCRIPTION 255 @@ -1994,6 +2016,21 @@ static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); break; } + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lp; + NMITEMACTIVATE *nm; + + switch (hdr->code) + { + case NM_CLICK: + nm = (NMITEMACTIVATE *)lp; + toggle_usage(hwnd, nm->iItem); + SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0); + break; + } + break; + } case WM_COMMAND: switch (HIWORD(wp)) {

1 0

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: Show/hide add purpose OID' s scrollbar depending on how much text it has.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: a0ae811ecc06bfd9f6c1c8c338c1ee91816ad636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ae811ecc06bfd9f6c1c8c33… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:05:17 2008 -0800 cryptui: Show/hide add purpose OID's scrollbar depending on how much text it has. --- dlls/cryptui/main.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index e26bf55..7bd835f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1612,6 +1612,18 @@ static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, case WM_COMMAND: switch (HIWORD(wp)) { + case EN_CHANGE: + if (LOWORD(wp) == IDC_NEW_PURPOSE) + { + /* Show/hide scroll bar on description depending on how much + * text it has. + */ + HWND description = GetDlgItem(hwnd, IDC_NEW_PURPOSE); + int lines = SendMessageW(description, EM_GETLINECOUNT, 0, 0); + + ShowScrollBar(description, SB_VERT, lines > 1); + } + break; case BN_CLICKED: switch (LOWORD(wp)) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2008