February 2006 - Wine-Commits

Thomas Kho : riched20: Implement EM_SCROLLCARET and EM_GETSCROLLPOS.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: bfb3c756eb5f956904e5f3154eb09be34aa63e94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bfb3c756eb5f956904e5f31… Author: Thomas Kho <tkho(a)ucla.edu> Date: Thu Feb 16 19:33:19 2006 +0100 riched20: Implement EM_SCROLLCARET and EM_GETSCROLLPOS. --- dlls/riched20/editor.c | 48 +++++++++++++++++++++++++--- dlls/riched20/tests/editor.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a9e6937..fd3137a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -64,7 +64,7 @@ - EM_GETREDONAME 2.0 + EM_GETSEL + EM_GETSELTEXT (ANSI&Unicode) - - EM_GETSCROLLPOS 3.0 + + EM_GETSCROLLPOS 3.0 (only Y value valid) ! - EM_GETTHUMB - EM_GETTEXTEX 2.0 + EM_GETTEXTLENGTHEX (GTL_PRECISE unimplemented) @@ -88,7 +88,7 @@ + EM_REQUESTRESIZE + EM_REPLACESEL (proper style?) ANSI&Unicode - EM_SCROLL - - EM_SCROLLCARET + + EM_SCROLLCARET - EM_SELECTIONTYPE - EM_SETBIDIOPTIONS 3.0 + EM_SETBKGNDCOLOR @@ -1319,7 +1319,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_GETOPTIONS) UNSUPPORTED_MSG(EM_GETPASSWORDCHAR) UNSUPPORTED_MSG(EM_GETREDONAME) - UNSUPPORTED_MSG(EM_GETSCROLLPOS) UNSUPPORTED_MSG(EM_GETTEXTMODE) UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) @@ -1328,7 +1327,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_LIMITTEXT) /* also known as EM_SETLIMITTEXT */ UNSUPPORTED_MSG(EM_PASTESPECIAL) UNSUPPORTED_MSG(EM_SCROLL) - UNSUPPORTED_MSG(EM_SCROLLCARET) UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) UNSUPPORTED_MSG(EM_SETEDITSTYLE) @@ -1629,6 +1627,41 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_UpdateRepaint(editor); return 0; } + case EM_SCROLLCARET: + { + int top, bottom; /* row's edges relative to document top */ + ME_DisplayItem *para, *row; + + row = ME_RowStart(editor->pCursors[0].pRun); + para = ME_GetParagraph(row); + top = para->member.para.nYPos + row->member.row.nYPos; + bottom = top + row->member.row.nHeight; + + if ((top < editor->nScrollPosY) + || (editor->nScrollPosY + editor->sizeWindow.cy < bottom)) + { + int dy; + int prevScrollPosY = editor->nScrollPosY; + + if (top < editor->nScrollPosY) /* caret above window */ + editor->nScrollPosY = top; + else /* caret below window */ + editor->nScrollPosY = bottom - editor->sizeWindow.cy; + + if (editor->nScrollPosY < 0) + editor->nScrollPosY = 0; + + dy = prevScrollPosY - editor->nScrollPosY; + SetScrollPos(hWnd, SB_VERT, editor->nScrollPosY, TRUE); + if (editor->bRedraw) + { + ScrollWindow(hWnd, 0, dy, NULL, NULL); + UpdateWindow(hWnd); + } + } + + return 0; + } case WM_SETTEXT: { ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); @@ -1797,6 +1830,13 @@ LRESULT WINAPI RichEditANSIWndProc(HWND tr.lpstrText = (WCHAR *)lParam; return RichEditANSIWndProc(hWnd, EM_GETTEXTRANGE, 0, (LPARAM)&tr); } + case EM_GETSCROLLPOS: + { + POINT *point = (POINT *)lParam; + point->x = 0; /* FIXME side scrolling not implemented */ + point->y = editor->nScrollPosY; + return 1; + } case EM_GETTEXTRANGE: { TEXTRANGEW *rng = (TEXTRANGEW *)lParam; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7eb24ac..908bb90 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -183,6 +183,78 @@ static void test_EM_FINDTEXT(void) DestroyWindow(hwndRichEdit); } +static int get_scroll_pos_y(HWND hwnd) +{ + POINT p = {-1, -1}; + SendMessage(hwnd, EM_GETSCROLLPOS, 0, (LPARAM) &p); + ok(p.x != -1 && p.y != -1, "p.x:%ld p.y:%ld\n", p.x, p.y); + return p.y; +} + +static void move_cursor(HWND hwnd, long charindex) +{ + CHARRANGE cr; + cr.cpMax = charindex; + cr.cpMin = charindex; + SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM) &cr); +} + +static void line_scroll(HWND hwnd, int amount) +{ + SendMessage(hwnd, EM_LINESCROLL, 0, amount); +} + +static void test_EM_SCROLLCARET(void) +{ + int prevY, curY; + HWND hwndRichEdit = new_richedit(NULL); + const char text[] = "aa\n" + "this is a long line of text that should be longer than the " + "control's width\n" + "cc\n" + "dd\n" + "ee\n" + "ff\n" + "gg\n" + "hh\n"; + + /* Can't verify this */ + SendMessage(hwndRichEdit, EM_SCROLLCARET, 0, 0); + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + + /* Caret above visible window */ + line_scroll(hwndRichEdit, 3); + prevY = get_scroll_pos_y(hwndRichEdit); + SendMessage(hwndRichEdit, EM_SCROLLCARET, 0, 0); + curY = get_scroll_pos_y(hwndRichEdit); + ok(prevY != curY, "%d == %d\n", prevY, curY); + + /* Caret below visible window */ + move_cursor(hwndRichEdit, sizeof(text) - 1); + line_scroll(hwndRichEdit, -3); + prevY = get_scroll_pos_y(hwndRichEdit); + SendMessage(hwndRichEdit, EM_SCROLLCARET, 0, 0); + curY = get_scroll_pos_y(hwndRichEdit); + ok(prevY != curY, "%d == %d\n", prevY, curY); + + /* Caret in visible window */ + move_cursor(hwndRichEdit, sizeof(text) - 2); + prevY = get_scroll_pos_y(hwndRichEdit); + SendMessage(hwndRichEdit, EM_SCROLLCARET, 0, 0); + curY = get_scroll_pos_y(hwndRichEdit); + ok(prevY == curY, "%d != %d\n", prevY, curY); + + /* Caret still in visible window */ + line_scroll(hwndRichEdit, -1); + prevY = get_scroll_pos_y(hwndRichEdit); + SendMessage(hwndRichEdit, EM_SCROLLCARET, 0, 0); + curY = get_scroll_pos_y(hwndRichEdit); + ok(prevY == curY, "%d != %d\n", prevY, curY); + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -194,6 +266,7 @@ START_TEST( editor ) ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); test_EM_FINDTEXT(); + test_EM_SCROLLCARET(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Robert Shearman : oleaut: Test some error conditions in ITypeInfo:: GetIDsOfNames and ITypeInfo::Invoke.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 6ad326a607c130a5c4d69167c29826c5e44da23f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ad326a607c130a5c4d6916… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Feb 16 19:33:08 2006 +0100 oleaut: Test some error conditions in ITypeInfo::GetIDsOfNames and ITypeInfo::Invoke. --- dlls/oleaut32/tests/typelib.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index b5e4fad..72021dd 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -31,6 +31,8 @@ #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", hr) +static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; + static void ref_count_test(LPCWSTR type_lib) { ITypeLib *iface; @@ -69,7 +71,6 @@ static void test_TypeComp(void) DESCKIND desckind; BINDPTR bindptr; ITypeInfo *pTypeInfo; - static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static WCHAR wszStdFunctions[] = {'S','t','d','F','u','n','c','t','i','o','n','s',0}; static WCHAR wszSavePicture[] = {'S','a','v','e','P','i','c','t','u','r','e',0}; static WCHAR wszOLE_TRISTATE[] = {'O','L','E','_','T','R','I','S','T','A','T','E',0}; @@ -362,10 +363,44 @@ static void test_CreateDispTypeInfo(void SysFreeString(methdata[3].szName); } +static void test_TypeInfo(void) +{ + ITypeLib *pTypeLib; + ITypeInfo *pTypeInfo; + HRESULT hr; + static WCHAR szBogus[] = { 'b','o','g','u','s',0 }; + OLECHAR* bogus = szBogus; + DISPID dispidMember; + DISPPARAMS dispparams; + + hr = LoadTypeLib(wszStdOle2, &pTypeLib); + ok_ole_success(hr, LoadTypeLib); + + hr = ITypeLib_GetTypeInfo(pTypeLib, 1, &pTypeInfo); + ok_ole_success(hr, ITypeLib_GetTypeInfo); + ITypeLib_Release(pTypeLib); + + /* test nonexistent method name */ + hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &bogus, 1, &dispidMember); + ok(hr == DISP_E_UNKNOWNNAME, + "ITypeInfo_GetIDsOfNames should have returned DISP_E_UNKNOWNNAME instead of 0x%08lx\n", + hr); + + /* test invalid memberid */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + hr = ITypeInfo_Invoke(pTypeInfo, NULL, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + + ITypeInfo_Release(pTypeInfo); +} + START_TEST(typelib) { - static const WCHAR type_lib_stdole32[] = {'s','t','d','o','l','e','3','2','.','t','l','b',0}; - ref_count_test(type_lib_stdole32); + ref_count_test(wszStdOle2); test_TypeComp(); test_CreateDispTypeInfo(); + test_TypeInfo(); }

1 0

Saulius Krasuckas : mscms: Distinguish between registered and unregistered profile IDs.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 76f66cc78fe61f7bae0dcde2aae4b904e7d7e62c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76f66cc78fe61f7bae0dcde… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Thu Feb 16 19:32:58 2006 +0100 mscms: Distinguish between registered and unregistered profile IDs. --- dlls/mscms/tests/profile.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index da34caa..c982528 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -497,6 +497,21 @@ static void enum_registered_color_profil trace("\n"); } +static colorspace_descr *query_colorspace(DWORD dwID) +{ + DWORD count, i; + + count = sizeof(known_colorspaces)/sizeof(known_colorspaces[0]); + + for (i=0; i<count; i++) + if (known_colorspaces[i].dwID == dwID) + { + if (!known_colorspaces[i].registered) break; + return &known_colorspaces[i]; + } + return NULL; +} + static HKEY reg_open_mscms_key(void) { char win9x[] = "SOFTWARE\\Microsoft\\Windows"; @@ -580,10 +595,19 @@ static void test_GetStandardColorSpacePr fail_GSCSP(A, NULL, (DWORD)-1, newprofile, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND)); todo_wine fail_GSCSP(A, NULL, SPACE_RGB, newprofile, NULL, sizeP, FALSE, (GLE == ERROR_INVALID_PARAMETER)); - todo_wine - fail_GSCSP(A, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER)); - todo_wine - fail_GSCSP(A, NULL, SPACE_RGB, newprofile, &size, 0, FALSE, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); + + if (query_colorspace(SPACE_RGB)) + { + todo_wine + fail_GSCSP(A, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_INSUFFICIENT_BUFFER)); + todo_wine + fail_GSCSP(A, NULL, SPACE_RGB, newprofile, &size, 0, FALSE, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); + } else { + todo_wine + fail_GSCSP(A, NULL, SPACE_RGB, NULL, &size, sizeP, FALSE, (GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSP(A, NULL, SPACE_RGB, newprofile, &size, 0, FALSE, (GLE == ERROR_FILE_NOT_FOUND)); + } /* Several invalid parameter checks */ fail_GSCSP(A, machine, 0, newprofile, &size, 0, FALSE, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED));

1 0

Robert Shearman : winebuild: Correction for manpage.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 90938d6b6c52f8596241be233b3390a3a5677d80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90938d6b6c52f8596241be2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Feb 16 19:32:35 2006 +0100 winebuild: Correction for manpage. The behaviour for winebuild is to prefer main over WinMain, not the other way around. --- tools/winebuild/winebuild.man.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 6c9bafc..78e10a2 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -73,11 +73,11 @@ Specify the module entry point function; is .B DllMain for dlls, and -.B WinMain -for executables (if -.B WinMain -is not defined, the standard C .B main +for executables (if the standard C +.B main +is not defined, +.B WinMain is used instead). This is only valid for Win32 modules. .TP .BI \-E,\ --export= filename

1 0

Jacek Caban : shdocvw: Unaccess post data only if we've accessed it before.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 76a361af8215fa8f8be741c14afad84ae3f1770f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76a361af8215fa8f8be741c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 16 19:32:11 2006 +0100 shdocvw: Unaccess post data only if we've accessed it before. --- dlls/shdocvw/webbrowser.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 8f8cf46..493a124 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -551,7 +551,8 @@ static HRESULT WINAPI WebBrowser_Navigat hres = navigate_url(This, V_BSTR(URL), post_data, post_data_len, headers); - SafeArrayUnaccessData(V_ARRAY(PostData)); + if(post_data) + SafeArrayUnaccessData(V_ARRAY(PostData)); return hres; }

1 0

Alexandre Julliard : libwine: New naming scheme for 16-bit builtin dlls.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: aed49d439e0c6eb725ea5b8e47cbd1bd8dafa4cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aed49d439e0c6eb725ea5b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 13:44:38 2006 +0100 libwine: New naming scheme for 16-bit builtin dlls. Stop using symlinks for 16-bit dlls to make sure they don't get loaded by mistake when looking for a 32-bit dll. --- dlls/.gitignore | 50 +++++++++++ dlls/Makedll.rules.in | 10 +- dlls/Makefile.in | 216 +++++++++++++++++++++++++------------------------ dlls/make_dlls | 6 + libs/wine/loader.c | 19 ++++ 5 files changed, 184 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=aed49d439e0c6eb725e…

1 0

Vitaliy Margolen : comctl32: Remove/swap limits if min > max in MCM_SETRANGE.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 9774745330c7f644a38d4eef08c644edb7022193 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9774745330c7f644a38d4ee… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Thu Feb 16 12:19:36 2006 +0100 comctl32: Remove/swap limits if min > max in MCM_SETRANGE. We should swap min & max only when both limits are being set. Otherwise limit that being set should invalidate other limit (remove it). --- dlls/comctl32/monthcal.c | 25 +++++++++++++++++++++++++ dlls/comctl32/tests/monthcal.c | 4 +++- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index be9d705..7c02f0a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -934,6 +934,7 @@ static LRESULT MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam; + FILETIME ft_min, ft_max; TRACE("%x %lx\n", wParam, lParam); @@ -952,6 +953,30 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr infoPtr->rangeValid |= GDTR_MAX; } + /* Only one limit set - we are done */ + if ((infoPtr->rangeValid & (GDTR_MIN | GDTR_MAX)) != (GDTR_MIN | GDTR_MAX)) + return TRUE; + + SystemTimeToFileTime(&infoPtr->maxDate, &ft_max); + SystemTimeToFileTime(&infoPtr->minDate, &ft_min); + + if (CompareFileTime(&ft_min, &ft_max) > 0) + { + if ((wParam & (GDTR_MIN | GDTR_MAX)) == (GDTR_MIN | GDTR_MAX)) + { + /* Native swaps limits only when both limits are being set. */ + SYSTEMTIME st_tmp = infoPtr->minDate; + infoPtr->minDate = infoPtr->maxDate; + infoPtr->maxDate = st_tmp; + } + else + { + /* Reset the other limit. */ + /* FIXME: native sets date&time to 0. Should we do this too? */ + infoPtr->rangeValid &= wParam & GDTR_MIN ? ~GDTR_MAX : ~GDTR_MIN ; + } + } + return TRUE; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 52103f0..89d3bc6 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -67,6 +67,7 @@ void test_monthcal(void) ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st1); ok(res == month_range, "Invalid month range (%d)\n", res); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == (GDTR_MIN|GDTR_MAX), "Limits should be set\n"); st[1].wMonth += 2; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); @@ -80,13 +81,14 @@ void test_monthcal(void) st[1].wMonth -= 3; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); - + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "Only MAX limit should be set\n"); st[1].wMonth += 4; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); st[1].wYear -= 3; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); st[1].wYear += 4; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "Only MAX limit should be set\n"); } START_TEST(monthcal)

1 0

Vitaliy Margolen : comctl32: Don't change month range in MCM_SETRANGE. Add tests for this.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: f273bdc0b53f1e872e88e967158b0fa87eb35f4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f273bdc0b53f1e872e88e96… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Thu Feb 16 12:19:09 2006 +0100 comctl32: Don't change month range in MCM_SETRANGE. Add tests for this. --- dlls/comctl32/monthcal.c | 17 +---------------- dlls/comctl32/tests/monthcal.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1de342f..be9d705 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -930,17 +930,10 @@ MONTHCAL_GetMaxTodayWidth(MONTHCAL_INFO } -/* FIXME: are validated times taken from current date/time or simply - * copied? - * FIXME: check whether MCM_GETMONTHRANGE shows correct result after - * adjusting range with MCM_SETRANGE - */ - static LRESULT MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam; - int prev; TRACE("%x %lx\n", wParam, lParam); @@ -959,15 +952,7 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr infoPtr->rangeValid |= GDTR_MAX; } - prev = infoPtr->monthRange; - infoPtr->monthRange = infoPtr->maxDate.wMonth - infoPtr->minDate.wMonth; - - if(infoPtr->monthRange!=prev) { - infoPtr->monthdayState = ReAlloc(infoPtr->monthdayState, - infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - } - - return 1; + return TRUE; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index b04f137..52103f0 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -33,6 +33,7 @@ void test_monthcal(void) HWND hwnd; SYSTEMTIME st[2], st1[2]; INITCOMMONCONTROLSEX ic = {sizeof(INITCOMMONCONTROLSEX), ICC_DATE_CLASSES}; + int res, month_range; InitCommonControlsEx(&ic); hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, @@ -61,19 +62,25 @@ void test_monthcal(void) st[0].wMonth = 5; st[1] = st[0]; + month_range = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st1); st[1].wMonth--; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st1); + ok(res == month_range, "Invalid month range (%d)\n", res); + st[1].wMonth += 2; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st1); + ok(res == month_range, "Invalid month range (%d)\n", res); + st[1].wYear --; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); st[1].wYear += 1; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); -/* This crashing Wine so commented untill fixed. st[1].wMonth -= 3; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); -*/ + st[1].wMonth += 4; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); st[1].wYear -= 3;

1 0

Juan Lang : wininet: Use CertNameToStr for INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 89529f8a8ebcdf63fb176e853a59158cbdf39da4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89529f8a8ebcdf63fb176e8… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 16 12:19:00 2006 +0100 wininet: Use CertNameToStr for INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT and update comment. --- dlls/wininet/internet.c | 51 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index abb0825..f52103d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2259,15 +2259,56 @@ static BOOL INET_QueryOptionHelper(BOOL if (context) { LPINTERNET_CERTIFICATE_INFOW info = (LPINTERNET_CERTIFICATE_INFOW)lpBuffer; + DWORD strLen; + memset(info,0,sizeof(INTERNET_CERTIFICATE_INFOW)); info->ftExpiry = context->pCertInfo->NotAfter; info->ftStart = context->pCertInfo->NotBefore; + if (bIsUnicode) + { + strLen = CertNameToStrW(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + NULL, 0); + info->lpszSubjectInfo = LocalAlloc(0, + strLen * sizeof(WCHAR)); + if (info->lpszSubjectInfo) + CertNameToStrW(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + info->lpszSubjectInfo, strLen); + strLen = CertNameToStrW(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + NULL, 0); + info->lpszIssuerInfo = LocalAlloc(0, + strLen * sizeof(WCHAR)); + if (info->lpszIssuerInfo) + CertNameToStrW(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + info->lpszIssuerInfo, strLen); + } + else + { + LPINTERNET_CERTIFICATE_INFOA infoA = + (LPINTERNET_CERTIFICATE_INFOA)info; + + strLen = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + NULL, 0); + infoA->lpszSubjectInfo = LocalAlloc(0, strLen); + if (infoA->lpszSubjectInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + infoA->lpszSubjectInfo, strLen); + strLen = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + NULL, 0); + infoA->lpszIssuerInfo = LocalAlloc(0, strLen); + if (infoA->lpszIssuerInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + infoA->lpszIssuerInfo, strLen); + } /* - * CertNameToStr implement requred for - * lpszSubjectInfo - * lpszIssuerInfo - * - * also need to set: + * Contrary to MSDN, these do not appear to be set. * lpszProtocolName * lpszSignatureAlgName * lpszEncryptionAlgName

1 0

Juan Lang : crypt32: Fix system stores and a memory leak.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: e9c44cc0c48203ab239d70af2af9788010eda8f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9c44cc0c48203ab239d70a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 16 12:18:37 2006 +0100 crypt32: Fix system stores and a memory leak. - system stores open both HKLM and HKCU for "current user" locations - fix a memory leak in certificate properties --- dlls/crypt32/cert.c | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c48a5dd..6b6a08d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1718,12 +1718,27 @@ static PWINECRYPT_CERTSTORE CRYPT_SysOpe { store = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - if (store) + CertAddStoreToCollection(store, regStore, + dwFlags & CERT_STORE_READONLY_FLAG ? 0 : + CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); + CertCloseStore(regStore, 0); + /* CERT_SYSTEM_STORE_CURRENT_USER returns both the HKCU and HKLM + * stores. + */ + if ((dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) == + CERT_SYSTEM_STORE_CURRENT_USER) { - CertAddStoreToCollection(store, regStore, - dwFlags & CERT_STORE_READONLY_FLAG ? 0 : - CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); - CertCloseStore(regStore, 0); + dwFlags &= ~CERT_SYSTEM_STORE_CURRENT_USER; + dwFlags |= CERT_SYSTEM_STORE_LOCAL_MACHINE; + regStore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, + hCryptProv, dwFlags, pvPara); + if (regStore) + { + CertAddStoreToCollection(store, regStore, + dwFlags & CERT_STORE_READONLY_FLAG ? 0 : + CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); + CertCloseStore(regStore, 0); + } } } } @@ -2227,15 +2242,19 @@ static BOOL CRYPT_SaveCertificateContext if (!cbData || data) { PWINE_CERT_PROPERTY prop; + BOOL found = FALSE; EnterCriticalSection(&context->cs); LIST_FOR_EACH_ENTRY(prop, &context->extendedProperties, WINE_CERT_PROPERTY, entry) { if (prop->hdr.propID == dwPropId) + { + found = TRUE; break; + } } - if (prop && prop->entry.next != &context->extendedProperties) + if (found) { CryptMemFree(prop->pbData); prop->hdr.cb = cbData;

1 0