October 2008 - Wine-Commits

Rob Shearman : wrc: Check for overflows when parsing integer constants.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: d1c15438937b4b5f7fbb4348ebc5c9778e3544d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c15438937b4b5f7fbb4348e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Oct 18 11:51:02 2008 +0100 wrc: Check for overflows when parsing integer constants. --- tools/wrc/parser.l | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 0ef1b0a..6d5189a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -103,6 +103,7 @@ cident [a-zA-Z_][0-9a-zA-Z_]* #include <string.h> #include <ctype.h> #include <assert.h> +#include <limits.h> #ifndef HAVE_UNISTD_H #define YY_NO_UNISTD_H @@ -295,6 +296,19 @@ static struct keyword *iskeyword(char *kw) return kwp; } +/* converts an integer in string form to an unsigned long and prints an error + * on overflow */ +static unsigned long xstrtoul(const char *nptr, char **endptr, int base) +{ + unsigned long l; + + errno = 0; + l = strtoul(nptr, endptr, base); + if (l == ULONG_MAX && errno == ERANGE) + parser_error("integer constant %s is too large\n", nptr); + return l; +} + %} /* @@ -378,9 +392,9 @@ static struct keyword *iskeyword(char *kw) \{ return tBEGIN; \} return tEND; -[0-9]+[lL]? { parser_lval.num = strtoul(yytext, 0, 10); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } -0[xX][0-9A-Fa-f]+[lL]? { parser_lval.num = strtoul(yytext, 0, 16); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } -0[oO][0-7]+[lL]? { parser_lval.num = strtoul(yytext+2, 0, 8); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } +[0-9]+[lL]? { parser_lval.num = xstrtoul(yytext, 0, 10); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } +0[xX][0-9A-Fa-f]+[lL]? { parser_lval.num = xstrtoul(yytext, 0, 16); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } +0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } /* * The next two rules scan identifiers and filenames.

1 0

Rob Shearman : widl: Check for overflow when parsing integer constants.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: cb3ea6843cad1a28b4e9f1d67a6e539af63ec24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3ea6843cad1a28b4e9f1d67… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Oct 18 11:50:20 2008 +0100 widl: Check for overflow when parsing integer constants. --- tools/widl/parser.l | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6a02f50..15e1fb9 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -47,6 +47,7 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include <string.h> #include <ctype.h> #include <assert.h> +#include <limits.h> #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -82,6 +83,19 @@ struct { } import_stack[MAX_IMPORT_DEPTH]; int import_stack_ptr = 0; +/* converts an integer in string form to an unsigned long and prints an error + * on overflow */ +static unsigned long xstrtoul(const char *nptr, char **endptr, int base) +{ + unsigned long l; + + errno = 0; + l = strtoul(nptr, endptr, base); + if (l == ULONG_MAX && errno == ERANGE) + error_loc("integer constant %s is too large\n", nptr); + return l; +} + UUID *parse_uuid(const char *u) { UUID* uuid = xmalloc(sizeof(UUID)); @@ -154,11 +168,11 @@ UUID *parse_uuid(const char *u) return aUUID; } <INITIAL,ATTR>{hex} { - parser_lval.num = strtoul(yytext, NULL, 0); + parser_lval.num = xstrtoul(yytext, NULL, 0); return aHEXNUM; } <INITIAL,ATTR>{int} { - parser_lval.num = strtoul(yytext, NULL, 0); + parser_lval.num = xstrtoul(yytext, NULL, 0); return aNUM; } <INITIAL>{double} {

1 0

Dylan Smith : richedit: Scroll cursor into view even with redraw turned off .
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: f24678b285ad7adcd4fa1009a7288d80d0384a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24678b285ad7adcd4fa1009a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 17 21:29:55 2008 -0400 richedit: Scroll cursor into view even with redraw turned off. --- dlls/riched20/paint.c | 15 +++++++++------ dlls/riched20/tests/editor.c | 14 ++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2955594..2202967 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -159,7 +159,6 @@ void ME_UpdateRepaint(ME_TextEditor *editor) BOOL wrappedParagraphs; wrappedParagraphs = ME_WrapMarkedParagraphs(editor); - if (!editor->bRedraw) return; if (wrappedParagraphs) ME_UpdateScrollBar(editor); @@ -174,7 +173,8 @@ void ME_UpdateRepaint(ME_TextEditor *editor) ME_SendOldNotify(editor, EN_CHANGE); editor->nEventMask |= ENM_CHANGE; } - ME_Repaint(editor); + if (editor->bRedraw) + ME_Repaint(editor); ME_SendSelChange(editor); } @@ -185,10 +185,10 @@ ME_RewrapRepaint(ME_TextEditor *editor) * looks, but not content. Like resizing. */ ME_MarkAllForWrapping(editor); + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); if (editor->bRedraw) { - ME_WrapMarkedParagraphs(editor); - ME_UpdateScrollBar(editor); ME_Repaint(editor); } } @@ -1093,6 +1093,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) || (winStyle & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) { + /* FIXME: ShowScrollBar will redraw the scrollbar when editor->bRedraw is FALSE */ ShowScrollBar(hWnd, SB_VERT, bScrollBarWillBeVisible); } ME_UpdateScrollBar(editor); @@ -1126,6 +1127,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if (bScrollBarWasVisible != bScrollBarWillBeVisible) { + /* FIXME: ShowScrollBar will redraw the scrollbar when editor->bRedraw is FALSE */ ShowScrollBar(hWnd, SB_VERT, bScrollBarWillBeVisible); ME_MarkAllForWrapping(editor); ME_WrapMarkedParagraphs(editor); @@ -1144,13 +1146,14 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) editor->vert_si.nPage = si.nPage; if (bScrollBarWillBeVisible) { - SetScrollInfo(hWnd, SB_VERT, &si, TRUE); + SetScrollInfo(hWnd, SB_VERT, &si, editor->bRedraw); } else { if (bScrollBarWasVisible && !(si.fMask & SIF_DISABLENOSCROLL)) { - SetScrollInfo(hWnd, SB_VERT, &si, TRUE); + SetScrollInfo(hWnd, SB_VERT, &si, editor->bRedraw); + /* FIXME: ShowScrollBar will redraw the scrollbar when editor->bRedraw is FALSE */ ShowScrollBar(hWnd, SB_VERT, FALSE); ME_ScrollAbs(editor, 0); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3f98f30..18deadd 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5189,7 +5189,7 @@ static void test_eventMask(void) SendMessage(eventMaskEditHwnd, WM_SETREDRAW, FALSE, 0); queriedEventMask = 0; /* initialize to something other than we expect */ SendMessage(eventMaskEditHwnd, EM_REPLACESEL, 0, (LPARAM) text); - todo_wine ok(queriedEventMask == (eventMask & ~ENM_CHANGE), + ok(queriedEventMask == (eventMask & ~ENM_CHANGE), "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); SendMessage(eventMaskEditHwnd, WM_SETREDRAW, TRUE, 0); @@ -5568,7 +5568,7 @@ static void test_word_wrap(void) ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); MoveWindow(hwnd, 0, 0, 200, 80, FALSE); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - todo_wine ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); + ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); DestroyWindow(hwnd); @@ -5588,15 +5588,9 @@ static void test_auto_yscroll(void) ok(lines == 8, "%d lines instead of 8\n", lines); ret = SendMessage(hwnd, EM_GETSCROLLPOS, 0, (LPARAM)&pt); ok(ret == 1, "EM_GETSCROLLPOS returned %d instead of 1\n", ret); - if (!redraw) - todo_wine ok(pt.y != 0, "Didn't scroll down after replacing text.\n"); - else - ok(pt.y != 0, "Didn't scroll down after replacing text.\n"); + ok(pt.y != 0, "Didn't scroll down after replacing text.\n"); ret = GetWindowLong(hwnd, GWL_STYLE); - if (!redraw) - todo_wine ok(ret & WS_VSCROLL, "Scrollbar was not shown yet (style=%x).\n", (UINT)ret); - else - ok(ret & WS_VSCROLL, "Scrollbar was not shown yet (style=%x).\n", (UINT)ret); + ok(ret & WS_VSCROLL, "Scrollbar was not shown yet (style=%x).\n", (UINT)ret); SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM)NULL); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0);

1 0

Dylan Smith : richedit: Test changes in scrollbar' s visibility with redraw disabled.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 582bdadeff3a5126b4696324086de170de5bf4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=582bdadeff3a5126b46963240… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 17 21:29:48 2008 -0400 richedit: Test changes in scrollbar's visibility with redraw disabled. Test to verify that the scrollbar does need to be shown or hidden while redraw is disabled. --- dlls/riched20/tests/editor.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 68f2262..3f98f30 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5592,6 +5592,11 @@ static void test_auto_yscroll(void) todo_wine ok(pt.y != 0, "Didn't scroll down after replacing text.\n"); else ok(pt.y != 0, "Didn't scroll down after replacing text.\n"); + ret = GetWindowLong(hwnd, GWL_STYLE); + if (!redraw) + todo_wine ok(ret & WS_VSCROLL, "Scrollbar was not shown yet (style=%x).\n", (UINT)ret); + else + ok(ret & WS_VSCROLL, "Scrollbar was not shown yet (style=%x).\n", (UINT)ret); SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM)NULL); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); @@ -5599,6 +5604,8 @@ static void test_auto_yscroll(void) ret = SendMessage(hwnd, EM_GETSCROLLPOS, 0, (LPARAM)&pt); ok(ret == 1, "EM_GETSCROLLPOS returned %d instead of 1\n", ret); ok(pt.y == 0, "y scroll position is %d after clearing text.\n", pt.y); + ret = GetWindowLong(hwnd, GWL_STYLE); + ok(!(ret & WS_VSCROLL), "Scrollbar is still shown (style=%x).\n", (UINT)ret); } SendMessage(hwnd, WM_SETREDRAW, TRUE, 0);

1 0

Dylan Smith : richedit: Tests for notifications while redraw is disabled.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: a959f7d74bb64fa45143bd7e44530bb797d2b134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a959f7d74bb64fa45143bd7e4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 17 21:29:42 2008 -0400 richedit: Tests for notifications while redraw is disabled. There were some notifications that weren't sent in ME_UpdateRepaint while redraw was disabled, so this verifies that they are not sent with redraw disabled. --- dlls/riched20/tests/editor.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 63fb440..308c69a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5184,6 +5184,15 @@ static void test_eventMask(void) ok(queriedEventMask == (eventMask & ~ENM_CHANGE), "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); + /* check to see if EN_CHANGE is sent when redraw is turned off */ + SendMessage(eventMaskEditHwnd, WM_CLEAR, 0, 0); + SendMessage(eventMaskEditHwnd, WM_SETREDRAW, FALSE, 0); + queriedEventMask = 0; /* initialize to something other than we expect */ + SendMessage(eventMaskEditHwnd, EM_REPLACESEL, 0, (LPARAM) text); + todo_wine ok(queriedEventMask == (eventMask & ~ENM_CHANGE), + "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); + SendMessage(eventMaskEditHwnd, WM_SETREDRAW, TRUE, 0); + DestroyWindow(parent); } @@ -5260,6 +5269,14 @@ static void test_WM_NOTIFY(void) ok(received_WM_NOTIFY == 1, "Expected WM_NOTIFY was NOT sent!\n"); ok(modify_at_WM_NOTIFY == 0, "WM_NOTIFY callback saw text flagged as modified!\n"); + /* Test for WM_NOTIFY messages with redraw disabled. */ + SendMessage(hwndRichedit_WM_NOTIFY, EM_SETSEL, 0, 0); + SendMessage(hwndRichedit_WM_NOTIFY, WM_SETREDRAW, FALSE, 0); + received_WM_NOTIFY = 0; + SendMessage(hwndRichedit_WM_NOTIFY, EM_REPLACESEL, FALSE, (LPARAM)"inserted"); + ok(received_WM_NOTIFY == 1, "Expected WM_NOTIFY was NOT sent!\n"); + SendMessage(hwndRichedit_WM_NOTIFY, WM_SETREDRAW, TRUE, 0); + DestroyWindow(hwndRichedit_WM_NOTIFY); DestroyWindow(parent); }

1 0

Dylan Smith : richedit: Test to see if wrapping happens with redraw disabled.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: bb4e38665a8e869a961170b82ab047a5c9d2c3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4e38665a8e869a961170b82… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 17 21:29:45 2008 -0400 richedit: Test to see if wrapping happens with redraw disabled. --- dlls/riched20/tests/editor.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 308c69a..68f2262 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5484,7 +5484,7 @@ static void test_word_wrap(void) POINTL point = {0, 60}; /* This point must be below the first line */ const char *text = "Must be long enough to test line wrapping"; DWORD dwCommonStyle = WS_VISIBLE|WS_POPUP|WS_VSCROLL|ES_MULTILINE; - int res, pos; + int res, pos, lines; /* Test the effect of WS_HSCROLL and ES_AUTOHSCROLL styles on wrapping * when specified on window creation and set later. */ @@ -5495,6 +5495,8 @@ static void test_word_wrap(void) ok(res, "WM_SETTEXT failed.\n"); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); SetWindowLongW(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); @@ -5509,6 +5511,8 @@ static void test_word_wrap(void) ok(res, "WM_SETTEXT failed.\n"); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line wasn't expected to wrap (lines=%d).", lines); SetWindowLongW(hwnd, GWL_STYLE, dwCommonStyle); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); @@ -5552,6 +5556,22 @@ static void test_word_wrap(void) pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); DestroyWindow(hwnd); + + /* Test to see if wrapping happens with redraw disabled. */ + hwnd = CreateWindow(RICHEDIT_CLASS, NULL, dwCommonStyle, + 0, 0, 400, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); + res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); + ok(res, "EM_REPLACESEL failed.\n"); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); + MoveWindow(hwnd, 0, 0, 200, 80, FALSE); + lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + todo_wine ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); + + SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); + DestroyWindow(hwnd); } static void test_auto_yscroll(void)

1 0

Juan Lang : wintrust: Implement WVTAsn1CatMemberInfoDecode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: c80b99a2f4e5baefcf4e2b3c37f4f1715858025a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80b99a2f4e5baefcf4e2b3c3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 14:32:59 2008 -0700 wintrust: Implement WVTAsn1CatMemberInfoDecode. --- dlls/wintrust/asn.c | 154 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wintrust/tests/asn.c | 3 - 2 files changed, 152 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 97d0d8d..2ba5eb6 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1903,11 +1903,161 @@ BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, return FALSE; } +static BOOL WINAPI CRYPT_AsnDecodeBMPString(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + DWORD bytesNeeded, dataLen; + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + + bytesNeeded = dataLen + 2 + sizeof(LPWSTR); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str; + DWORD i; + + *pcbStructInfo = bytesNeeded; + assert(pvStructInfo); + str = *(LPWSTR *)pvStructInfo; + for (i = 0; i < dataLen / 2; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | + pbEncoded[1 + lenBytes + 2 * i + 1]; + /* Decoded string is always NULL-terminated */ + str[i] = '\0'; + } + } + return ret; +} + +static BOOL CRYPT_AsnDecodeInteger(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + DWORD bytesNeeded, dataLen; + + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + + bytesNeeded = dataLen + sizeof(CRYPT_INTEGER_BLOB); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pvStructInfo; + + *pcbStructInfo = bytesNeeded; + blob->cbData = dataLen; + assert(blob->pbData); + if (blob->cbData) + { + DWORD i; + + for (i = 0; i < blob->cbData; i++) + { + blob->pbData[i] = *(pbEncoded + 1 + lenBytes + + dataLen - i - 1); + } + } + } + } + return ret; +} + +/* Ignores tag. Only allows integers 4 bytes or smaller in size. */ +static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + BYTE buf[sizeof(CRYPT_INTEGER_BLOB) + sizeof(int)]; + CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)buf; + DWORD size = sizeof(buf); + + blob->pbData = buf + sizeof(CRYPT_INTEGER_BLOB); + ret = CRYPT_AsnDecodeInteger(pbEncoded, cbEncoded, 0, buf, &size); + if (ret) + { + if (!pvStructInfo) + *pcbStructInfo = sizeof(int); + else if (*pcbStructInfo < sizeof(int)) + { + *pcbStructInfo = sizeof(int); + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + int val, i; + + *pcbStructInfo = sizeof(int); + if (blob->pbData[blob->cbData - 1] & 0x80) + { + /* initialize to a negative value to sign-extend */ + val = -1; + } + else + val = 0; + for (i = 0; i < blob->cbData; i++) + { + val <<= 8; + val |= blob->pbData[blob->cbData - i - 1]; + } + memcpy(pvStructInfo, &val, sizeof(int)); + } + } + else if (GetLastError() == ERROR_MORE_DATA) + SetLastError(CRYPT_E_ASN1_LARGE); + return ret; +} + BOOL WINAPI WVTAsn1CatMemberInfoDecode(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) { - FIXME("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - return FALSE; + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_BMPSTRING, offsetof(CAT_MEMBERINFO, pwszSubjGuid), + CRYPT_AsnDecodeBMPString, sizeof(LPWSTR), FALSE, TRUE, + offsetof(CAT_MEMBERINFO, pwszSubjGuid), 0 }, + { ASN_INTEGER, offsetof(CAT_MEMBERINFO, dwCertVersion), + CRYPT_AsnDecodeInt, sizeof(DWORD), + FALSE, FALSE, 0, 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + TRACE("returning %d\n", ret); + return ret; } diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 00f1ebc..034d922 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -547,7 +547,6 @@ static void test_decodeCatMemberInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, emptyCatMemberInfo, sizeof(emptyCatMemberInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -561,7 +560,6 @@ static void test_decodeCatMemberInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, catMemberInfoWithSillyGuid, sizeof(catMemberInfoWithSillyGuid), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -575,7 +573,6 @@ static void test_decodeCatMemberInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, catMemberInfoWithGuid, sizeof(catMemberInfoWithGuid), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : wintrust: Add tests for WVTAsn1CatMemberInfoDecode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 6b13b356407fcd570e739c58a8258e357a2ca45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b13b356407fcd570e739c58a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 14:12:55 2008 -0700 wintrust: Add tests for WVTAsn1CatMemberInfoDecode. --- dlls/wintrust/tests/asn.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 5dd4eff..00f1ebc 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -531,6 +531,63 @@ static void test_encodeCatMemberInfo(void) } } +static void test_decodeCatMemberInfo(void) +{ + BOOL ret; + LPBYTE buf; + DWORD size; + CAT_MEMBERINFO *info; + + if (!pCryptDecodeObjectEx) + { + skip("CryptDecodeObjectEx() is not available. Skipping the decodeCatMemberInfo tests\n"); + return; + } + + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, + emptyCatMemberInfo, sizeof(emptyCatMemberInfo), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + info = (CAT_MEMBERINFO *)buf; + ok(!info->pwszSubjGuid || !info->pwszSubjGuid[0], + "expected empty pwszSubjGuid\n"); + ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %d\n", + info->dwCertVersion); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, + catMemberInfoWithSillyGuid, sizeof(catMemberInfoWithSillyGuid), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + info = (CAT_MEMBERINFO *)buf; + ok(info->pwszSubjGuid && !lstrcmpW(info->pwszSubjGuid, foo), + "unexpected pwszSubjGuid\n"); + ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %d\n", + info->dwCertVersion); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, + catMemberInfoWithGuid, sizeof(catMemberInfoWithGuid), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + info = (CAT_MEMBERINFO *)buf; + ok(info->pwszSubjGuid && !lstrcmpW(info->pwszSubjGuid, guidStr), + "unexpected pwszSubjGuid\n"); + ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %d\n", + info->dwCertVersion); + LocalFree(buf); + } +} + START_TEST(asn) { HMODULE hCrypt32 = LoadLibraryA("crypt32.dll"); @@ -542,6 +599,7 @@ START_TEST(asn) test_encodeSPCPEImage(); test_decodeSPCPEImage(); test_encodeCatMemberInfo(); + test_decodeCatMemberInfo(); FreeLibrary(hCrypt32); }

1 0

Juan Lang : wintrust: Add stub for WVTAsn1CatMemberInfoDecode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 65c5d3e4a8b8a7ae12594354c98a16a5d4db265b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c5d3e4a8b8a7ae12594354c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 14:08:45 2008 -0700 wintrust: Add stub for WVTAsn1CatMemberInfoDecode. --- dlls/wintrust/asn.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 364e7c2..97d0d8d 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1902,3 +1902,12 @@ BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, pvStructInfo, *pcbStructInfo); return FALSE; } + +BOOL WINAPI WVTAsn1CatMemberInfoDecode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + FIXME("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); + return FALSE; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 35e1b2f..28de78b 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -86,7 +86,7 @@ @ stub WTHelperIsInRootStore @ stub WTHelperOpenKnownStores @ stdcall WTHelperProvDataFromStateData(ptr) -@ stub WVTAsn1CatMemberInfoDecode +@ stdcall WVTAsn1CatMemberInfoDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatMemberInfoEncode(long str ptr ptr ptr) @ stub WVTAsn1CatNameValueDecode @ stub WVTAsn1CatNameValueEncode

1 0

Juan Lang : wintrust: Implement WVTAsn1CatMemberInfoEncode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: d3d7dfa7ff9c7b2a891e529f8728a225ee4e5a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d7dfa7ff9c7b2a891e529f8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 14:07:03 2008 -0700 wintrust: Implement WVTAsn1CatMemberInfoEncode. --- dlls/wintrust/asn.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wintrust/tests/asn.c | 3 - 2 files changed, 162 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 76ac8a8..364e7c2 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -50,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); #endif #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) +#define ASN_BMPSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1e) static BOOL CRYPT_EncodeLen(DWORD len, BYTE *pbEncoded, DWORD *pcbEncoded) { @@ -738,13 +739,172 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeBMPString(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = TRUE; + LPCWSTR str = (LPCWSTR)pvStructInfo; + DWORD bytesNeeded, lenBytes, strLen; + + if (str) + strLen = lstrlenW(str); + else + strLen = 0; + CRYPT_EncodeLen(strLen * 2, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + strLen * 2; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else if (*pcbEncoded < bytesNeeded) + { + *pcbEncoded = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + DWORD i; + + *pcbEncoded = bytesNeeded; + *pbEncoded++ = ASN_BMPSTRING; + CRYPT_EncodeLen(strLen * 2, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < strLen; i++) + { + *pbEncoded++ = (str[i] & 0xff00) >> 8; + *pbEncoded++ = str[i] & 0x00ff; + } + } + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + DWORD significantBytes, lenBytes, bytesNeeded; + BYTE padByte = 0; + BOOL pad = FALSE; + const CRYPT_INTEGER_BLOB *blob = + (const CRYPT_INTEGER_BLOB *)pvStructInfo; + + significantBytes = blob->cbData; + if (significantBytes) + { + if (blob->pbData[significantBytes - 1] & 0x80) + { + /* negative, lop off leading (little-endian) 0xffs */ + for (; significantBytes > 0 && + blob->pbData[significantBytes - 1] == 0xff; significantBytes--) + ; + if (blob->pbData[significantBytes - 1] < 0x80) + { + padByte = 0xff; + pad = TRUE; + } + } + else + { + /* positive, lop off leading (little-endian) zeroes */ + for (; significantBytes > 0 && + !blob->pbData[significantBytes - 1]; significantBytes--) + ; + if (significantBytes == 0) + significantBytes = 1; + if (blob->pbData[significantBytes - 1] > 0x7f) + { + padByte = 0; + pad = TRUE; + } + } + } + if (pad) + CRYPT_EncodeLen(significantBytes + 1, NULL, &lenBytes); + else + CRYPT_EncodeLen(significantBytes, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + significantBytes; + if (pad) + bytesNeeded++; + if (!pbEncoded) + { + *pcbEncoded = bytesNeeded; + ret = TRUE; + } + else if (*pcbEncoded < bytesNeeded) + { + *pcbEncoded = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbEncoded = bytesNeeded; + *pbEncoded++ = ASN_INTEGER; + if (pad) + { + CRYPT_EncodeLen(significantBytes + 1, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + *pbEncoded++ = padByte; + } + else + { + CRYPT_EncodeLen(significantBytes, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + } + for (; significantBytes > 0; significantBytes--) + *(pbEncoded++) = blob->pbData[significantBytes - 1]; + ret = TRUE; + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + CRYPT_INTEGER_BLOB blob = { sizeof(INT), (BYTE *)pvStructInfo }; + + return CRYPT_AsnEncodeInteger(dwCertEncodingType, X509_MULTI_BYTE_INTEGER, + &blob, pbEncoded, pcbEncoded); +} + BOOL WINAPI WVTAsn1CatMemberInfoEncode(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) { - FIXME("(0x%08x, %s, %p, %p, %p): stub\n", dwCertEncodingType, + BOOL ret = FALSE; + + TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); - return FALSE; + + __TRY + { + const CAT_MEMBERINFO *info = (const CAT_MEMBERINFO *)pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { info->pwszSubjGuid, CRYPT_AsnEncodeBMPString, 0 }, + { &info->dwCertVersion, CRYPT_AsnEncodeInt, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, + items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; } /* Gets the number of length bytes from the given (leading) length byte */ diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 28cc6f6..5dd4eff 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -497,7 +497,6 @@ static void test_encodeCatMemberInfo(void) ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -509,7 +508,6 @@ static void test_encodeCatMemberInfo(void) info.pwszSubjGuid = foo; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -522,7 +520,6 @@ static void test_encodeCatMemberInfo(void) info.pwszSubjGuid = guidStr; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, (LPBYTE)&info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0