January 2009 - Wine-Commits

Detlef Riekenberg : localspl: Call DrvDriverEvent in AddPrinterDriverEx.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 8eff8acc46a0dd20b5a904cf8dcf2b5b09769838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eff8acc46a0dd20b5a904cf8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 8 15:11:29 2009 +0100 localspl: Call DrvDriverEvent in AddPrinterDriverEx. --- dlls/localspl/localspl_main.c | 56 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 4483ac8..7137d97 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -28,8 +28,9 @@ #include "wingdi.h" #include "winreg.h" #include "winspool.h" -#include "ddk/winsplp.h" #include "winuser.h" +#include "ddk/winddiui.h" +#include "ddk/winsplp.h" #include "wine/list.h" #include "wine/debug.h" @@ -722,6 +723,44 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment return TRUE; } +/****************************************************************** + * driver_load [internal] + * + * load a driver user interface dll + * + * On failure, NULL is returned + * + */ + +static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) +{ + WCHAR fullname[MAX_PATH]; + HMODULE hui; + DWORD len; + + TRACE("(%p, %s)\n", env, debugstr_w(dllname)); + + /* build the driverdir */ + len = sizeof(fullname) - + (lstrlenW(env->versionsubdir) + 1 + lstrlenW(dllname) + 1) * sizeof(WCHAR); + + if (!fpGetPrinterDriverDirectory(NULL, (LPWSTR) env->envname, 1, + (LPBYTE) fullname, len, &len)) { + /* Should never Fail */ + SetLastError(ERROR_BUFFER_OVERFLOW); + return NULL; + } + + lstrcatW(fullname, env->versionsubdir); + lstrcatW(fullname, backslashW); + lstrcatW(fullname, dllname); + + hui = LoadLibraryW(fullname); + TRACE("%p: LoadLibrary(%s) %d\n", hui, debugstr_w(fullname), GetLastError()); + + return hui; +} + /****************************************************************************** * myAddPrinterDriverEx [internal] * @@ -735,12 +774,15 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo const printenv_t *env; apd_data_t apd; DRIVER_INFO_8W di; + BOOL (WINAPI *pDrvDriverEvent)(DWORD, DWORD, LPBYTE, LPARAM); + HMODULE hui; LPWSTR ptr; HKEY hroot; HKEY hdrv; DWORD disposition; DWORD len; LONG lres; + BOOL res; /* we need to set all entries in the Registry, independent from the Level of DRIVER_INFO, that the caller supplied */ @@ -873,7 +915,17 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo if (level > 5) TRACE("level %u for Driver %s is incomplete\n", level, debugstr_w(di.pName)); RegCloseKey(hdrv); - TRACE("### DrvDriverEvent(...,DRIVEREVENT_INITIALIZE) not implemented yet\n"); + hui = driver_load(env, di.pConfigFile); + pDrvDriverEvent = (void *)GetProcAddress(hui, "DrvDriverEvent"); + if (hui && pDrvDriverEvent) { + + /* Support for DrvDriverEvent is optional */ + TRACE("DRIVER_EVENT_INITIALIZE for %s (%s)\n", debugstr_w(di.pName), debugstr_w(di.pConfigFile)); + /* MSDN: level for DRIVER_INFO is 1 to 3 */ + res = pDrvDriverEvent(DRIVER_EVENT_INITIALIZE, 3, (LPBYTE) &di, 0); + TRACE("got %d from DRIVER_EVENT_INITIALIZE\n", res); + } + FreeLibrary(hui); TRACE("=> TRUE with %u\n", GetLastError()); return TRUE;

1 0

Andrew Talbot : iphlpapi: Remove unused function.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 0592ca5fb0524e56af3302fd7e44c85075e2a0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0592ca5fb0524e56af3302fd7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 8 20:15:00 2009 +0000 iphlpapi: Remove unused function. --- dlls/iphlpapi/ifenum.c | 11 ----------- dlls/iphlpapi/ifenum.h | 7 +++---- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 2929b70..f36fc99 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -652,17 +652,6 @@ DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry) return ret; } -DWORD getInterfaceEntryByIndex(DWORD index, PMIB_IFROW entry) -{ - char nameBuf[IF_NAMESIZE]; - char *name = getInterfaceNameByIndex(index, nameBuf); - - if (name) - return getInterfaceEntryByName(name, entry); - else - return ERROR_INVALID_DATA; -} - /* Enumerates the IP addresses in the system using SIOCGIFCONF, returning * the count to you in *pcAddresses. It also returns to you the struct ifconf * used by the call to ioctl, so that you may process the addresses further. diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 775244c..d471750 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -91,13 +91,12 @@ DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, DWORD getInterfacePhysicalByIndex(DWORD index, PDWORD len, PBYTE addr, PDWORD type); -/* Fills in the MIB_IFROW by name/index. Doesn't fill in interface statistics, +/* Fills in the MIB_IFROW by name. Doesn't fill in interface statistics, * see ipstats.h for that. - * Returns ERROR_INVALID_PARAMETER if name or entry is NULL, ERROR_INVALID_DATA - * if name/index isn't valid, and NO_ERROR otherwise. + * Returns ERROR_INVALID_PARAMETER if name is NULL, ERROR_INVALID_DATA + * if name isn't valid, and NO_ERROR otherwise. */ DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry); -DWORD getInterfaceEntryByIndex(DWORD index, PMIB_IFROW entry); DWORD getNumIPAddresses(void);

1 0

Stefan Leichter : shell32: Add stub for ordinal 526.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 9871dc07669ede7fef30f07431f9577f760a4673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9871dc07669ede7fef30f0743… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Fri Jan 9 12:26:40 2009 +0100 shell32: Add stub for ordinal 526. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellord.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index b4761c6..a3d76ac 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -231,6 +231,7 @@ 523 stdcall -noname SHFreeShared(long long) 524 stdcall -noname RealDriveType(long long) 525 stub RealDriveTypeFlags + 526 stdcall @() SHELL32_526 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) 641 stdcall -noname NTSHChangeNotifyDeregister(long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 7893445..2b7103c 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1992,3 +1992,12 @@ BOOL WINAPI LinkWindow_UnregisterClass(void) FIXME("()\n"); return TRUE; } + +/************************************************************************* + * (SHELL32.526) + */ +BOOL WINAPI SHELL32_526(void) +{ + FIXME("()\n"); + return FALSE; +}

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/set Attribute.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: bb829372f11d0587a6ca594e607cec8e2eb4a24c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb829372f11d0587a6ca594e6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 5 21:22:35 2009 +1100 mshtml: Implement IHTMLStyle get/set Attribute. --- dlls/mshtml/htmlstyle.c | 69 ++++++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 36 ++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index fa4ad51..3453f7b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2048,18 +2048,75 @@ static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttribut VARIANT AttributeValue, LONG lFlags) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s v%d %08x)\n", This, debugstr_w(strAttributeName), - V_VT(&AttributeValue), lFlags); - return E_NOTIMPL; + HRESULT hres; + DISPID dispid; + + TRACE("(%p)->(%s v%d %08x)\n", This, debugstr_w(strAttributeName), + V_VT(&AttributeValue), lFlags); + + if(!strAttributeName) + return E_INVALIDARG; + + if(lFlags == 1) + FIXME("Parameter lFlags ignored\n"); + + hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, (LPOLESTR*)&strAttributeName, 1, + LOCALE_USER_DEFAULT, &dispid); + if(hres == S_OK) + { + VARIANT ret; + DISPID dispidNamed = DISPID_PROPERTYPUT; + DISPPARAMS params; + + params.cArgs = 1; + params.rgvarg = &AttributeValue; + params.cNamedArgs = 1; + params.rgdispidNamedArgs = &dispidNamed; + + hres = HTMLStyle_Invoke(iface, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + } + else + { + FIXME("Custom attributes not supported.\n"); + } + + TRACE("ret: %08x\n", hres); + + return hres; } static HRESULT WINAPI HTMLStyle_getAttribute(IHTMLStyle *iface, BSTR strAttributeName, LONG lFlags, VARIANT *AttributeValue) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), - lFlags, AttributeValue); - return E_NOTIMPL; + HRESULT hres; + DISPID dispid; + + TRACE("(%p)->(%s v%p %08x)\n", This, debugstr_w(strAttributeName), + AttributeValue, lFlags); + + if(!AttributeValue || !strAttributeName) + return E_INVALIDARG; + + if(lFlags == 1) + FIXME("Parameter lFlags ignored\n"); + + hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, (LPOLESTR*)&strAttributeName, 1, + LOCALE_USER_DEFAULT, &dispid); + if(hres == S_OK) + { + DISPPARAMS params = {NULL, NULL, 0, 0 }; + + hres = HTMLStyle_Invoke(iface, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYGET, &params, AttributeValue, NULL, NULL); + } + else + { + FIXME("Custom attributes not supported.\n"); + } + + return hres; } static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index be54998..46136c1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2750,6 +2750,42 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_overflow failed: %08x\n", hres); SysFreeString(sOverflowDefault); + /* Attribute Tests*/ + hres = IHTMLStyle_getAttribute(style, NULL, 1, &v); + ok(hres == E_INVALIDARG, "getAttribute failed: %08x\n", hres); + + str = a2bstr("position"); + hres = IHTMLStyle_getAttribute(style, str, 1, NULL); + ok(hres == E_INVALIDARG, "getAttribute failed: %08x\n", hres); + + hres = IHTMLStyle_getAttribute(style, str, 1, &v); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); + VariantClear(&v); + + hres = IHTMLStyle_setAttribute(style, NULL, v, 1); + ok(hres == E_INVALIDARG, "getAttribute failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("absolute"); + hres = IHTMLStyle_setAttribute(style, str, v, 1); + ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_getAttribute(style, str, 1, &v); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "absolute"), "str=%s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = NULL; + hres = IHTMLStyle_setAttribute(style, str, v, 1); + ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + VariantClear(&v); + + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Juan Lang : cryptui: Fix crash with native riched20.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: e50e78f1cbcb10358c49aa044d63ae9561327482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50e78f1cbcb10358c49aa044… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 8 21:06:34 2009 -0800 cryptui: Fix crash with native riched20. --- dlls/cryptui/main.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 1abeff4..a5fb580 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1666,6 +1666,7 @@ static void add_icon_to_control(HWND hwnd, int id) HBITMAP bitmap = NULL; RECT rect; STGMEDIUM stgm; + LPOLECLIENTSITE clientSite = NULL; REOBJECT reObject; TRACE("(%p, %d)\n", hwnd, id); @@ -1695,6 +1696,9 @@ static void add_icon_to_control(HWND hwnd, int id) (void**)&dataObject); if (FAILED(hr)) goto end; + hr = IRichEditOle_GetClientSite(richEditOle, &clientSite); + if (FAILED(hr)) + goto end; bitmap = LoadImageW(hInstance, MAKEINTRESOURCEW(id), IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_LOADTRANSPARENT); if (!bitmap) @@ -1714,7 +1718,7 @@ static void add_icon_to_control(HWND hwnd, int id) reObject.clsid = clsid; reObject.poleobj = object; reObject.pstg = NULL; - reObject.polesite = NULL; + reObject.polesite = clientSite; reObject.sizel.cx = reObject.sizel.cy = 0; reObject.dvaspect = DVASPECT_CONTENT; reObject.dwFlags = 0; @@ -1723,6 +1727,8 @@ static void add_icon_to_control(HWND hwnd, int id) IRichEditOle_InsertObject(richEditOle, &reObject); end: + if (clientSite) + IOleClientSite_Release(clientSite); if (dataObject) IDataObject_Release(dataObject); if (oleCache)

1 0

Juan Lang : cryptui: Call CryptUIWizImport from the certificate manager dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 732fce7c3c3c85ba0c2ab3340c9d749902c02d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732fce7c3c3c85ba0c2ab3340… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 8 09:45:41 2009 -0800 cryptui: Call CryptUIWizImport from the certificate manager dialog. --- dlls/cryptui/main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f7c8650..1abeff4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1090,6 +1090,11 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case ((CBN_SELCHANGE << 16) | IDC_MGR_PURPOSE_SELECTION): cert_mgr_clear_cert_selection(hwnd); break; + case IDC_MGR_IMPORT: + if (CryptUIWizImport(0, hwnd, NULL, NULL, + cert_mgr_current_store(hwnd))) + refresh_store_certs(hwnd); + break; case IDC_MGR_ADVANCED: if (DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CERT_MGR_ADVANCED), hwnd, cert_mgr_advanced_dlg_proc) == IDOK)

1 0

Juan Lang : cryptui: Set appropriate radio button in CryptUIWizImport if the destination store is specified .
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: ed5d0d8894ff6285ef722ad8800144ced24f8ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5d0d8894ff6285ef722ad88… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 8 09:43:47 2009 -0800 cryptui: Set appropriate radio button in CryptUIWizImport if the destination store is specified. --- dlls/cryptui/main.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 86d3f17..f7c8650 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5001,11 +5001,29 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ImportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); - SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_AUTO_STORE), BM_CLICK, 0, 0); - if (data->dwFlags & CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE) + if (!data->hDestCertStore) + { + SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_AUTO_STORE), BM_CLICK, + 0, 0); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_STORE), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_BROWSE_STORE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_SPECIFY_STORE), FALSE); - EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_STORE), FALSE); - EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_BROWSE_STORE), FALSE); + } + else + { + WCHAR storeTitle[MAX_STRING_LEN]; + + SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_SPECIFY_STORE), BM_CLICK, + 0, 0); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_STORE), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_BROWSE_STORE), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_SPECIFY_STORE), + !(data->dwFlags & CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE)); + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, + storeTitle, sizeof(storeTitle) / sizeof(storeTitle[0])); + SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_STORE), WM_SETTEXT, + 0, (LPARAM)storeTitle); + } break; } case WM_NOTIFY:

1 0

Juan Lang : cryptui: Implement removing certificates from certificate manager dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 9d6d8570fc0b1464d3c5a25649a81875a1428c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6d8570fc0b1464d3c5a2564… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 8 09:43:22 2009 -0800 cryptui: Implement removing certificates from certificate manager dialog. --- dlls/cryptui/cryptui_En.rc | 13 ++++ dlls/cryptui/cryptuires.h | 13 ++++ dlls/cryptui/main.c | 146 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 149 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d6d8570fc0b1464d3c5a…

1 0

Juan Lang : cryptui: Show usages for selected cert in certificate manager dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: a6e21329eeecc4ddc408d4c3cf82820dcfecc092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e21329eeecc4ddc408d4c3c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 17:46:17 2009 -0800 cryptui: Show usages for selected cert in certificate manager dialog. --- dlls/cryptui/cryptui_En.rc | 2 + dlls/cryptui/cryptuires.h | 2 + dlls/cryptui/main.c | 132 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 132 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 5d2f89e..a0a646e 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -100,6 +100,8 @@ STRINGTABLE DISCARDABLE IDS_ISSUER_COLUMN "Issued By" IDS_EXPIRATION_COLUMN "Expiration Date" IDS_FRIENDLY_NAME_COLUMN "Friendly Name" + IDS_ALLOWED_PURPOSE_ALL "<All>" + IDS_ALLOWED_PURPOSE_NONE "<None>" 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 b582e26..95c61a8 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -97,6 +97,8 @@ #define IDS_ISSUER_COLUMN 1077 #define IDS_EXPIRATION_COLUMN 1078 #define IDS_FRIENDLY_NAME_COLUMN 1079 +#define IDS_ALLOWED_PURPOSE_ALL 1080 +#define IDS_ALLOWED_PURPOSE_NONE 1081 #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 6955f0c..4e13a4f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -779,27 +779,149 @@ static void cert_mgr_clear_cert_selection(HWND hwnd) refresh_store_certs(hwnd); } -static void show_selected_cert(HWND hwnd, int index) +static PCCERT_CONTEXT cert_mgr_index_to_cert(HWND hwnd, int index) { + PCCERT_CONTEXT cert = NULL; LVITEMW item; - HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); item.mask = LVIF_PARAM; item.iItem = index; item.iSubItem = 0; - if (SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item)) + if (SendMessageW(GetDlgItem(hwnd, IDC_MGR_CERTS), LVM_GETITEMW, 0, + (LPARAM)&item)) + cert = (PCCERT_CONTEXT)item.lParam; + return cert; +} + +static void show_selected_cert(HWND hwnd, int index) +{ + PCCERT_CONTEXT cert = cert_mgr_index_to_cert(hwnd, index); + + if (cert) { CRYPTUI_VIEWCERTIFICATE_STRUCTW viewInfo; memset(&viewInfo, 0, sizeof(viewInfo)); viewInfo.dwSize = sizeof(viewInfo); viewInfo.hwndParent = hwnd; - viewInfo.pCertContext = (PCCERT_CONTEXT)item.lParam; + viewInfo.pCertContext = cert; /* FIXME: this should be modal */ CryptUIDlgViewCertificateW(&viewInfo, NULL); } } +static void cert_mgr_show_cert_usages(HWND hwnd, int index) +{ + HWND text = GetDlgItem(hwnd, IDC_MGR_PURPOSES); + PCCERT_CONTEXT cert = cert_mgr_index_to_cert(hwnd, index); + PCERT_ENHKEY_USAGE usage; + DWORD size; + + /* Get enhanced key usage. Have to check for a property and an extension + * separately, because CertGetEnhancedKeyUsage will succeed and return an + * empty usage if neither is set. Unfortunately an empty usage implies + * no usage is allowed, so we have to distinguish between the two cases. + */ + if (CertGetEnhancedKeyUsage(cert, CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG, + NULL, &size)) + { + usage = HeapAlloc(GetProcessHeap(), 0, size); + if (!CertGetEnhancedKeyUsage(cert, + CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG, usage, &size)) + { + HeapFree(GetProcessHeap(), 0, usage); + usage = NULL; + } + } + else if (CertGetEnhancedKeyUsage(cert, CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG, + NULL, &size)) + { + usage = HeapAlloc(GetProcessHeap(), 0, size); + if (!CertGetEnhancedKeyUsage(cert, + CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG, usage, &size)) + { + HeapFree(GetProcessHeap(), 0, usage); + usage = NULL; + } + } + else + usage = NULL; + if (usage) + { + if (usage->cUsageIdentifier) + { + static const WCHAR commaSpace[] = { ',',' ',0 }; + DWORD i, len = 1; + LPWSTR str, ptr; + + 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) + len += strlenW(info->pwszName); + else + len += strlen(usage->rgpszUsageIdentifier[i]); + if (i < usage->cUsageIdentifier - 1) + len += strlenW(commaSpace); + } + str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (str) + { + for (i = 0, ptr = str; 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) + { + strcpyW(ptr, info->pwszName); + ptr += strlenW(info->pwszName); + } + else + { + LPCSTR src = usage->rgpszUsageIdentifier[i]; + + for (; *src; ptr++, src++) + *ptr = *src; + *ptr = 0; + } + if (i < usage->cUsageIdentifier - 1) + { + strcpyW(ptr, commaSpace); + ptr += strlenW(commaSpace); + } + } + *ptr = 0; + SendMessageW(text, WM_SETTEXT, 0, (LPARAM)str); + HeapFree(GetProcessHeap(), 0, str); + } + HeapFree(GetProcessHeap(), 0, usage); + } + else + { + WCHAR buf[MAX_STRING_LEN]; + + LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_NONE, buf, + sizeof(buf) / sizeof(buf[0])); + SendMessageW(text, WM_SETTEXT, 0, (LPARAM)buf); + } + } + else + { + WCHAR buf[MAX_STRING_LEN]; + + LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_ALL, buf, + sizeof(buf) / sizeof(buf[0])); + SendMessageW(text, WM_SETTEXT, 0, (LPARAM)buf); + } +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -857,6 +979,8 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), numSelected > 0); EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), numSelected > 0); EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), numSelected == 1); + if (numSelected == 1) + cert_mgr_show_cert_usages(hwnd, nm->iItem); } break; }

1 0

Juan Lang : cryptui: Show selected certificate when requested in the certificate manager dialog .
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: a3f746b085ffd8ab08412d3000d123942c79e8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f746b085ffd8ab08412d300… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 17:45:58 2009 -0800 cryptui: Show selected certificate when requested in the certificate manager dialog. --- dlls/cryptui/main.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 00f87ca..6955f0c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -779,6 +779,27 @@ static void cert_mgr_clear_cert_selection(HWND hwnd) refresh_store_certs(hwnd); } +static void show_selected_cert(HWND hwnd, int index) +{ + LVITEMW item; + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + + item.mask = LVIF_PARAM; + item.iItem = index; + item.iSubItem = 0; + if (SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item)) + { + CRYPTUI_VIEWCERTIFICATE_STRUCTW viewInfo; + + memset(&viewInfo, 0, sizeof(viewInfo)); + viewInfo.dwSize = sizeof(viewInfo); + viewInfo.hwndParent = hwnd; + viewInfo.pCertContext = (PCCERT_CONTEXT)item.lParam; + /* FIXME: this should be modal */ + CryptUIDlgViewCertificateW(&viewInfo, NULL); + } +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -839,6 +860,9 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, } break; } + case NM_DBLCLK: + show_selected_cert(hwnd, ((NMITEMACTIVATE *)lp)->iItem); + break; } break; } @@ -877,6 +901,16 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, refresh_store_certs(hwnd); } break; + case IDC_MGR_VIEW: + { + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + int selection = SendMessageW(lv, LVM_GETNEXTITEM, -1, + LVNI_SELECTED); + + if (selection >= 0) + show_selected_cert(hwnd, selection); + break; + } case IDCANCEL: free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); close_stores(GetDlgItem(hwnd, IDC_MGR_STORES));

1 0