December 2008 - Wine-Commits

Juan Lang : cryptui: Show valid policies for a cert.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 86e11849433eb6d033b33174e8fea4a45ba70c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e11849433eb6d033b33174e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:50:46 2008 -0800 cryptui: Show valid policies for a cert. --- dlls/cryptui/cryptui_En.rc | 28 ++++ dlls/cryptui/cryptuires.h | 29 ++++ dlls/cryptui/main.c | 331 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 387 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86e11849433eb6d033b33…

1 0

Juan Lang : cryptui: Show issuer statement in cert properties dialog.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: e7490ad0821356ee7d20ffc4fd357ed826383ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7490ad0821356ee7d20ffc4f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:51:27 2008 -0800 cryptui: Show issuer statement in cert properties dialog. --- dlls/cryptui/Makefile.in | 2 +- dlls/cryptui/cryptui_En.rc | 11 +++ dlls/cryptui/cryptuires.h | 4 + dlls/cryptui/main.c | 208 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 223 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index 078cb33..d81a8e5 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptui.dll IMPORTS = uuid crypt32 ole32 comctl32 user32 kernel32 -DELAYIMPORTS = wintrust +DELAYIMPORTS = wintrust urlmon IMPORTLIB = cryptui C_SRCS = \ diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index f220679..d0ef8b1 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -81,3 +81,14 @@ BEGIN PUSHBUTTON "&Install Certificate...", IDC_ADDTOSTORE,103,216,70,14 PUSHBUTTON "Issuer &Statement", IDC_ISSUERSTATEMENT,177,216,70,14 END + +IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 +CAPTION "Disclaimer" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "Close", IDOK,103,216,70,14 + PUSHBUTTON "More &Info", IDC_CPS,177,216,70,14 +END diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 7cdb534..e499e0b 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -60,6 +60,7 @@ #define IDS_PURPOSE_DS_EMAIL_REPLICATION 1125 #define IDD_GENERAL 100 +#define IDD_USERNOTICE 103 #define IDB_CERT 201 #define IDB_CERT_ERROR 202 @@ -74,4 +75,7 @@ #define IDC_ADDTOSTORE 2005 #define IDC_ISSUERSTATEMENT 2006 +#define IDC_USERNOTICE 2300 +#define IDC_CPS 2301 + #endif /* ndef __CRYPTUIRES_H_ */ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 148f91d..f04875f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -34,6 +34,8 @@ #include "richole.h" #include "cryptuiapi.h" #include "cryptuires.h" +#include "urlmon.h" +#include "hlink.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -614,6 +616,117 @@ static void set_policy_text(HWND text, } } +static CRYPT_OBJID_BLOB *find_policy_qualifier(CERT_POLICIES_INFO *policies, + LPCSTR policyOid) +{ + CRYPT_OBJID_BLOB *ret = NULL; + DWORD i; + + for (i = 0; !ret && i < policies->cPolicyInfo; i++) + { + DWORD j; + + for (j = 0; !ret && j < policies->rgPolicyInfo[i].cPolicyQualifier; j++) + if (!strcmp(policies->rgPolicyInfo[i].rgPolicyQualifier[j]. + pszPolicyQualifierId, policyOid)) + ret = &policies->rgPolicyInfo[i].rgPolicyQualifier[j]. + Qualifier; + } + return ret; +} + +static WCHAR *get_cps_str_from_qualifier(CRYPT_OBJID_BLOB *qualifier) +{ + LPWSTR qualifierStr = NULL; + CERT_NAME_VALUE *qualifierValue; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_NAME_VALUE, + qualifier->pbData, qualifier->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + &qualifierValue, &size)) + { + size = CertRDNValueToStrW(qualifierValue->dwValueType, + &qualifierValue->Value, NULL, 0); + qualifierStr = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (qualifierStr) + CertRDNValueToStrW(qualifierValue->dwValueType, + &qualifierValue->Value, qualifierStr, size); + LocalFree(qualifierValue); + } + return qualifierStr; +} + +static WCHAR *get_user_notice_from_qualifier(CRYPT_OBJID_BLOB *qualifier) +{ + LPWSTR str = NULL; + CERT_POLICY_QUALIFIER_USER_NOTICE *qualifierValue; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, + X509_PKIX_POLICY_QUALIFIER_USERNOTICE, + qualifier->pbData, qualifier->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + &qualifierValue, &size)) + { + str = HeapAlloc(GetProcessHeap(), 0, + (strlenW(qualifierValue->pszDisplayText) + 1) * sizeof(WCHAR)); + if (str) + strcpyW(str, qualifierValue->pszDisplayText); + LocalFree(qualifierValue); + } + return str; +} + +struct IssuerStatement +{ + LPWSTR cps; + LPWSTR userNotice; +}; + +static void set_issuer_statement(HWND hwnd, + PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo) +{ + PCERT_EXTENSION policyExt; + + if (!(pCertViewInfo->dwFlags & CRYPTUI_DISABLE_ISSUERSTATEMENT) && + (policyExt = CertFindExtension(szOID_CERT_POLICIES, + pCertViewInfo->pCertContext->pCertInfo->cExtension, + pCertViewInfo->pCertContext->pCertInfo->rgExtension))) + { + CERT_POLICIES_INFO *policies; + DWORD size; + + if (CryptDecodeObjectEx(X509_ASN_ENCODING, policyExt->pszObjId, + policyExt->Value.pbData, policyExt->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &policies, &size)) + { + CRYPT_OBJID_BLOB *qualifier; + LPWSTR cps = NULL, userNotice = NULL; + + if ((qualifier = find_policy_qualifier(policies, + szOID_PKIX_POLICY_QUALIFIER_CPS))) + cps = get_cps_str_from_qualifier(qualifier); + if ((qualifier = find_policy_qualifier(policies, + szOID_PKIX_POLICY_QUALIFIER_USERNOTICE))) + userNotice = get_user_notice_from_qualifier(qualifier); + if (cps || userNotice) + { + struct IssuerStatement *issuerStatement = + HeapAlloc(GetProcessHeap(), 0, sizeof(struct IssuerStatement)); + + if (issuerStatement) + { + issuerStatement->cps = cps; + issuerStatement->userNotice = userNotice; + EnableWindow(GetDlgItem(hwnd, IDC_ISSUERSTATEMENT), TRUE); + SetWindowLongPtrW(hwnd, DWLP_USER, + (ULONG_PTR)issuerStatement); + } + } + LocalFree(policies); + } + } +} + static void set_cert_info(HWND hwnd, PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo) { @@ -669,7 +782,7 @@ static void set_cert_info(HWND hwnd, else { set_policy_text(text, pCertViewInfo); - FIXME("show issuer statement\n"); + set_issuer_statement(hwnd, pCertViewInfo); } } @@ -754,6 +867,55 @@ static void set_general_info(HWND hwnd, set_cert_validity_period(hwnd, pCertViewInfo->pCertContext); } +static LRESULT CALLBACK user_notice_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + LRESULT ret = 0; + HWND text; + struct IssuerStatement *issuerStatement; + + switch (msg) + { + case WM_INITDIALOG: + text = GetDlgItem(hwnd, IDC_USERNOTICE); + issuerStatement = (struct IssuerStatement *)lp; + add_unformatted_text_to_control(text, issuerStatement->userNotice, + strlenW(issuerStatement->userNotice)); + if (issuerStatement->cps) + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)issuerStatement->cps); + else + EnableWindow(GetDlgItem(hwnd, IDC_CPS), FALSE); + break; + case WM_COMMAND: + switch (wp) + { + case IDOK: + EndDialog(hwnd, IDOK); + ret = TRUE; + break; + case IDC_CPS: + { + IBindCtx *bctx = NULL; + LPWSTR cps; + + CreateBindCtx(0, &bctx); + cps = (LPWSTR)GetWindowLongPtrW(hwnd, DWLP_USER); + HlinkSimpleNavigateToString(cps, NULL, NULL, NULL, bctx, NULL, + HLNF_OPENINNEWWINDOW, 0); + IBindCtx_Release(bctx); + break; + } + } + } + return ret; +} + +static void show_user_notice(HWND hwnd, struct IssuerStatement *issuerStatement) +{ + DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDD_USERNOTICE), hwnd, + user_notice_dlg_proc, (LPARAM)issuerStatement); +} + static LRESULT CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -778,17 +940,61 @@ static LRESULT CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case IDC_ADDTOSTORE: FIXME("call CryptUIWizImport\n"); break; + case IDC_ISSUERSTATEMENT: + { + struct IssuerStatement *issuerStatement = + (struct IssuerStatement *)GetWindowLongPtrW(hwnd, DWLP_USER); + + if (issuerStatement) + { + if (issuerStatement->userNotice) + show_user_notice(hwnd, issuerStatement); + else if (issuerStatement->cps) + { + IBindCtx *bctx = NULL; + + CreateBindCtx(0, &bctx); + HlinkSimpleNavigateToString(issuerStatement->cps, NULL, + NULL, NULL, bctx, NULL, HLNF_OPENINNEWWINDOW, 0); + IBindCtx_Release(bctx); + } + } + break; + } } break; } return 0; } +static UINT CALLBACK general_callback_proc(HWND hwnd, UINT msg, + PROPSHEETPAGEW *page) +{ + struct IssuerStatement *issuerStatement; + + switch (msg) + { + case PSPCB_RELEASE: + issuerStatement = + (struct IssuerStatement *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (issuerStatement) + { + HeapFree(GetProcessHeap(), 0, issuerStatement->cps); + HeapFree(GetProcessHeap(), 0, issuerStatement->userNotice); + HeapFree(GetProcessHeap(), 0, issuerStatement); + } + break; + } + return 1; +} + static void init_general_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, PROPSHEETPAGEW *page) { memset(page, 0, sizeof(PROPSHEETPAGEW)); page->dwSize = sizeof(PROPSHEETPAGEW); + page->dwFlags = PSP_USECALLBACK; + page->pfnCallback = general_callback_proc; page->hInstance = hInstance; page->u.pszTemplate = MAKEINTRESOURCEW(IDD_GENERAL); page->pfnDlgProc = general_dlg_proc;

1 0

Juan Lang : cryptui: Ignore additional prop sheet pages when calling CryptUIViewCertificateW from CryptUIViewCertificateA .
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 29bf23108b8f17308fdb083d80e302eba36d75b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29bf23108b8f17308fdb083d8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 17:19:56 2008 -0800 cryptui: Ignore additional prop sheet pages when calling CryptUIViewCertificateW from CryptUIViewCertificateA. --- dlls/cryptui/main.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 692196c..b476a73 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -59,6 +59,9 @@ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) return FALSE; } +/*********************************************************************** + * CryptUIDlgViewCertificateA (CRYPTUI.@) + */ BOOL WINAPI CryptUIDlgViewCertificateA( PCCRYPTUI_VIEWCERTIFICATE_STRUCTA pCertViewInfo, BOOL *pfPropertiesChanged) { @@ -87,6 +90,11 @@ BOOL WINAPI CryptUIDlgViewCertificateA( goto error; } } + if (pCertViewInfo->cPropSheetPages) + { + FIXME("ignoring additional prop sheet pages\n"); + viewInfo.cPropSheetPages = 0; + } ret = CryptUIDlgViewCertificateW(&viewInfo, pfPropertiesChanged); HeapFree(GetProcessHeap(), 0, title); error:

1 0

Juan Lang : cryptui: Show subject, issuer, and validity period for a cert in the properties dialog.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 9bb06915bb759b1b7e56d0722d54eae1d688d512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb06915bb759b1b7e56d0722… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 16 09:46:39 2008 -0800 cryptui: Show subject, issuer, and validity period for a cert in the properties dialog. --- dlls/cryptui/cryptui_En.rc | 4 + dlls/cryptui/cryptuires.h | 5 + dlls/cryptui/main.c | 182 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 190 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 625de87..3f718cc 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -23,6 +23,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_CERTIFICATE "Certificate" + IDS_SUBJECT_HEADING "Issued to: " + IDS_ISSUER_HEADING "Issued by: " + IDS_VALID_FROM "Valid from " + IDS_VALID_TO " to " } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 54ce3fa..8c99b8e 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -20,6 +20,11 @@ #define IDS_CERTIFICATE 1000 +#define IDS_SUBJECT_HEADING 1010 +#define IDS_ISSUER_HEADING 1011 +#define IDS_VALID_FROM 1012 +#define IDS_VALID_TO 1013 + #define IDD_GENERAL 100 #define IDC_STATIC 2000 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 7351743..6ec6aa3 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -27,6 +27,8 @@ #include "winnls.h" #include "winuser.h" #include "softpub.h" +#include "wingdi.h" +#include "richedit.h" #include "cryptuiapi.h" #include "cryptuires.h" #include "wine/debug.h" @@ -106,6 +108,184 @@ error: return ret; } +struct ReadStringStruct +{ + LPCWSTR buf; + LONG pos; + LONG len; +}; + +static DWORD CALLBACK read_text_callback(DWORD_PTR dwCookie, LPBYTE buf, + LONG cb, LONG *pcb) +{ + struct ReadStringStruct *string = (struct ReadStringStruct *)dwCookie; + LONG cch = min(cb / sizeof(WCHAR), string->len - string->pos); + + TRACE("(%p, %p, %d, %p)\n", string, buf, cb, pcb); + + memmove(buf, string->buf + string->pos, cch * sizeof(WCHAR)); + string->pos += cch; + *pcb = cch * sizeof(WCHAR); + return 0; +} + +static void add_unformatted_text_to_control(HWND hwnd, LPCWSTR text, LONG len) +{ + struct ReadStringStruct string; + EDITSTREAM editstream; + + TRACE("(%p, %s)\n", hwnd, debugstr_wn(text, len)); + + string.buf = text; + string.pos = 0; + string.len = len; + editstream.dwCookie = (DWORD_PTR)&string; + editstream.dwError = 0; + editstream.pfnCallback = read_text_callback; + SendMessageW(hwnd, EM_STREAMIN, SF_TEXT | SFF_SELECTION | SF_UNICODE, + (LPARAM)&editstream); +} + +static void add_string_resource_to_control(HWND hwnd, int id) +{ + LPWSTR str; + LONG len; + + len = LoadStringW(hInstance, id, (LPWSTR)&str, 0); + add_unformatted_text_to_control(hwnd, str, len); +} + +static void add_text_with_paraformat_to_control(HWND hwnd, LPCWSTR text, + LONG len, const PARAFORMAT2 *fmt) +{ + add_unformatted_text_to_control(hwnd, text, len); + SendMessageW(hwnd, EM_SETPARAFORMAT, 0, (LPARAM)fmt); +} + +static void add_string_resource_with_paraformat_to_control(HWND hwnd, int id, + const PARAFORMAT2 *fmt) +{ + LPWSTR str; + LONG len; + + len = LoadStringW(hInstance, id, (LPWSTR)&str, 0); + add_text_with_paraformat_to_control(hwnd, str, len, fmt); +} + +static LPWSTR get_cert_name_string(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags) +{ + LPWSTR buf = NULL; + DWORD len; + + len = CertGetNameStringW(pCertContext, dwType, dwFlags, NULL, NULL, 0); + if (len) + { + buf = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (buf) + CertGetNameStringW(pCertContext, dwType, dwFlags, NULL, buf, len); + } + return buf; +} + +static void add_cert_string_to_control(HWND hwnd, PCCERT_CONTEXT pCertContext, + DWORD dwType, DWORD dwFlags) +{ + LPWSTR name = get_cert_name_string(pCertContext, dwType, dwFlags); + + if (name) + { + /* Don't include NULL-terminator in output */ + DWORD len = lstrlenW(name); + + add_unformatted_text_to_control(hwnd, name, len); + HeapFree(GetProcessHeap(), 0, name); + } +} + +#define MY_INDENT 200 + +static void set_cert_name_string(HWND hwnd, PCCERT_CONTEXT cert, + DWORD nameFlags, int heading) +{ + WCHAR nl = '\n'; + HWND text = GetDlgItem(hwnd, IDC_CERTIFICATE_NAMES); + CHARFORMATW charFmt; + PARAFORMAT2 parFmt; + + memset(&charFmt, 0, sizeof(charFmt)); + charFmt.cbSize = sizeof(charFmt); + charFmt.dwMask = CFM_BOLD; + charFmt.dwEffects = CFE_BOLD; + SendMessageW(text, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFmt); + parFmt.cbSize = sizeof(parFmt); + parFmt.dwMask = PFM_STARTINDENT; + parFmt.dxStartIndent = MY_INDENT * 3; + add_string_resource_with_paraformat_to_control(text, heading, &parFmt); + charFmt.dwEffects = 0; + SendMessageW(text, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFmt); + add_cert_string_to_control(text, cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, + nameFlags); + add_unformatted_text_to_control(text, &nl, 1); + add_unformatted_text_to_control(text, &nl, 1); + add_unformatted_text_to_control(text, &nl, 1); + +} + +static void add_date_string_to_control(HWND hwnd, const FILETIME *fileTime) +{ + WCHAR dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ + WCHAR date[80]; + SYSTEMTIME sysTime; + + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, + sizeof(dateFmt) / sizeof(dateFmt[0])); + FileTimeToSystemTime(fileTime, &sysTime); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, + sizeof(date) / sizeof(date[0])); + add_unformatted_text_to_control(hwnd, date, lstrlenW(date)); +} + +static void set_cert_validity_period(HWND hwnd, PCCERT_CONTEXT cert) +{ + WCHAR nl = '\n'; + HWND text = GetDlgItem(hwnd, IDC_CERTIFICATE_NAMES); + CHARFORMATW charFmt; + PARAFORMAT2 parFmt; + + memset(&charFmt, 0, sizeof(charFmt)); + charFmt.cbSize = sizeof(charFmt); + charFmt.dwMask = CFM_BOLD; + charFmt.dwEffects = CFE_BOLD; + SendMessageW(text, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFmt); + parFmt.cbSize = sizeof(parFmt); + parFmt.dwMask = PFM_STARTINDENT; + parFmt.dxStartIndent = MY_INDENT * 3; + add_string_resource_with_paraformat_to_control(text, IDS_VALID_FROM, + &parFmt); + charFmt.dwEffects = 0; + SendMessageW(text, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFmt); + add_date_string_to_control(text, &cert->pCertInfo->NotBefore); + charFmt.dwEffects = CFE_BOLD; + SendMessageW(text, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFmt); + add_string_resource_to_control(text, IDS_VALID_TO); + charFmt.dwEffects = 0; + SendMessageW(text, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFmt); + add_date_string_to_control(text, &cert->pCertInfo->NotAfter); + add_unformatted_text_to_control(text, &nl, 1); +} + +static void set_general_info(HWND hwnd, + PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo) +{ + FIXME("set cert general info\n"); + set_cert_name_string(hwnd, pCertViewInfo->pCertContext, 0, + IDS_SUBJECT_HEADING); + set_cert_name_string(hwnd, pCertViewInfo->pCertContext, + CERT_NAME_ISSUER_FLAG, IDS_ISSUER_HEADING); + set_cert_validity_period(hwnd, pCertViewInfo->pCertContext); +} + static LRESULT CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -122,7 +302,7 @@ static LRESULT CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, if (pCertViewInfo->dwFlags & CRYPTUI_DISABLE_ADDTOSTORE) ShowWindow(GetDlgItem(hwnd, IDC_ADDTOSTORE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_ISSUERSTATEMENT), FALSE); - FIXME("show cert properties\n"); + set_general_info(hwnd, pCertViewInfo); break; case WM_COMMAND: switch (wp)

1 0

Juan Lang : cryptui: Show (empty) certificate dialog.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 20dfbb3d64b4cad459d09b588f445b2428c874f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20dfbb3d64b4cad459d09b588… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 16 09:45:30 2008 -0800 cryptui: Show (empty) certificate dialog. --- dlls/cryptui/Makefile.in | 4 +- dlls/cryptui/cryptui.rc | 28 +++++++ dlls/cryptui/cryptui_En.rc | 46 ++++++++++++ dlls/cryptui/cryptuires.h | 33 +++++++++ dlls/cryptui/main.c | 167 +++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 275 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20dfbb3d64b4cad459d09…

1 0

Juan Lang : cryptui: Call WinVerifyTrust if the caller has not.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 104b366d07e2d3a3ef1aa6baefaf871d2a457ca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104b366d07e2d3a3ef1aa6bae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 17:32:57 2008 -0800 cryptui: Call WinVerifyTrust if the caller has not. --- dlls/cryptui/Makefile.in | 1 + dlls/cryptui/main.c | 78 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index abb0b27..2093500 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptui.dll IMPORTS = crypt32 kernel32 +DELAYIMPORTS = wintrust IMPORTLIB = cryptui C_SRCS = \ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b476a73..c0b8ffd 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winnls.h" #include "winuser.h" +#include "softpub.h" #include "cryptuiapi.h" #include "wine/debug.h" @@ -101,12 +102,79 @@ error: return ret; } -BOOL WINAPI CryptUIDlgViewCertificateW(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, - BOOL *pfPropertiesChanged) +/*********************************************************************** + * CryptUIDlgViewCertificateW (CRYPTUI.@) + */ +BOOL WINAPI CryptUIDlgViewCertificateW( + PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, BOOL *pfPropertiesChanged) { - FIXME("(%p, %p): stub\n", pCertViewInfo, pfPropertiesChanged); - if (pfPropertiesChanged) *pfPropertiesChanged = FALSE; - return TRUE; + static GUID generic_cert_verify = WINTRUST_ACTION_GENERIC_CERT_VERIFY; + CRYPTUI_VIEWCERTIFICATE_STRUCTW viewInfo; + WINTRUST_DATA wvt; + WINTRUST_CERT_INFO cert; + BOOL ret = FALSE; + CRYPT_PROVIDER_SGNR *signer; + CRYPT_PROVIDER_CERT *provCert = NULL; + + TRACE("(%p, %p)\n", pCertViewInfo, pfPropertiesChanged); + + if (pCertViewInfo->dwSize != sizeof(CRYPTUI_VIEWCERTIFICATE_STRUCTW)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + /* Make a local copy in case we have to call WinVerifyTrust ourselves */ + memcpy(&viewInfo, pCertViewInfo, sizeof(viewInfo)); + if (!viewInfo.u.hWVTStateData) + { + memset(&wvt, 0, sizeof(wvt)); + wvt.cbStruct = sizeof(wvt); + wvt.dwUIChoice = WTD_UI_NONE; + if (viewInfo.dwFlags & + CRYPTUI_ENABLE_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT) + wvt.fdwRevocationChecks |= WTD_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; + if (viewInfo.dwFlags & CRYPTUI_ENABLE_REVOCATION_CHECK_END_CERT) + wvt.fdwRevocationChecks |= WTD_REVOCATION_CHECK_END_CERT; + if (viewInfo.dwFlags & CRYPTUI_ENABLE_REVOCATION_CHECK_CHAIN) + wvt.fdwRevocationChecks |= WTD_REVOCATION_CHECK_CHAIN; + wvt.dwUnionChoice = WTD_CHOICE_CERT; + memset(&cert, 0, sizeof(cert)); + cert.cbStruct = sizeof(cert); + cert.psCertContext = (CERT_CONTEXT *)viewInfo.pCertContext; + cert.chStores = viewInfo.cStores; + cert.pahStores = viewInfo.rghStores; + wvt.u.pCert = &cert; + wvt.dwStateAction = WTD_STATEACTION_VERIFY; + WinVerifyTrust(NULL, &generic_cert_verify, &wvt); + viewInfo.u.pCryptProviderData = + WTHelperProvDataFromStateData(wvt.hWVTStateData); + signer = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)viewInfo.u.pCryptProviderData, 0, FALSE, 0); + provCert = WTHelperGetProvCertFromChain(signer, 0); + ret = TRUE; + } + else + { + viewInfo.u.pCryptProviderData = + WTHelperProvDataFromStateData(viewInfo.u.hWVTStateData); + signer = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)viewInfo.u.pCryptProviderData, + viewInfo.idxSigner, viewInfo.fCounterSigner, + viewInfo.idxCounterSigner); + provCert = WTHelperGetProvCertFromChain(signer, viewInfo.idxCert); + ret = TRUE; + } + if (ret) + { + FIXME("show cert dialog\n"); + ret = FALSE; + if (!viewInfo.u.hWVTStateData) + { + wvt.dwStateAction = WTD_STATEACTION_CLOSE; + WinVerifyTrust(NULL, &generic_cert_verify, &wvt); + } + } + return ret; } static PCCERT_CONTEXT make_cert_from_file(LPCWSTR fileName)

1 0

Dan Kegel : winver: Add version resource.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: dfc028b4fbb0979c4eda1aef231fa31d1d115059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc028b4fbb0979c4eda1aef2… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Dec 17 10:22:45 2008 -0800 winver: Add version resource. --- programs/winver/Makefile.in | 2 ++ programs/winver/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 62571d3..41572a0 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -9,6 +9,8 @@ IMPORTS = shell32 kernel32 C_SRCS = winver.c +RC_SRCS = version.rc + @MAKE_PROG_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/winver/version.rc b/programs/winver/version.rc new file mode 100644 index 0000000..ae042fb --- /dev/null +++ b/programs/winver/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2004 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Windows Version" +#define WINE_FILENAME_STR "winver.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,2600,0 +#define WINE_FILEVERSION_STR "5.1.2600.0" +#define WINE_PRODUCTVERSION 5,1,2600,0 +#define WINE_PRODUCTVERSION_STR "5.1.2600.0" + +#include "wine/wine_common_ver.rc"

1 0

Henri Verbeet : wined3d: Don't mark shader constants dirty when we' re recording a stateblock.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: a14dab49371330255fd18ababfea7830cd122df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14dab49371330255fd18abab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 17 17:07:25 2008 +0100 wined3d: Don't mark shader constants dirty when we're recording a stateblock. --- dlls/wined3d/device.c | 96 ++++++++++++++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9342040..de95c92 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3496,7 +3496,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantB( This->updateStateBlock->changed.vertexShaderConstantsB |= (1 << i); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); + if (!This->isRecordingState) IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); return WINED3D_OK; } @@ -3544,7 +3544,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantI( This->updateStateBlock->changed.vertexShaderConstantsI |= (1 << i); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); + if (!This->isRecordingState) IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); return WINED3D_OK; } @@ -3591,19 +3591,28 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantF( srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); } - for (i = start; i < count + start; ++i) { - if (!This->updateStateBlock->changed.vertexShaderConstantsF[i]) { - constants_entry *ptr = LIST_ENTRY(list_head(&This->updateStateBlock->set_vconstantsF), constants_entry, entry); - if (!ptr || ptr->count >= sizeof(ptr->idx) / sizeof(*ptr->idx)) { - ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(constants_entry)); - list_add_head(&This->updateStateBlock->set_vconstantsF, &ptr->entry); + if (!This->isRecordingState) + { + for (i = start; i < count + start; ++i) + { + if (!This->stateBlock->changed.vertexShaderConstantsF[i]) + { + constants_entry *ptr = LIST_ENTRY(list_head(&This->stateBlock->set_vconstantsF), + constants_entry, entry); + if (!ptr || ptr->count >= sizeof(ptr->idx) / sizeof(*ptr->idx)) + { + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(constants_entry)); + list_add_head(&This->stateBlock->set_vconstantsF, &ptr->entry); + } + ptr->idx[ptr->count++] = i; } - ptr->idx[ptr->count++] = i; - This->updateStateBlock->changed.vertexShaderConstantsF[i] = TRUE; } + + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); + memset(This->updateStateBlock->changed.vertexShaderConstantsF + start, 1, + sizeof(*This->updateStateBlock->changed.vertexShaderConstantsF) * count); return WINED3D_OK; } @@ -3631,14 +3640,17 @@ UINT count) { srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); } - /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active - * context. On a context switch the old context will be fully dirtified - */ - memset(This->activeContext->vshader_const_dirty + start, 1, - sizeof(*This->activeContext->vshader_const_dirty) * count); - This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start+count+1); + if (!This->isRecordingState) + { + /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active + * context. On a context switch the old context will be fully dirtified */ + memset(This->activeContext->vshader_const_dirty + start, 1, + sizeof(*This->activeContext->vshader_const_dirty) * count); + This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start+count+1); + + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); + } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); memset(This->updateStateBlock->changed.vertexShaderConstantsF + start, 1, sizeof(*This->updateStateBlock->changed.vertexShaderConstantsF) * count); @@ -3931,7 +3943,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantB( This->updateStateBlock->changed.pixelShaderConstantsB |= (1 << i); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); + if (!This->isRecordingState) IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); return WINED3D_OK; } @@ -3979,7 +3991,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantI( This->updateStateBlock->changed.pixelShaderConstantsI |= (1 << i); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); + if (!This->isRecordingState) IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); return WINED3D_OK; } @@ -4026,19 +4038,28 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF( srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); } - for (i = start; i < count + start; ++i) { - if (!This->updateStateBlock->changed.pixelShaderConstantsF[i]) { - constants_entry *ptr = LIST_ENTRY(list_head(&This->updateStateBlock->set_pconstantsF), constants_entry, entry); - if (!ptr || ptr->count >= sizeof(ptr->idx) / sizeof(*ptr->idx)) { - ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(constants_entry)); - list_add_head(&This->updateStateBlock->set_pconstantsF, &ptr->entry); + if (!This->isRecordingState) + { + for (i = start; i < count + start; ++i) + { + if (!This->stateBlock->changed.pixelShaderConstantsF[i]) + { + constants_entry *ptr = LIST_ENTRY(list_head(&This->stateBlock->set_pconstantsF), + constants_entry, entry); + if (!ptr || ptr->count >= sizeof(ptr->idx) / sizeof(*ptr->idx)) + { + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(constants_entry)); + list_add_head(&This->stateBlock->set_pconstantsF, &ptr->entry); + } + ptr->idx[ptr->count++] = i; } - ptr->idx[ptr->count++] = i; - This->updateStateBlock->changed.pixelShaderConstantsF[i] = TRUE; } + + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); + memset(This->updateStateBlock->changed.pixelShaderConstantsF + start, 1, + sizeof(*This->updateStateBlock->changed.pixelShaderConstantsF) * count); return WINED3D_OK; } @@ -4066,14 +4087,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF_DirtyConst( srcData[i*4], srcData[i*4+1], srcData[i*4+2], srcData[i*4+3]); } - /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active - * context. On a context switch the old context will be fully dirtified - */ - memset(This->activeContext->pshader_const_dirty + start, 1, - sizeof(*This->activeContext->pshader_const_dirty) * count); - This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start+count+1); + if (!This->isRecordingState) + { + /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active + * context. On a context switch the old context will be fully dirtified */ + memset(This->activeContext->pshader_const_dirty + start, 1, + sizeof(*This->activeContext->pshader_const_dirty) * count); + This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start+count+1); + + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); + } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); memset(This->updateStateBlock->changed.pixelShaderConstantsF + start, 1, sizeof(*This->updateStateBlock->changed.pixelShaderConstantsF) * count);

1 0

Henri Verbeet : wined3d: Track shader constants in the shader backend.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: d099dde7a963cfe267920eeb2a81a1000ef7145a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d099dde7a963cfe267920eeb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 17 17:07:25 2008 +0100 wined3d: Track shader constants in the shader backend. --- dlls/wined3d/arb_program_shader.c | 24 ++++ dlls/wined3d/baseshader.c | 4 + dlls/wined3d/device.c | 255 +------------------------------------ dlls/wined3d/directx.c | 8 - dlls/wined3d/glsl_shader.c | 46 +++++++ dlls/wined3d/wined3d_private.h | 4 +- 6 files changed, 79 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d099dde7a963cfe267920…

1 0

Henri Verbeet : wined3d: Fix constant setting for the ARB backend.
by Alexandre Julliard Dec. 18, 2008

Dec. 18, 2008

Module: wine Branch: master Commit: 0968cb9b6cc8a1bdd00f9b512d4cab90026e2068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0968cb9b6cc8a1bdd00f9b512… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 17 17:07:24 2008 +0100 wined3d: Fix constant setting for the ARB backend. --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 326c8ba..9342040 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3639,6 +3639,8 @@ UINT count) { This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start+count+1); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT); + memset(This->updateStateBlock->changed.vertexShaderConstantsF + start, 1, + sizeof(*This->updateStateBlock->changed.vertexShaderConstantsF) * count); return WINED3D_OK; } @@ -4072,6 +4074,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF_DirtyConst( This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start+count+1); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT); + memset(This->updateStateBlock->changed.pixelShaderConstantsF + start, 1, + sizeof(*This->updateStateBlock->changed.pixelShaderConstantsF) * count); return WINED3D_OK; }

1 0