November 2008 - Wine-commits

Juan Lang : crypt32: Implement CryptFormatObject for szOID_CRL_DIST_POINTS.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 9fecf5575378a8edab50179d90a58bf479ddc239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fecf5575378a8edab50179d9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 14:18:55 2008 -0800 crypt32: Implement CryptFormatObject for szOID_CRL_DIST_POINTS. --- dlls/crypt32/crypt32_En.rc | 12 ++ dlls/crypt32/cryptres.h | 12 ++ dlls/crypt32/object.c | 345 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 361 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fecf5575378a8edab501…

1 0

Juan Lang : crypt32: Implement CryptFormatObject for SPC_FINANCIAL_CRITERIA_OBJID.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 305c96527680e79ac5841c39e232ab1b388500d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305c96527680e79ac5841c39e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 14:42:58 2008 -0800 crypt32: Implement CryptFormatObject for SPC_FINANCIAL_CRITERIA_OBJID. --- dlls/crypt32/crypt32_En.rc | 6 ++ dlls/crypt32/cryptres.h | 6 ++ dlls/crypt32/object.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index ceb0703..3e08476 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -211,4 +211,10 @@ STRINGTABLE DISCARDABLE IDS_REASON_SUPERCEDED "Superceded" IDS_REASON_CESSATION_OF_OPERATION "Operation Ceased" IDS_REASON_CERTIFICATE_HOLD "Certificate Hold" + IDS_FINANCIAL_CRITERIA "Financial Information=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Available" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Not Available" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Meets Criteria=" + IDS_YES "Yes" + IDS_NO "No" } diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index 0ac839f..894b3bd 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -201,5 +201,11 @@ #define IDS_REASON_SUPERCEDED 1234 #define IDS_REASON_CESSATION_OF_OPERATION 1235 #define IDS_REASON_CERTIFICATE_HOLD 1236 +#define IDS_FINANCIAL_CRITERIA 1237 +#define IDS_FINANCIAL_CRITERIA_AVAILABLE 1238 +#define IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE 1239 +#define IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA 1240 +#define IDS_YES 1241 +#define IDS_NO 1242 #endif /* ndef __WINE_CRYPTRES_H__ */ diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 87b5a20..19a3217 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -24,6 +24,7 @@ #include "wincrypt.h" #include "mssip.h" #include "winuser.h" +#include "wintrust.h" #include "crypt32_private.h" #include "cryptres.h" #include "wine/unicode.h" @@ -1768,6 +1769,111 @@ static BOOL WINAPI CRYPT_FormatEnhancedKeyUsage(DWORD dwCertEncodingType, return ret; } +static WCHAR financialCriteria[MAX_STRING_RESOURCE_LEN]; +static WCHAR available[MAX_STRING_RESOURCE_LEN]; +static WCHAR notAvailable[MAX_STRING_RESOURCE_LEN]; +static WCHAR meetsCriteria[MAX_STRING_RESOURCE_LEN]; +static WCHAR yes[MAX_STRING_RESOURCE_LEN]; +static WCHAR no[MAX_STRING_RESOURCE_LEN]; + +static BOOL WINAPI CRYPT_FormatSpcFinancialCriteria(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + SPC_FINANCIAL_CRITERIA criteria; + DWORD size = sizeof(criteria); + BOOL ret = FALSE; + + if (!cbEncoded) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, + SPC_FINANCIAL_CRITERIA_STRUCT, pbEncoded, cbEncoded, 0, NULL, &criteria, + &size))) + { + static BOOL stringsLoaded = FALSE; + DWORD bytesNeeded = sizeof(WCHAR); + LPCWSTR sep; + DWORD sepLen; + + if (!stringsLoaded) + { + LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA, financialCriteria, + sizeof(financialCriteria) / sizeof(financialCriteria[0])); + LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_AVAILABLE, available, + sizeof(available) / sizeof(available[0])); + LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE, + notAvailable, sizeof(notAvailable) / sizeof(notAvailable[0])); + LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA, + meetsCriteria, sizeof(meetsCriteria) / sizeof(meetsCriteria[0])); + LoadStringW(hInstance, IDS_YES, yes, sizeof(yes) / sizeof(yes[0])); + LoadStringW(hInstance, IDS_NO, no, sizeof(no) / sizeof(no[0])); + stringsLoaded = TRUE; + } + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + sep = crlf; + sepLen = strlenW(crlf) * sizeof(WCHAR); + } + else + { + sep = commaSpace; + sepLen = strlenW(commaSpace) * sizeof(WCHAR); + } + bytesNeeded += strlenW(financialCriteria) * sizeof(WCHAR); + if (criteria.fFinancialInfoAvailable) + { + bytesNeeded += strlenW(available) * sizeof(WCHAR); + bytesNeeded += sepLen; + bytesNeeded += strlenW(meetsCriteria) * sizeof(WCHAR); + if (criteria.fMeetsCriteria) + bytesNeeded += strlenW(yes) * sizeof(WCHAR); + else + bytesNeeded += strlenW(no) * sizeof(WCHAR); + } + else + bytesNeeded += strlenW(notAvailable) * sizeof(WCHAR); + if (!pbFormat) + *pcbFormat = bytesNeeded; + else if (*pcbFormat < bytesNeeded) + { + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + *pcbFormat = bytesNeeded; + strcpyW(str, financialCriteria); + str += strlenW(financialCriteria); + if (criteria.fFinancialInfoAvailable) + { + strcpyW(str, available); + str += strlenW(available); + strcpyW(str, sep); + str += sepLen / sizeof(WCHAR); + strcpyW(str, meetsCriteria); + str += strlenW(meetsCriteria); + if (criteria.fMeetsCriteria) + strcpyW(str, yes); + else + strcpyW(str, no); + } + else + { + strcpyW(str, notAvailable); + str += strlenW(notAvailable); + } + } + } + return ret; +} + typedef BOOL (WINAPI *CryptFormatObjectFunc)(DWORD, DWORD, DWORD, void *, LPCSTR, const BYTE *, DWORD, void *, DWORD *); @@ -1800,6 +1906,9 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, case LOWORD(X509_ENHANCED_KEY_USAGE): format = CRYPT_FormatEnhancedKeyUsage; break; + case LOWORD(SPC_FINANCIAL_CRITERIA_STRUCT): + format = CRYPT_FormatSpcFinancialCriteria; + break; } } else if (!strcmp(lpszStructType, szOID_BASIC_CONSTRAINTS2)) @@ -1812,6 +1921,8 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, format = CRYPT_FormatCRLDistPoints; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE)) format = CRYPT_FormatEnhancedKeyUsage; + else if (!strcmp(lpszStructType, SPC_FINANCIAL_CRITERIA_OBJID)) + format = CRYPT_FormatSpcFinancialCriteria; if (!format && !(formatStrType & CRYPT_FORMAT_STR_NO_HEX)) format = CRYPT_FormatHexString; return format;

1 0

Michael Stefaniuc : comctl32: Remove superfluous casts that crept in as well as some older ones.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: c46a88a3c9d45dc29245fc186da825aacc81e141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46a88a3c9d45dc29245fc186… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 7 00:56:07 2008 +0100 comctl32: Remove superfluous casts that crept in as well as some older ones. --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/header.c | 2 +- dlls/comctl32/tests/listview.c | 2 +- dlls/comctl32/tests/toolbar.c | 44 ++++++++++++++++++++-------------------- dlls/comctl32/tests/tooltips.c | 10 ++++---- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index a3a0fb1..b97a5e5 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -932,7 +932,7 @@ CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags, DeleteDC (hdcDst); } ReleaseDC (NULL, hdcScreen); - GlobalFree ((HGLOBAL)lpBitmapInfo); + GlobalFree (lpBitmapInfo); FreeResource (hglb); return hbm; diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ce1e1b4..172925f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4795,7 +4795,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) ITEMHDR *hdrItem; INT i; - hdpaSubItems = (HDPA)DPA_DeletePtr(infoPtr->hdpaItems, nItem); + hdpaSubItems = DPA_DeletePtr(infoPtr->hdpaItems, nItem); for (i = 0; i < DPA_GetPtrCount(hdpaSubItems); i++) { hdrItem = DPA_GetPtr(hdpaSubItems, i); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index dc61a75..b7341d4 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -952,7 +952,7 @@ static void test_hdm_sethotdivider(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); todo_wine { - retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, (LPARAM) 0X00050005); + retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, 0X00050005); expect(0, retVal); } retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, FALSE, 100); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 56d9bf0..4d8028a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -989,7 +989,7 @@ static void test_item_count(void) expect(3, r); /* [item0, item1] */ - r = SendMessage(hwnd, LVM_DELETEITEM, (WPARAM) 2, 0); + r = SendMessage(hwnd, LVM_DELETEITEM, 2, 0); expect(TRUE, r); r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index a0c061c..04eecfb 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -168,7 +168,7 @@ static void rebuild_toolbar(HWND *hToolbar) *hToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); ok(*hToolbar != NULL, "Toolbar creation problem\n"); - ok(SendMessage(*hToolbar, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0) == 0, "TB_BUTTONSTRUCTSIZE failed\n"); + ok(SendMessage(*hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0) == 0, "TB_BUTTONSTRUCTSIZE failed\n"); ok(SendMessage(*hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); ok(SendMessage(*hToolbar, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0)==1, "WM_SETFONT\n"); } @@ -958,42 +958,42 @@ static void test_sizes(void) rebuild_toolbar(&hToolbar); - ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, (WPARAM)0, (LPARAM) MAKELONG (32, 32) ) == 1, "TB_SETBITMAPSIZE failed\n"); - ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, (WPARAM)0, (LPARAM)MAKELONG(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons2[0]) == 1, "TB_ADDBUTTONS failed\n"); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[2]) == 1, "TB_ADDBUTTONS failed\n"); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[0]) == 1, "TB_ADDBUTTONS failed\n"); - SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0 ); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELPARAM(32, 32)) == 1, "TB_SETBITMAPSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons2[0]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[2]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[0]) == 1, "TB_ADDBUTTONS failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); check_sizes(); rebuild_toolbar(&hToolbar); SetWindowLong(hToolbar, GWL_STYLE, TBSTYLE_LIST | GetWindowLong(hToolbar, GWL_STYLE)); - ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, (WPARAM)0, (LPARAM) MAKELONG (32, 32) ) == 1, "TB_SETBITMAPSIZE failed\n"); - ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, (WPARAM)0, (LPARAM)MAKELONG(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons2[0]) == 1, "TB_ADDBUTTONS failed\n"); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[2]) == 1, "TB_ADDBUTTONS failed\n"); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); - SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0 ); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELPARAM(32, 32)) == 1, "TB_SETBITMAPSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons2[0]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[2]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); check_sizes_todo(0xff); rebuild_toolbar(&hToolbar); SetWindowLong(hToolbar, GWL_STYLE, TBSTYLE_LIST | GetWindowLong(hToolbar, GWL_STYLE)); - ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, (WPARAM)0, (LPARAM) MAKELONG (32, 32) ) == 1, "TB_SETBITMAPSIZE failed\n"); - ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, (WPARAM)0, (LPARAM)MAKELONG(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); - SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0 ); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELPARAM(32, 32)) == 1, "TB_SETBITMAPSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(100, 100)) == 1, "TB_SETBUTTONSIZE failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); check_sizes(); rebuild_toolbar(&hToolbar); SetWindowLong(hToolbar, GWL_STYLE, TBSTYLE_WRAPABLE | GetWindowLong(hToolbar, GWL_STYLE)); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); - ok(SendMessageA(hToolbar, TB_ADDBUTTONS, (WPARAM)1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); + ok(SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]) == 1, "TB_ADDBUTTONS failed\n"); tbinfo.cx = 672; tbinfo.cbSize = sizeof(TBBUTTONINFO); tbinfo.dwMask = TBIF_SIZE | TBIF_BYINDEX; - ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, (WPARAM)0, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); - ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, (WPARAM)1, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); - SendMessageA(hToolbar, TB_AUTOSIZE, (WPARAM)0, (LPARAM)0); + ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, 0, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONINFO, 1, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFO failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0); check_sizes(); DestroyWindow(hToolbar); diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 1ce8ae0..b3f28fd 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -205,7 +205,7 @@ static void test_customdraw(void) { toolInfo.hwnd = parent; toolInfo.hinst = GetModuleHandleA(NULL); toolInfo.uFlags = TTF_SUBCLASS; - toolInfo.uId = (UINT_PTR)0x1234ABCD; + toolInfo.uId = 0x1234ABCD; toolInfo.lpszText = (LPSTR)"This is a test tooltip"; toolInfo.lParam = 0xdeadbeef; GetClientRect (parent, &toolInfo.rect); @@ -251,7 +251,7 @@ static void test_gettext(void) toolinfoA.hwnd = NULL; toolinfoA.hinst = GetModuleHandleA(NULL); toolinfoA.uFlags = 0; - toolinfoA.uId = (UINT_PTR)0x1234ABCD; + toolinfoA.uId = 0x1234ABCD; toolinfoA.lpszText = NULL; toolinfoA.lParam = 0xdeadbeef; GetClientRect(hwnd, &toolinfoA.rect); @@ -260,7 +260,7 @@ static void test_gettext(void) if (r) { toolinfoA.hwnd = NULL; - toolinfoA.uId = (UINT_PTR)0x1234ABCD; + toolinfoA.uId = 0x1234ABCD; toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); @@ -284,7 +284,7 @@ static void test_gettext(void) toolinfoW.hwnd = NULL; toolinfoW.hinst = GetModuleHandleA(NULL); toolinfoW.uFlags = 0; - toolinfoW.uId = (UINT_PTR)0x1234ABCD; + toolinfoW.uId = 0x1234ABCD; toolinfoW.lpszText = NULL; toolinfoW.lParam = 0xdeadbeef; GetClientRect(hwnd, &toolinfoW.rect); @@ -292,7 +292,7 @@ static void test_gettext(void) ok(r, "Adding the tool to the tooltip failed\n"); toolinfoW.hwnd = NULL; - toolinfoW.uId = (UINT_PTR)0x1234ABCD; + toolinfoW.uId = 0x1234ABCD; toolinfoW.lpszText = bufW; SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n");

1 0

Michael Stefaniuc : crypt32: Fix the aligning up to a DWORD_PTR boundary.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: c48c5c8577774d45a94b65a5910f7f5f0d5f5f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48c5c8577774d45a94b65a59… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 7 01:01:39 2008 +0100 crypt32: Fix the aligning up to a DWORD_PTR boundary. --- dlls/crypt32/crypt32_private.h | 9 +++++++++ dlls/crypt32/decode.c | 4 +--- dlls/crypt32/msg.c | 26 ++++++++------------------ 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 81dd49e..119e30e 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -376,4 +376,13 @@ void ContextList_Empty(struct ContextList *list); void ContextList_Free(struct ContextList *list); +/** + * Utilities. + */ + +/* Align up to a DWORD_PTR boundary + */ +#define ALIGN_DWORD_PTR(x) (((x) + sizeof(DWORD_PTR) - 1) & ~(sizeof(DWORD_PTR) - 1)) +#define POINTER_ALIGN_DWORD_PTR(p) ((LPVOID)ALIGN_DWORD_PTR((DWORD_PTR)(p))) + #endif diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 4654008..6cb5047 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -362,9 +362,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], if (ret) { /* Account for alignment padding */ - if (items[i].size % sizeof(DWORD_PTR)) - items[i].size += sizeof(DWORD_PTR) - - items[i].size % sizeof(DWORD_PTR); + items[i].size = ALIGN_DWORD_PTR(items[i].size); TRACE("item %d size: %d\n", i, items[i].size); if (nextData && items[i].hasPointer && items[i].size > items[i].minSize) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0d615cc..ca94a2e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1970,8 +1970,7 @@ static inline void CRYPT_CopyAttributes(CRYPT_ATTRIBUTES *out, { DWORD i; - if ((*nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) - *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD_PTR); + *nextData = POINTER_ALIGN_DWORD_PTR(*nextData); out->rgAttr = (CRYPT_ATTRIBUTE *)*nextData; *nextData += in->cAttr * sizeof(CRYPT_ATTRIBUTE); for (i = 0; i < in->cAttr; i++) @@ -1987,8 +1986,7 @@ static inline void CRYPT_CopyAttributes(CRYPT_ATTRIBUTES *out, DWORD j; out->rgAttr[i].cValue = in->rgAttr[i].cValue; - if ((*nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) - *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD_PTR); + *nextData = POINTER_ALIGN_DWORD_PTR(*nextData); out->rgAttr[i].rgValue = (PCRYPT_DATA_BLOB)*nextData; *nextData += in->rgAttr[i].cValue * sizeof(CRYPT_DATA_BLOB); for (j = 0; j < in->rgAttr[i].cValue; j++) @@ -2008,15 +2006,13 @@ static DWORD CRYPT_SizeOfAttributes(const CRYPT_ATTRIBUTES *attr) if (attr->rgAttr[i].pszObjId) size += strlen(attr->rgAttr[i].pszObjId) + 1; /* align pointer */ - if (size % sizeof(DWORD_PTR)) - size += size % sizeof(DWORD_PTR); + size = ALIGN_DWORD_PTR(size); size += attr->rgAttr[i].cValue * sizeof(CRYPT_DATA_BLOB); for (j = 0; j < attr->rgAttr[i].cValue; j++) size += attr->rgAttr[i].rgValue[j].cbData; } /* align pointer again to be conservative */ - if (size % sizeof(DWORD_PTR)) - size += size % sizeof(DWORD_PTR); + size = ALIGN_DWORD_PTR(size); return size; } @@ -2094,8 +2090,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, size += in->HashEncryptionAlgorithm.Parameters.cbData; size += in->EncryptedHash.cbData; /* align pointer */ - if (size % sizeof(DWORD_PTR)) - size += size % sizeof(DWORD_PTR); + size = ALIGN_DWORD_PTR(size); size += CRYPT_SizeOfAttributes(&in->AuthAttrs); size += CRYPT_SizeOfAttributes(&in->UnauthAttrs); if (!pvData) @@ -2133,9 +2128,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, CRYPT_CopyAlgorithmId(&out->HashEncryptionAlgorithm, &in->HashEncryptionAlgorithm, &nextData); CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); - /* align pointer */ - if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) - nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); + nextData = POINTER_ALIGN_DWORD_PTR(nextData); CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); } @@ -2167,8 +2160,7 @@ static BOOL CRYPT_CopyCMSSignerInfo(void *pvData, DWORD *pcbData, size += in->HashEncryptionAlgorithm.Parameters.cbData; size += in->EncryptedHash.cbData; /* align pointer */ - if (size % sizeof(DWORD_PTR)) - size += size % sizeof(DWORD_PTR); + size = ALIGN_DWORD_PTR(size); size += CRYPT_SizeOfAttributes(&in->AuthAttrs); size += CRYPT_SizeOfAttributes(&in->UnauthAttrs); if (!pvData) @@ -2203,9 +2195,7 @@ static BOOL CRYPT_CopyCMSSignerInfo(void *pvData, DWORD *pcbData, CRYPT_CopyAlgorithmId(&out->HashEncryptionAlgorithm, &in->HashEncryptionAlgorithm, &nextData); CRYPT_CopyBlob(&out->EncryptedHash, &in->EncryptedHash, &nextData); - /* align pointer */ - if ((nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) - nextData += (nextData - (LPBYTE)0) % sizeof(DWORD_PTR); + nextData = POINTER_ALIGN_DWORD_PTR(nextData); CRYPT_CopyAttributes(&out->AuthAttrs, &in->AuthAttrs, &nextData); CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); ret = TRUE;

1 0

Reece Dunn : comctl32: Don' t draw the theme background of the group box over it's content area.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 9368972866de77ceea06c93e45ce9dbf8e15180d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9368972866de77ceea06c93e4… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Nov 7 00:11:52 2008 +0000 comctl32: Don't draw the theme background of the group box over it's content area. Hi, Some applications (e.g. Cepstral SwiftTalker) have dialogs that contain controls that are ordered before the group box that contains them. The current rendering of themed group boxes will draw it's background over the content area, hiding any controls that have already been drawn. XP with the default and other custom themes correctly shows controls beneath the group box. This patch excludes the group box content area from being drawn to, so that any controls that have already been drawn do not get overridden. - Reece >From 889e477bcb4561565b8caaf41c88c5fe7d83b8d2 Mon Sep 17 00:00:00 2001 From: Reece Dunn <msclrhd(a)gmail.com> Date: Fri, 7 Nov 2008 00:11:52 +0000 Subject: [PATCH] comctl32: don't draw the theme background of the group box over it's content area. --- dlls/comctl32/theme_button.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index a6e80d1..7d389c7 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -181,7 +181,7 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN { static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; - RECT bgRect, textRect; + RECT bgRect, textRect, contentRect; HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; int state = states[ drawState ]; @@ -198,9 +198,12 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN textRect.left += 10; textRect.bottom = textRect.top + textExtent.cy; textRect.right = textRect.left + textExtent.cx + 4; + + ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom); } - ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom); + GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect); + ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) DrawThemeParentBackground(hwnd, hDC, NULL);

1 0

Paul Vriens : user32/tests: Fix some test failures on Win9x.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: b8d468637e616137940e209524094f030f42888c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d468637e616137940e20952… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 7 08:32:21 2008 +0100 user32/tests: Fix some test failures on Win9x. --- dlls/user32/tests/cursoricon.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index d488ef9..36f5e98 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -737,7 +737,8 @@ static void test_LoadImageFile(const unsigned char * image_data, ok(handle == NULL, "LoadImage(%s) as IMAGE_CURSOR succeeded incorrectly.\n", ext); error = GetLastError(); ok(error == 0 || - broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */ + broken(error == 0xdeadbeef) || /* Win9x */ + broken(error == ERROR_BAD_PATHNAME), /* Win98, WinMe */ "Last error: %u\n", error); if (handle != NULL) DestroyCursor(handle); @@ -747,7 +748,8 @@ static void test_LoadImageFile(const unsigned char * image_data, ok(handle == NULL, "LoadImage(%s) as IMAGE_ICON succeeded incorrectly.\n", ext); error = GetLastError(); ok(error == 0 || - broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */ + broken(error == 0xdeadbeef) || /* Win9x */ + broken(error == ERROR_BAD_PATHNAME), /* Win98, WinMe */ "Last error: %u\n", error); if (handle != NULL) DestroyIcon(handle); @@ -822,7 +824,8 @@ static void test_LoadImage(void) ok(handle != NULL, "LoadImage() failed.\n"); error = GetLastError(); ok(error == 0 || - broken(error == ERROR_BAD_PATHNAME), /* Win9x, WinMe */ + broken(error == 0xdeadbeef) || /* Win9x */ + broken(error == ERROR_BAD_PATHNAME), /* Win98, WinMe */ "Last error: %u\n", error); /* Test the icon information. */

1 0

Juan Lang : crypt32: Add tests for CryptFormatObject.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: 14cb694ff8b3423e544ed1226b8b136c04c47523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cb694ff8b3423e544ed1226… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 30 14:39:36 2008 -0700 crypt32: Add tests for CryptFormatObject. --- dlls/crypt32/tests/main.c | 115 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 3d54b3b..06276ba 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -366,6 +366,120 @@ static void test_CryptInstallOssGlobal(void) } } +static BOOL (WINAPI *pCryptFormatObject)(DWORD dwEncoding, DWORD dwFormatType, + DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, + const BYTE *pbEncoded, DWORD dwEncoded, void *pbFormat, DWORD *pcbFormat); + +static const BYTE encodedInt[] = { 0x02,0x01,0x01 }; +static const WCHAR encodedIntStr[] = { '0','2',' ','0','1',' ','0','1',0 }; +static const BYTE encodedBigInt[] = { 0x02,0x1f,0x01,0x02,0x03,0x04,0x05,0x06, + 0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15, + 0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f }; +static const WCHAR encodedBigIntStr[] = { '0','2',' ','1','f',' ','0','1',' ', + '0','2',' ','0','3',' ','0','4',' ','0','5',' ','0','6',' ','0','7',' ','0', + '8',' ','0','9',' ','0','a',' ','0','b',' ','0','c',' ','0','d',' ','0','e', + ' ','0','f',' ','1','0',' ','1','1',' ','1','2',' ','1','3',' ','1','4',' ', + '1','5',' ','1','6',' ','1','7',' ','1','8',' ','1','9',' ','1','a',' ','1', + 'b',' ','1','c',' ','1','d',' ','1','e',' ','1','f',0 }; + +static void test_format_object(void) +{ + BOOL ret; + DWORD size; + LPWSTR str; + + pCryptFormatObject = (void *)GetProcAddress(hCrypt, "CryptFormatObject"); + if (!pCryptFormatObject) + { + skip("No CryptFormatObject\n"); + return; + } + /* Crash */ + if (0) + { + ret = pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); + } + /* When called with any but the default encoding, it fails to find a + * formatting function. + */ + SetLastError(0xdeadbeef); + ret = pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + /* When called with the default encoding type for any undefined struct type + * (including none), it succeeds: the default encoding is a hex string + * encoding. + */ + SetLastError(0xdeadbeef); + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, + NULL, &size); + todo_wine + ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); + if (ret) + { + ok(size == sizeof(WCHAR), "unexpected size %d\n", size); + str = HeapAlloc(GetProcessHeap(), 0, size); + SetLastError(0xdeadbeef); + size = 0; + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, + str, &size); + ok(!ret && GetLastError() == ERROR_MORE_DATA, + "expected ERROR_MORE_DATA, got %d\n", GetLastError()); + size = sizeof(WCHAR); + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, + str, &size); + ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); + ok(!str[0], "expected empty string\n"); + HeapFree(GetProcessHeap(), 0, str); + } + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, + sizeof(encodedInt), NULL, &size); + todo_wine + ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); + if (ret) + { + str = HeapAlloc(GetProcessHeap(), 0, size); + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, + encodedInt, sizeof(encodedInt), str, &size); + ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); + ok(!lstrcmpW(str, encodedIntStr), "unexpected format string\n"); + HeapFree(GetProcessHeap(), 0, str); + } + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, + encodedBigInt, sizeof(encodedBigInt), NULL, &size); + todo_wine + ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); + if (ret) + { + str = HeapAlloc(GetProcessHeap(), 0, size); + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, + encodedBigInt, sizeof(encodedBigInt), str, &size); + ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); + ok(!lstrcmpW(str, encodedBigIntStr), "unexpected format string\n"); + HeapFree(GetProcessHeap(), 0, str); + } + /* When called with the default encoding type for any undefined struct + * type but CRYPT_FORMAT_STR_NO_HEX specified, it fails to find a + * formatting function. + */ + SetLastError(0xdeadbeef); + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, + NULL, NULL, NULL, 0, NULL, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + /* When called to format an AUTHORITY_KEY_ID2_INFO, it fails when no + * data are given. + */ + SetLastError(0xdeadbeef); + ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, + szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %d\n", GetLastError()); +} + START_TEST(main) { hCrypt = GetModuleHandleA("crypt32.dll"); @@ -379,4 +493,5 @@ START_TEST(main) test_readTrustedPublisherDWORD(); test_getDefaultCryptProv(); test_CryptInstallOssGlobal(); + test_format_object(); }

1 0

Juan Lang : crypt32: Add base implementation of CryptFormatObject.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: ba7705ea950a61402b6d76a307a1f6d12acdb9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7705ea950a61402b6d76a30… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 31 09:32:31 2008 -0700 crypt32: Add base implementation of CryptFormatObject. --- dlls/crypt32/main.c | 10 ------ dlls/crypt32/object.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/main.c | 4 -- 3 files changed, 80 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 922dd19..47ce23e 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -243,13 +243,3 @@ ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x) FIXME("(%08x): stub\n", x); return NULL; } - -BOOL WINAPI CryptFormatObject(DWORD dwCertEncodingType, DWORD dwFormatType, - DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, - const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, DWORD *pcbFormat) -{ - FIXME("(%08x, %d, %d, %p, %s, %p, %d, %p, %p): stub\n", - dwCertEncodingType, dwFormatType, dwFormatStrType, pFormatStruct, - debugstr_a(lpszStructType), pbEncoded, cbEncoded, pbFormat, pcbFormat); - return FALSE; -} diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 05a6c5f..e9590a8 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -23,6 +23,7 @@ #include "wincrypt.h" #include "mssip.h" #include "crypt32_private.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -548,3 +549,82 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, TRACE("returning %d\n", ret); return ret; } + +static BOOL WINAPI CRYPT_FormatHexString(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + BOOL ret; + DWORD bytesNeeded; + + if (cbEncoded) + bytesNeeded = (cbEncoded * 3) * sizeof(WCHAR); + else + bytesNeeded = sizeof(WCHAR); + if (!pbFormat) + { + *pcbFormat = bytesNeeded; + ret = TRUE; + } + else if (*pcbFormat < bytesNeeded) + { + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + static const WCHAR fmt[] = { '%','0','2','x',' ',0 }; + static const WCHAR endFmt[] = { '%','0','2','x',0 }; + DWORD i; + LPWSTR ptr = pbFormat; + + *pcbFormat = bytesNeeded; + if (cbEncoded) + { + for (i = 0; i < cbEncoded; i++) + { + if (i < cbEncoded - 1) + ptr += sprintfW(ptr, fmt, pbEncoded[i]); + else + ptr += sprintfW(ptr, endFmt, pbEncoded[i]); + } + } + else + *ptr = 0; + ret = TRUE; + } + return ret; +} + +typedef BOOL (WINAPI *CryptFormatObjectFunc)(DWORD, DWORD, DWORD, void *, + LPCSTR, const BYTE *, DWORD, void *, DWORD *); + +BOOL WINAPI CryptFormatObject(DWORD dwCertEncodingType, DWORD dwFormatType, + DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, + const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, DWORD *pcbFormat) +{ + static HCRYPTOIDFUNCSET set = NULL; + CryptFormatObjectFunc format = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; + BOOL ret = FALSE; + + TRACE("(%08x, %d, %08x, %p, %s, %p, %d, %p, %p)\n", dwCertEncodingType, + dwFormatType, dwFormatStrType, pFormatStruct, debugstr_a(lpszStructType), + pbEncoded, cbEncoded, pbFormat, pcbFormat); + + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_FORMAT_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&format, &hFunc); + if (!format && !(dwFormatStrType & CRYPT_FORMAT_STR_NO_HEX)) + format = CRYPT_FormatHexString; + if (format) + ret = format(dwCertEncodingType, dwFormatType, dwFormatStrType, + pFormatStruct, lpszStructType, pbEncoded, cbEncoded, pbFormat, + pcbFormat); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); + return ret; +} diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 06276ba..fa50327 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -414,7 +414,6 @@ static void test_format_object(void) SetLastError(0xdeadbeef); ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, NULL, &size); - todo_wine ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); if (ret) { @@ -435,7 +434,6 @@ static void test_format_object(void) } ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, sizeof(encodedInt), NULL, &size); - todo_wine ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); if (ret) { @@ -448,7 +446,6 @@ static void test_format_object(void) } ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedBigInt, sizeof(encodedBigInt), NULL, &size); - todo_wine ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); if (ret) { @@ -466,7 +463,6 @@ static void test_format_object(void) SetLastError(0xdeadbeef); ret = pCryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, NULL, NULL, NULL, 0, NULL, &size); - todo_wine ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* When called to format an AUTHORITY_KEY_ID2_INFO, it fails when no

1 0

Juan Lang : crypt32: Make a global copy of crypt32's HINSTANCE.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: ab81dc123eb64f71de319548cf8fc5ee91971000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab81dc123eb64f71de319548c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 31 09:33:58 2008 -0700 crypt32: Make a global copy of crypt32's HINSTANCE. --- dlls/crypt32/crypt32_private.h | 4 +++- dlls/crypt32/main.c | 8 +++++--- dlls/crypt32/oid.c | 15 ++++++++------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 46bc8c5..81dd49e 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -123,7 +123,9 @@ BOOL CRYPT_AsnDecodePKCSDigestedData(const BYTE *pbEncoded, DWORD cbEncoded, */ HCRYPTPROV CRYPT_GetDefaultProvider(void); -void crypt_oid_init(HINSTANCE hinst); +HINSTANCE hInstance; + +void crypt_oid_init(void); void crypt_oid_free(void); void crypt_sip_free(void); void root_store_free(void); diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 47ce23e..38f7560 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -33,14 +33,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static HCRYPTPROV hDefProv; +HINSTANCE hInstance; -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved) +BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) { switch (fdwReason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstance); - crypt_oid_init(hInstance); + hInstance = hInst; + DisableThreadLibraryCalls(hInst); + crypt_oid_init(); break; case DLL_PROCESS_DETACH: crypt_oid_free(); diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 69ea7a5..b4aae66 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -37,13 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static const WCHAR DllW[] = { 'D','l','l',0 }; -static void init_oid_info(HINSTANCE hinst); +static void init_oid_info(void); static void free_function_sets(void); static void free_oid_info(void); -void crypt_oid_init(HINSTANCE hinst) +void crypt_oid_init(void) { - init_oid_info(hinst); + init_oid_info(); } void crypt_oid_free(void) @@ -993,7 +993,7 @@ BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType, return ret; } -static void oid_init_localizednames(HINSTANCE hInstance) +static void oid_init_localizednames(void) { unsigned int i; @@ -1367,11 +1367,11 @@ struct OIDInfo { struct list entry; }; -static void init_oid_info(HINSTANCE hinst) +static void init_oid_info(void) { DWORD i; - oid_init_localizednames(hinst); + oid_init_localizednames(); for (i = 0; i < sizeof(oidInfoConstructors) / sizeof(oidInfoConstructors[0]); i++) { @@ -1402,7 +1402,8 @@ static void init_oid_info(HINSTANCE hinst) else { LPCWSTR stringresource; - int len = LoadStringW(hinst, (UINT_PTR)oidInfoConstructors[i].pwszName, + int len = LoadStringW(hInstance, + (UINT_PTR)oidInfoConstructors[i].pwszName, (LPWSTR)&stringresource, 0); if (len)

1 0

Juan Lang : crypt32: Implement CryptFormatObject for szOID_ENHANCED_KEY_USAGE.
by Alexandre Julliard 07 Nov '08

07 Nov '08

Module: wine Branch: master Commit: b5f6c349773137b41ca7b8a698f74c007252ef89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f6c349773137b41ca7b8a69… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 13:48:34 2008 -0800 crypt32: Implement CryptFormatObject for szOID_ENHANCED_KEY_USAGE. --- dlls/crypt32/crypt32_En.rc | 1 + dlls/crypt32/cryptres.h | 1 + dlls/crypt32/object.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index f791206..7b0c38e 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -186,4 +186,5 @@ STRINGTABLE DISCARDABLE IDS_ALT_NAME_IP_ADDRESS "IP Address=" IDS_ALT_NAME_MASK "Mask=" IDS_ALT_NAME_REGISTERED_ID "Registered ID=" + IDS_USAGE_UNKNOWN "Unknown Key Usage" } diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index be123bf..975e88c 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -176,5 +176,6 @@ #define IDS_ALT_NAME_IP_ADDRESS 1208 #define IDS_ALT_NAME_MASK 1209 #define IDS_ALT_NAME_REGISTERED_ID 1210 +#define IDS_USAGE_UNKNOWN 1211 #endif /* ndef __WINE_CRYPTRES_H__ */ diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 76687a6..cdbe8db 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1002,6 +1002,107 @@ static BOOL WINAPI CRYPT_FormatAuthorityKeyId2(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_FormatEnhancedKeyUsage(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + CERT_ENHKEY_USAGE *usage; + DWORD size; + BOOL ret = FALSE; + + if (!cbEncoded) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_ENHANCED_KEY_USAGE, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &usage, &size))) + { + WCHAR unknown[MAX_STRING_RESOURCE_LEN]; + DWORD i; + DWORD bytesNeeded = sizeof(WCHAR); /* space for the NULL terminator */ + LPCWSTR sep; + DWORD sepLen; + + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + sep = crlf; + sepLen = strlenW(crlf) * sizeof(WCHAR); + } + else + { + sep = commaSpace; + sepLen = strlenW(commaSpace) * sizeof(WCHAR); + } + + LoadStringW(hInstance, IDS_USAGE_UNKNOWN, unknown, + sizeof(unknown) / sizeof(unknown[0])); + 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) + bytesNeeded += strlenW(info->pwszName) * sizeof(WCHAR); + else + bytesNeeded += strlenW(unknown) * sizeof(WCHAR); + bytesNeeded += sizeof(WCHAR); /* space */ + bytesNeeded += sizeof(WCHAR); /* left paren */ + bytesNeeded += strlen(usage->rgpszUsageIdentifier[i]) * + sizeof(WCHAR); + bytesNeeded += sizeof(WCHAR); /* right paren */ + if (i < usage->cUsageIdentifier - 1) + bytesNeeded += sepLen; + } + if (!pbFormat) + *pcbFormat = bytesNeeded; + else if (*pcbFormat < bytesNeeded) + { + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + *pcbFormat = bytesNeeded; + 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); + LPCSTR oidPtr; + + if (info) + { + strcpyW(str, info->pwszName); + str += strlenW(info->pwszName); + } + else + { + strcpyW(str, unknown); + str += strlenW(unknown); + } + *str++ = ' '; + *str++ = '('; + for (oidPtr = usage->rgpszUsageIdentifier[i]; *oidPtr; oidPtr++) + *str++ = *oidPtr; + *str++ = ')'; + *str = 0; + if (i < usage->cUsageIdentifier - 1) + { + strcpyW(str, sep); + str += sepLen / sizeof(WCHAR); + } + } + } + LocalFree(usage); + } + return ret; +} + typedef BOOL (WINAPI *CryptFormatObjectFunc)(DWORD, DWORD, DWORD, void *, LPCSTR, const BYTE *, DWORD, void *, DWORD *); @@ -1022,10 +1123,15 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, case LOWORD(X509_AUTHORITY_KEY_ID2): format = CRYPT_FormatAuthorityKeyId2; break; + case LOWORD(X509_ENHANCED_KEY_USAGE): + format = CRYPT_FormatEnhancedKeyUsage; + break; } } else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER2)) format = CRYPT_FormatAuthorityKeyId2; + else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE)) + format = CRYPT_FormatEnhancedKeyUsage; if (!format && !(formatStrType & CRYPT_FORMAT_STR_NO_HEX)) format = CRYPT_FormatHexString; return format;

1 0