diff --git a/dll/win32/cryptui/cryptuires.h b/dll/win32/cryptui/cryptuires.h index e4f7424..0f8cf90 100644 --- a/dll/win32/cryptui/cryptuires.h +++ b/dll/win32/cryptui/cryptuires.h @@ -117,6 +117,8 @@ #define IDS_WARN_REMOVE_PLURAL_DEFAULT 1093 #define IDS_CERT_MGR 1094 #define IDS_FRIENDLY_NAME_NONE 1095 +#define IDS_EXPORT_WELCOME 1096 +#define IDS_IMPORT_WELCOME 1097 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 @@ -252,6 +254,7 @@ #define IDC_IMPORT_STORE 2705 #define IDC_IMPORT_BROWSE_STORE 2706 #define IDC_IMPORT_SETTINGS 2707 +#define IDC_IMPORT_WELCOME 2708 #define IDC_MGR_PURPOSE_SELECTION 2800 #define IDC_MGR_STORES 2801 @@ -280,6 +283,7 @@ #define IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE 2914 #define IDC_EXPORT_PASSWORD 2915 #define IDC_EXPORT_PASSWORD_CONFIRM 2916 +#define IDC_EXPORT_WELCOME 2917 #define IDC_SELECT_DISPLAY_STRING 3000 #define IDC_SELECT_CERTS 3001 diff --git a/dll/win32/cryptui/lang/cryptui_En.rc b/dll/win32/cryptui/lang/cryptui_En.rc index a3da8ed..415a27e 100644 --- a/dll/win32/cryptui/lang/cryptui_En.rc +++ b/dll/win32/cryptui/lang/cryptui_En.rc @@ -66,6 +66,7 @@ STRINGTABLE IDS_SELECT_STORE_TITLE "Select Certificate Store" IDS_SELECT_STORE "Please select a certificate store." IDS_IMPORT_WIZARD "Certificate Import Wizard" + IDS_IMPORT_WELCOME "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.\n\nA certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\nTo continue, click Next." IDS_IMPORT_TYPE_MISMATCH "The file contains objects that do not match the given criteria. Please select another file." IDS_IMPORT_FILE_TITLE "File to Import" IDS_IMPORT_FILE_SUBTITLE "Specify the file you want to import." @@ -145,6 +146,7 @@ STRINGTABLE IDS_PURPOSE_KEY_RECOVERY_AGENT "Key Recovery Agent" IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory Service Email Replication" IDS_EXPORT_WIZARD "Certificate Export Wizard" + IDS_EXPORT_WELCOME "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\nA certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\nTo continue, click Next." IDS_EXPORT_FORMAT_TITLE "Export Format" IDS_EXPORT_FORMAT_SUBTITLE "Choose the format in which the content will be saved." IDS_EXPORT_FILE_TITLE "Export Filename" @@ -286,10 +288,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.\n\n\ -A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\n\ -To continue, click Next.", - -1, 115,40,195,120 + LTEXT "", IDC_IMPORT_WELCOME, 115,40,195,120 END IDD_IMPORT_FILE DIALOGEX 0,0,317,178 @@ -382,10 +381,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\n\ -A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\n\ -To continue, click Next.", - -1, 115,40,195,120 + LTEXT "", IDC_EXPORT_WELCOME, 115,40,195,120 END IDD_EXPORT_PRIVATE_KEY DIALOGEX 0,0,317,143 diff --git a/dll/win32/cryptui/main.c b/dll/win32/cryptui/main.c index f4dee4a..a893a96 100644 --- a/dll/win32/cryptui/main.c +++ b/dll/win32/cryptui/main.c @@ -4859,19 +4859,22 @@ static LRESULT CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { struct ImportWizData *data; PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; - WCHAR fontFace[MAX_STRING_LEN]; + WCHAR buf[MAX_STRING_LEN]; HDC hDC = GetDC(hwnd); int height; data = (struct ImportWizData *)page->lParam; - LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, ARRAY_SIZE(fontFace)); + LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, buf, ARRAY_SIZE(buf)); height = -MulDiv(12, GetDeviceCaps(hDC, LOGPIXELSY), 72); data->titleFont = CreateFontW(height, 0, 0, 0, FW_BOLD, 0, 0, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, fontFace); + DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, buf); SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_TITLE), WM_SETFONT, (WPARAM)data->titleFont, TRUE); ReleaseDC(hwnd, hDC); + + LoadStringW(hInstance, IDS_IMPORT_WELCOME, buf, ARRAY_SIZE(buf)); + SetWindowTextW(GetDlgItem(hwnd, IDC_IMPORT_WELCOME), buf); break; } case WM_NOTIFY: @@ -5593,19 +5596,22 @@ static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { struct ExportWizData *data; PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; - WCHAR fontFace[MAX_STRING_LEN]; + WCHAR buf[MAX_STRING_LEN]; HDC hDC = GetDC(hwnd); int height; data = (struct ExportWizData *)page->lParam; - LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, ARRAY_SIZE(fontFace)); + LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, buf, ARRAY_SIZE(buf)); height = -MulDiv(12, GetDeviceCaps(hDC, LOGPIXELSY), 72); data->titleFont = CreateFontW(height, 0, 0, 0, FW_BOLD, 0, 0, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, fontFace); + DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, buf); SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_TITLE), WM_SETFONT, (WPARAM)data->titleFont, TRUE); ReleaseDC(hwnd, hDC); + + LoadStringW(hInstance, IDS_EXPORT_WELCOME, buf, ARRAY_SIZE(buf)); + SetWindowTextW(GetDlgItem(hwnd, IDC_EXPORT_WELCOME), buf); break; } case WM_NOTIFY: