November 2008 - Wine-Commits

Paul Vriens : user32/tests: Fix some test failures on Win9x.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

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

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

Nov. 7, 2008

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

Michael Stefaniuc : crypt32: Fix the aligning up to a DWORD_PTR boundary.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

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

Michael Stefaniuc : comctl32: Remove superfluous casts that crept in as well as some older ones.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

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

Juan Lang : crypt32: Implement CryptFormatObject for SPC_FINANCIAL_CRITERIA_OBJID.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

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

Juan Lang : crypt32: Implement CryptFormatObject for szOID_CRL_DIST_POINTS.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

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 szOID_AUTHORITY_INFO_ACCESS.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

Module: wine Branch: master Commit: c11aa873c591c36ce23b34dc62531b3f836a7eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11aa873c591c36ce23b34dc6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 14:01:48 2008 -0800 crypt32: Implement CryptFormatObject for szOID_AUTHORITY_INFO_ACCESS. --- dlls/crypt32/crypt32_En.rc | 7 ++ dlls/crypt32/cryptres.h | 7 ++ dlls/crypt32/object.c | 257 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 268 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c11aa873c591c36ce23b3…

1 0

Juan Lang : crypt32: Implement CryptFormatObject for szOID_BASIC_CONSTRAINTS2.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

Module: wine Branch: master Commit: c6ec755469a0c67307d590cb74e8e4985b0af439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ec755469a0c67307d590cb7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 13:48:54 2008 -0800 crypt32: Implement CryptFormatObject for szOID_BASIC_CONSTRAINTS2. --- dlls/crypt32/crypt32_En.rc | 5 ++ dlls/crypt32/cryptres.h | 5 ++ dlls/crypt32/object.c | 108 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 114 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 7b0c38e..7a433be 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -187,4 +187,9 @@ STRINGTABLE DISCARDABLE IDS_ALT_NAME_MASK "Mask=" IDS_ALT_NAME_REGISTERED_ID "Registered ID=" IDS_USAGE_UNKNOWN "Unknown Key Usage" + IDS_SUBJECT_TYPE "Subject Type=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "End Entity" + IDS_PATH_LENGTH "Path Length Constraint=" + IDS_PATH_LENGTH_NONE "None" } diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index 975e88c..ac7c65c 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -177,5 +177,10 @@ #define IDS_ALT_NAME_MASK 1209 #define IDS_ALT_NAME_REGISTERED_ID 1210 #define IDS_USAGE_UNKNOWN 1211 +#define IDS_SUBJECT_TYPE 1212 +#define IDS_SUBJECT_TYPE_CA 1213 +#define IDS_SUBJECT_TYPE_END_CERT 1214 +#define IDS_PATH_LENGTH 1215 +#define IDS_PATH_LENGTH_NONE 1216 #endif /* ndef __WINE_CRYPTRES_H__ */ diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index cdbe8db..783dbce 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -603,6 +603,105 @@ static BOOL WINAPI CRYPT_FormatHexString(DWORD dwCertEncodingType, #define MAX_STRING_RESOURCE_LEN 128 +static const WCHAR crlf[] = { '\r','\n',0 }; +static const WCHAR commaSpace[] = { ',',' ',0 }; + +static WCHAR subjectTypeHeader[MAX_STRING_RESOURCE_LEN]; +static WCHAR subjectTypeCA[MAX_STRING_RESOURCE_LEN]; +static WCHAR subjectTypeEndCert[MAX_STRING_RESOURCE_LEN]; +static WCHAR pathLengthHeader[MAX_STRING_RESOURCE_LEN]; + +static BOOL WINAPI CRYPT_FormatBasicConstraints2(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + DWORD size; + CERT_BASIC_CONSTRAINTS2_INFO *info; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_BASIC_CONSTRAINTS2, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size))) + { + static const WCHAR pathFmt[] = { '%','d',0 }; + static BOOL stringsLoaded = FALSE; + DWORD bytesNeeded = sizeof(WCHAR); /* space for the NULL terminator */ + WCHAR pathLength[MAX_STRING_RESOURCE_LEN]; + LPCWSTR sep, subjectType; + DWORD sepLen; + + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + sep = crlf; + sepLen = strlenW(crlf) * sizeof(WCHAR); + } + else + { + sep = commaSpace; + sepLen = strlenW(commaSpace) * sizeof(WCHAR); + } + + if (!stringsLoaded) + { + LoadStringW(hInstance, IDS_SUBJECT_TYPE, subjectTypeHeader, + sizeof(subjectTypeHeader) / sizeof(subjectTypeHeader[0])); + LoadStringW(hInstance, IDS_SUBJECT_TYPE_CA, subjectTypeCA, + sizeof(subjectTypeCA) / sizeof(subjectTypeCA[0])); + LoadStringW(hInstance, IDS_SUBJECT_TYPE_END_CERT, + subjectTypeEndCert, + sizeof(subjectTypeEndCert) / sizeof(subjectTypeEndCert[0])); + LoadStringW(hInstance, IDS_PATH_LENGTH, pathLengthHeader, + sizeof(pathLengthHeader) / sizeof(pathLengthHeader[0])); + stringsLoaded = TRUE; + } + bytesNeeded += strlenW(subjectTypeHeader) * sizeof(WCHAR); + if (info->fCA) + subjectType = subjectTypeCA; + else + subjectType = subjectTypeEndCert; + bytesNeeded += strlenW(subjectType) * sizeof(WCHAR); + bytesNeeded += sepLen; + bytesNeeded += strlenW(pathLengthHeader) * sizeof(WCHAR); + if (info->fPathLenConstraint) + sprintfW(pathLength, pathFmt, info->dwPathLenConstraint); + else + LoadStringW(hInstance, IDS_PATH_LENGTH_NONE, pathLength, + sizeof(pathLength) / sizeof(pathLength[0])); + bytesNeeded += strlenW(pathLength) * 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, subjectTypeHeader); + str += strlenW(subjectTypeHeader); + strcpyW(str, subjectType); + str += strlenW(subjectType); + strcpyW(str, sep); + str += sepLen / sizeof(WCHAR); + strcpyW(str, pathLengthHeader); + str += strlenW(pathLengthHeader); + strcpyW(str, pathLength); + str += strlenW(pathLength); + } + LocalFree(info); + } + return ret; +} + static BOOL CRYPT_FormatHexStringWithPrefix(CRYPT_DATA_BLOB *blob, int id, LPWSTR str, DWORD *pcbStr) { @@ -650,8 +749,6 @@ static BOOL CRYPT_FormatCertSerialNumber(CRYPT_DATA_BLOB *serialNum, LPWSTR str, str, pcbStr); } -static const WCHAR crlf[] = { '\r','\n',0 }; - static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, CERT_ALT_NAME_ENTRY *entry, LPWSTR str, DWORD *pcbStr) { @@ -783,8 +880,6 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, return ret; } -static const WCHAR commaSpace[] = { ',',' ',0 }; - static BOOL CRYPT_FormatAltNameInfo(DWORD dwFormatStrType, CERT_ALT_NAME_INFO *name, LPWSTR str, DWORD *pcbStr) { @@ -1120,6 +1215,9 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, { switch (LOWORD(lpszStructType)) { + case LOWORD(X509_BASIC_CONSTRAINTS2): + format = CRYPT_FormatBasicConstraints2; + break; case LOWORD(X509_AUTHORITY_KEY_ID2): format = CRYPT_FormatAuthorityKeyId2; break; @@ -1128,6 +1226,8 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, break; } } + else if (!strcmp(lpszStructType, szOID_BASIC_CONSTRAINTS2)) + format = CRYPT_FormatBasicConstraints2; else if (!strcmp(lpszStructType, szOID_AUTHORITY_KEY_IDENTIFIER2)) format = CRYPT_FormatAuthorityKeyId2; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE))

1 0

Juan Lang : crypt32: Implement CryptFormatObject for szOID_AUTHORITY_KEY_IDENTIFIER2.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

Module: wine Branch: master Commit: 426d13e5be437a489bbbc6e7271bbc68f78572e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426d13e5be437a489bbbc6e72… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 6 13:48:14 2008 -0800 crypt32: Implement CryptFormatObject for szOID_AUTHORITY_KEY_IDENTIFIER2. --- dlls/crypt32/crypt32_En.rc | 15 ++ dlls/crypt32/cryptres.h | 12 ++ dlls/crypt32/object.c | 447 +++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/main.c | 2 - 4 files changed, 467 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=426d13e5be437a489bbbc…

1 0

Juan Lang : crypt32: Implement CryptFormatObject for szOID_ENHANCED_KEY_USAGE.
by Alexandre Julliard Nov. 7, 2008

Nov. 7, 2008

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