Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[fireball] 34369: Autosyncing with Wine HEAD

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jul 8 11:39:29 2008 New Revision: 34369 URL: http://svn.reactos.org/svn/reactos?rev=34369&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/mshtml/Da.rc (with props) trunk/reactos/dll/win32/mshtml/dispex.c (with props) trunk/reactos/dll/win32/mshtml/htmlcomment.c (with props) trunk/reactos/dll/win32/mshtml/htmlevent.c (with props) trunk/reactos/dll/win32/mshtml/htmlgeneric.c (with props) trunk/reactos/dll/win32/mshtml/htmlimg.c (with props) trunk/reactos/dll/win32/mshtml/htmltextnode.c (with props) trunk/reactos/include/psdk/activaut.idl trunk/reactos/include/psdk/activdbg.idl Modified: trunk/reactos/dll/win32/mshtml/Fi.rc trunk/reactos/dll/win32/mshtml/Hu.rc trunk/reactos/dll/win32/mshtml/No.rc trunk/reactos/dll/win32/mshtml/Ru.rc trunk/reactos/dll/win32/mshtml/Sv.rc trunk/reactos/dll/win32/mshtml/htmlanchor.c trunk/reactos/dll/win32/mshtml/htmlbody.c trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmldoc3.c trunk/reactos/dll/win32/mshtml/htmlelem.c trunk/reactos/dll/win32/mshtml/htmlelem2.c trunk/reactos/dll/win32/mshtml/htmlinput.c trunk/reactos/dll/win32/mshtml/htmlnode.c trunk/reactos/dll/win32/mshtml/htmloption.c trunk/reactos/dll/win32/mshtml/htmlscript.c trunk/reactos/dll/win32/mshtml/htmlselect.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmltable.c trunk/reactos/dll/win32/mshtml/htmltextarea.c trunk/reactos/dll/win32/mshtml/htmlwindow.c trunk/reactos/dll/win32/mshtml/install.c trunk/reactos/dll/win32/mshtml/main.c trunk/reactos/dll/win32/mshtml/mshtml.inf trunk/reactos/dll/win32/mshtml/mshtml.rbuild trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/navigate.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsevents.c trunk/reactos/dll/win32/mshtml/nsiface.idl trunk/reactos/dll/win32/mshtml/nsio.c trunk/reactos/dll/win32/mshtml/oleobj.c trunk/reactos/dll/win32/mshtml/omnavigator.c trunk/reactos/dll/win32/mshtml/protocol.c trunk/reactos/dll/win32/mshtml/rsrc.rc trunk/reactos/dll/win32/mshtml/script.c trunk/reactos/dll/win32/mshtml/task.c trunk/reactos/dll/win32/mshtml/txtrange.c trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtmhst.idl trunk/reactos/include/psdk/mshtml.idl trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/psdk/urlhist.idl trunk/reactos/include/psdk/urlmon.idl [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/mshtml/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Da.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Fi.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Hu.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/No.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ru.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Sv.rc?rev… Added: trunk/reactos/dll/win32/mshtml/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/dispex.c?… Modified: trunk/reactos/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho… Modified: trunk/reactos/dll/win32/mshtml/htmlbody.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlbody.… Added: trunk/reactos/dll/win32/mshtml/htmlcomment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcomme… Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… Modified: trunk/reactos/dll/win32/mshtml/htmldoc3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc3.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2… Added: trunk/reactos/dll/win32/mshtml/htmlevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Added: trunk/reactos/dll/win32/mshtml/htmlgeneric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlgener… Added: trunk/reactos/dll/win32/mshtml/htmlimg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlimg.c… Modified: trunk/reactos/dll/win32/mshtml/htmlinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlinput… Modified: trunk/reactos/dll/win32/mshtml/htmlnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlnode.… Modified: trunk/reactos/dll/win32/mshtml/htmloption.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmloptio… Modified: trunk/reactos/dll/win32/mshtml/htmlscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip… Modified: trunk/reactos/dll/win32/mshtml/htmlselect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlselec… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmltextarea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltexta… Added: trunk/reactos/dll/win32/mshtml/htmltextnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextn… Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo… Modified: trunk/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c… Modified: trunk/reactos/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re… Modified: trunk/reactos/dll/win32/mshtml/mshtml.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.in… Modified: trunk/reactos/dll/win32/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.rb… Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… Modified: trunk/reactos/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.… Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… Modified: trunk/reactos/dll/win32/mshtml/nsevents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsevents.… Modified: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… Modified: trunk/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re… Modified: trunk/reactos/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?… Modified: trunk/reactos/dll/win32/mshtml/omnavigator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/omnavigat… Modified: trunk/reactos/dll/win32/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/protocol.… Modified: trunk/reactos/dll/win32/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r… Modified: trunk/reactos/dll/win32/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?… Modified: trunk/reactos/dll/win32/mshtml/task.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/task.c?re… Modified: trunk/reactos/dll/win32/mshtml/txtrange.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/txtrange.… Added: trunk/reactos/include/psdk/activaut.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activaut.idl?… Added: trunk/reactos/include/psdk/activdbg.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activdbg.idl?… Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… Modified: trunk/reactos/include/psdk/mshtmhst.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmhst.idl?… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… Modified: trunk/reactos/include/psdk/urlhist.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlhist.idl?r… Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re…

16 years, 5 months

[pschweitzer] 34368: Synced riched20_winetest.exe with Wine HEAD

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Jul 8 05:09:42 2008 New Revision: 34368 URL: http://svn.reactos.org/svn/reactos?rev=34368&view=rev Log: Synced riched20_winetest.exe with Wine HEAD Added: trunk/rostests/winetests/riched20/richole.c (with props) Modified: trunk/rostests/winetests/riched20/editor.c trunk/rostests/winetests/riched20/riched20.rbuild trunk/rostests/winetests/riched20/testlist.c Modified: trunk/rostests/winetests/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/editor… ============================================================================== --- trunk/rostests/winetests/riched20/editor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/editor.c [iso-8859-1] Tue Jul 8 05:09:42 2008 @@ -47,6 +47,40 @@ return new_window(RICHEDIT_CLASS, ES_MULTILINE, parent); } +static void processPendingMessages(void) +{ + MSG msg; + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } +} + +static void pressKeyWithModifier(HWND hwnd, BYTE mod_vk, BYTE vk) +{ + BYTE mod_scan_code = MapVirtualKey(mod_vk, MAPVK_VK_TO_VSC); + BYTE scan_code = MapVirtualKey(vk, MAPVK_VK_TO_VSC); + SetFocus(hwnd); + keybd_event(mod_vk, mod_scan_code, 0, 0); + keybd_event(vk, scan_code, 0, 0); + keybd_event(vk, scan_code, KEYEVENTF_KEYUP, 0); + keybd_event(mod_vk, mod_scan_code, KEYEVENTF_KEYUP, 0); + processPendingMessages(); +} + +static void simulate_typing_characters(HWND hwnd, const char* szChars) +{ + int ret; + + while (*szChars != '\0') { + SendMessageA(hwnd, WM_KEYDOWN, *szChars, 1); + ret = SendMessageA(hwnd, WM_CHAR, *szChars, 1); + ok(ret == 0, "WM_CHAR('%c') ret=%d\n", *szChars, ret); + SendMessageA(hwnd, WM_KEYUP, *szChars, 1); + szChars++; + } +} + static const char haystack[] = "WINEWine wineWine wine WineWine"; /* ^0 ^10 ^20 ^30 */ @@ -141,14 +175,16 @@ ft.lpstrText = f->needle; findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &ft); ok(findloc == f->expected_loc, - "EM_FINDTEXT(%s,%d) '%s' in range(%d,%d), flags %08x, got start at %d\n", - name, id, f->needle, f->start, f->end, f->flags, findloc); + "EM_FINDTEXT(%s,%d) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); } static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, int id) { int findloc; FINDTEXTEX ft; + int expected_end_loc; + memset(&ft, 0, sizeof(ft)); ft.chrg.cpMin = f->start; ft.chrg.cpMax = f->end; @@ -160,10 +196,11 @@ ok(ft.chrgText.cpMin == f->expected_loc, "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin); - ok(ft.chrgText.cpMax == ((f->expected_loc == -1) ? -1 - : f->expected_loc + strlen(f->needle)), - "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d\n", - name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax); + expected_end_loc = ((f->expected_loc == -1) ? -1 + : f->expected_loc + strlen(f->needle)); + ok(ft.chrgText.cpMax == expected_end_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax, expected_end_loc); } static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *find, @@ -187,6 +224,7 @@ static void test_EM_FINDTEXT(void) { HWND hwndRichEdit = new_richedit(NULL); + CHARFORMAT2 cf2; /* Empty rich edit control */ run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, @@ -196,6 +234,30 @@ /* Haystack text */ run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, + sizeof(find_tests2)/sizeof(struct find_s)); + + /* Setting a format on an arbitrary range should have no effect in search + results. This tests correct offset reporting across runs. */ + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, (WPARAM) SCF_DEFAULT, + (LPARAM) &cf2); + cf2.dwMask = CFM_ITALIC | cf2.dwMask; + cf2.dwEffects = CFE_ITALIC ^ cf2.dwEffects; + SendMessage(hwndRichEdit, EM_SETSEL, 6, 20); + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Haystack text, again */ + run_tests_EM_FINDTEXT(hwndRichEdit, "2-bis", find_tests2, + sizeof(find_tests2)/sizeof(struct find_s)); + + /* Yet another range */ + cf2.dwMask = CFM_BOLD | cf2.dwMask; + cf2.dwEffects = CFE_BOLD ^ cf2.dwEffects; + SendMessage(hwndRichEdit, EM_SETSEL, 11, 15); + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Haystack text, again */ + run_tests_EM_FINDTEXT(hwndRichEdit, "2-bisbis", find_tests2, sizeof(find_tests2)/sizeof(struct find_s)); DestroyWindow(hwndRichEdit); @@ -369,11 +431,141 @@ DestroyWindow(hwndRichEdit); } +static void test_EM_POSFROMCHAR(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + int i; + LRESULT result; + unsigned int height = 0; + int xpos = 0; + static 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"; + + /* Fill the control to lines to ensure that most of them are offscreen */ + for (i = 0; i < 50; i++) + { + /* Do not modify the string; it is exactly 16 characters long. */ + SendMessage(hwndRichEdit, EM_SETSEL, 0, 0); + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"0123456789ABCDE\n"); + } + + /* + Richedit 1.0 receives a POINTL* on wParam and character offset on lParam, returns void. + Richedit 2.0 receives character offset on wParam, ignores lParam, returns MAKELONG(x,y) + Richedit 3.0 accepts either of the above API conventions. + */ + + /* Testing Richedit 2.0 API format */ + + /* Testing start of lines. X-offset should be constant on all cases (native is 1). + Since all lines are identical and drawn with the same font, + they should have the same height... right? + */ + for (i = 0; i < 50; i++) + { + /* All the lines are 16 characters long */ + result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, i * 16, 0); + if (i == 0) + { + ok(HIWORD(result) == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", HIWORD(result)); + todo_wine { + ok(LOWORD(result) == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + } + xpos = LOWORD(result); + } + else if (i == 1) + { + ok(HIWORD(result) > 0, "EM_POSFROMCHAR reports y=%d, expected > 0\n", HIWORD(result)); + ok(LOWORD(result) == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + height = HIWORD(result); + } + else + { + ok(HIWORD(result) == i * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", HIWORD(result), i * height); + ok(LOWORD(result) == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + } + } + + /* Testing position at end of text */ + result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, 50 * 16, 0); + ok(HIWORD(result) == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", HIWORD(result), 50 * height); + ok(LOWORD(result) == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + + /* Testing position way past end of text */ + result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, 55 * 16, 0); + ok(HIWORD(result) == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", HIWORD(result), 50 * height); + ok(LOWORD(result) == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + + /* Testing that vertical scrolling does, in fact, have an effect on EM_POSFROMCHAR */ + SendMessage(hwndRichEdit, EM_SCROLL, SB_LINEDOWN, 0); /* line down */ + for (i = 0; i < 50; i++) + { + /* All the lines are 16 characters long */ + result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, i * 16, 0); + ok((signed short)(HIWORD(result)) == (i - 1) * height, + "EM_POSFROMCHAR reports y=%hd, expected %d\n", + (signed short)(HIWORD(result)), (i - 1) * height); + ok(LOWORD(result) == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + } + + /* Testing position at end of text */ + result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, 50 * 16, 0); + ok(HIWORD(result) == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", HIWORD(result), (50 - 1) * height); + ok(LOWORD(result) == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + + /* Testing position way past end of text */ + result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, 55 * 16, 0); + ok(HIWORD(result) == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", HIWORD(result), (50 - 1) * height); + ok(LOWORD(result) == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + + /* Testing that horizontal scrolling does, in fact, have an effect on EM_POSFROMCHAR */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + SendMessage(hwndRichEdit, EM_SCROLL, SB_LINEUP, 0); /* line up */ + + result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, 0, 0); + ok(HIWORD(result) == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", HIWORD(result)); + todo_wine { + ok(LOWORD(result) == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); + } + xpos = LOWORD(result); + + SendMessage(hwndRichEdit, WM_HSCROLL, SB_LINERIGHT, 0); + result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, 0, 0); + ok(HIWORD(result) == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", HIWORD(result)); + todo_wine { + /* Fails on builtin because horizontal scrollbar is not being shown */ + ok((signed short)(LOWORD(result)) < xpos, + "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", + (signed short)(LOWORD(result)), xpos); + } + DestroyWindow(hwndRichEdit); +} + static void test_EM_SETCHARFORMAT(void) { HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2 cf2; int rc = 0; + int tested_effects[] = { + CFE_BOLD, + CFE_ITALIC, + CFE_UNDERLINE, + CFE_STRIKEOUT, + CFE_PROTECTED, + CFE_LINK, + CFE_SUBSCRIPT, + CFE_SUPERSCRIPT, + 0 + }; + int i; + CHARRANGE cr; /* Invalid flags, CHARFORMAT2 structure blanked out */ memset(&cf2, 0, sizeof(cf2)); @@ -411,6 +603,9 @@ rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) 0xfffffff0, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + ok(rc == FALSE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ memset(&cf2, 0, sizeof(cf2)); @@ -418,6 +613,9 @@ rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_DEFAULT, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + todo_wine ok(rc == FALSE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ memset(&cf2, 0, sizeof(cf2)); @@ -425,6 +623,9 @@ rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + ok(rc == FALSE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ memset(&cf2, 0, sizeof(cf2)); @@ -432,6 +633,9 @@ rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_WORD, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + todo_wine ok(rc == TRUE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ memset(&cf2, 0, sizeof(cf2)); @@ -439,6 +643,9 @@ rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + todo_wine ok(rc == TRUE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); cf2.cbSize = sizeof(CHARFORMAT2); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, (WPARAM) SCF_DEFAULT, @@ -492,6 +699,251 @@ ok(rc == -1, "Text not marked as modified, expected modified! (%d)\n", rc); DestroyWindow(hwndRichEdit); + + /* EM_GETCHARFORMAT tests */ + for (i = 0; tested_effects[i]; i++) + { + hwndRichEdit = new_richedit(NULL); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + + /* Need to set a TrueType font to get consistent CFM_BOLD results */ + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_FACE|CFM_WEIGHT; + cf2.dwEffects = 0; + strcpy(cf2.szFaceName, "Courier New"); + cf2.wWeight = FW_DONTCARE; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) &cf2); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 4); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == 0, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x clear\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = tested_effects[i]; + if (cf2.dwMask == CFE_SUBSCRIPT || cf2.dwMask == CFE_SUPERSCRIPT) + cf2.dwMask = CFM_SUPERSCRIPT; + cf2.dwEffects = tested_effects[i]; + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == tested_effects[i], + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 4); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == 0, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x clear\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 1, 3); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == 0) + || + (cf2.dwMask & tested_effects[i]) == 0), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x clear\n", i, cf2.dwMask, tested_effects[i]); + + DestroyWindow(hwndRichEdit); + } + + for (i = 0; tested_effects[i]; i++) + { + hwndRichEdit = new_richedit(NULL); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + + /* Need to set a TrueType font to get consistent CFM_BOLD results */ + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_FACE|CFM_WEIGHT; + cf2.dwEffects = 0; + strcpy(cf2.szFaceName, "Courier New"); + cf2.wWeight = FW_DONTCARE; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) &cf2); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = tested_effects[i]; + if (cf2.dwMask == CFE_SUBSCRIPT || cf2.dwMask == CFE_SUPERSCRIPT) + cf2.dwMask = CFM_SUPERSCRIPT; + cf2.dwEffects = tested_effects[i]; + SendMessage(hwndRichEdit, EM_SETSEL, 2, 4); + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == 0, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x clear\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 4); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == tested_effects[i], + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 1, 3); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == 0) + || + (cf2.dwMask & tested_effects[i]) == 0), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x clear\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == tested_effects[i], + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x set\n", i, cf2.dwEffects, tested_effects[i]); + + DestroyWindow(hwndRichEdit); + } + + /* Effects applied on an empty selection should take effect when selection is + replaced with text */ + hwndRichEdit = new_richedit(NULL); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Selection is now nonempty */ + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 6); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + ok (((cf2.dwMask & CFM_BOLD) == CFM_BOLD), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, CFM_BOLD); + ok((cf2.dwEffects & CFE_BOLD) == CFE_BOLD, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + + + /* Set two effects on an empty selection */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + cf2.dwMask = CFM_ITALIC; + cf2.dwEffects = CFE_ITALIC; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Selection is now nonempty */ + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 6); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + ok (((cf2.dwMask & (CFM_BOLD|CFM_ITALIC)) == (CFM_BOLD|CFM_ITALIC)), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, (CFM_BOLD|CFM_ITALIC)); + ok((cf2.dwEffects & (CFE_BOLD|CFE_ITALIC)) == (CFE_BOLD|CFE_ITALIC), + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, (CFE_BOLD|CFE_ITALIC)); + + /* Setting the (empty) selection to exactly the same place as before should + NOT clear the insertion style! */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Empty selection in same place, insert style should NOT be forgotten here. */ + SendMessage(hwndRichEdit, EM_SETSEL, 2, 2); + + /* Selection is now nonempty */ + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 6); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + ok (((cf2.dwMask & CFM_BOLD) == CFM_BOLD), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, CFM_BOLD); + ok((cf2.dwEffects & CFE_BOLD) == CFE_BOLD, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + + /* Ditto with EM_EXSETSEL */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + cr.cpMin = 2; cr.cpMax = 2; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Empty selection in same place, insert style should NOT be forgotten here. */ + cr.cpMin = 2; cr.cpMax = 2; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* Empty selection */ + + /* Selection is now nonempty */ + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cr.cpMin = 2; cr.cpMax = 6; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* Empty selection */ + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + ok (((cf2.dwMask & CFM_BOLD) == CFM_BOLD), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, CFM_BOLD); + ok((cf2.dwEffects & CFE_BOLD) == CFE_BOLD, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + + DestroyWindow(hwndRichEdit); } static void test_EM_SETTEXTMODE(void) @@ -901,14 +1353,20 @@ DestroyWindow(hwndRichEdit); } +static int check_CFE_LINK_selection(HWND hwnd, int sel_start, int sel_end) +{ + CHARFORMAT2W text_format; + text_format.cbSize = sizeof(text_format); + SendMessage(hwnd, EM_SETSEL, sel_start, sel_end); + SendMessage(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &text_format); + return (text_format.dwEffects & CFE_LINK) ? 1 : 0; +} + static void check_CFE_LINK_rcvd(HWND hwnd, int is_url, const char * url) { - CHARFORMAT2W text_format; int link_present = 0; - text_format.cbSize = sizeof(text_format); - SendMessage(hwnd, EM_SETSEL, 0, 1); - SendMessage(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &text_format); - link_present = text_format.dwEffects & CFE_LINK; + + link_present = check_CFE_LINK_selection(hwnd, 0, 1); if (is_url) { /* control text is url; should get CFE_LINK */ ok(0 != link_present, "URL Case: CFE_LINK not set for [%s].\n", url); @@ -943,9 +1401,69 @@ {"wais:waisserver", 1} }; - int i; + int i, j; int urlRet=-1; HWND hwndRichEdit, parent; + + /* All of the following should cause the URL to be detected */ + const char * templates_delim[] = { + "This is some text with X on it", + "This is some text with (X) on it", + "This is some text with X\r on it", + "This is some text with ---X--- on it", + "This is some text with \"X\" on it", + "This is some text with 'X' on it", + "This is some text with 'X' on it", + "This is some text with :X: on it", + + "This text ends with X", + + "This is some text with X) on it", + "This is some text with X--- on it", + "This is some text with X\" on it", + "This is some text with X' on it", + "This is some text with X: on it", + + "This is some text with (X on it", + "This is some text with \rX on it", + "This is some text with ---X on it", + "This is some text with \"X on it", + "This is some text with 'X on it", + "This is some text with :X on it", + }; + /* None of these should cause the URL to be detected */ + const char * templates_non_delim[] = { + "This is some text with |X| on it", + "This is some text with *X* on it", + "This is some text with /X/ on it", + "This is some text with +X+ on it", + "This is some text with %X% on it", + "This is some text with #X# on it", + "This is some text with @X@ on it", + "This is some text with \\X\\ on it", + "This is some text with |X on it", + "This is some text with *X on it", + "This is some text with /X on it", + "This is some text with +X on it", + "This is some text with %X on it", + "This is some text with #X on it", + "This is some text with @X on it", + "This is some text with \\X on it", + }; + /* All of these cause the URL detection to be extended by one more byte, + thus demonstrating that the tested character is considered as part + of the URL. */ + const char * templates_xten_delim[] = { + "This is some text with X| on it", + "This is some text with X* on it", + "This is some text with X/ on it", + "This is some text with X+ on it", + "This is some text with X% on it", + "This is some text with X# on it", + "This is some text with X@ on it", + "This is some text with X\\ on it", + }; + char buffer[1024]; parent = new_static_wnd(NULL); hwndRichEdit = new_richedit(parent); @@ -961,16 +1479,612 @@ ok(urlRet==E_INVALIDARG, "Bad wParam2: urlRet is: %d\n", urlRet); /* for each url, check the text to see if CFE_LINK effect is present */ for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); - SendMessage(hwndRichEdit, WM_CHAR, 0, 0); check_CFE_LINK_rcvd(hwndRichEdit, 0, urls[i].text); + + /* Link detection should happen immediately upon WM_SETTEXT */ SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); - SendMessage(hwndRichEdit, WM_CHAR, 0, 0); check_CFE_LINK_rcvd(hwndRichEdit, urls[i].is_url, urls[i].text); } DestroyWindow(hwndRichEdit); + + /* Test detection of URLs within normal text - WM_SETTEXT case. */ + for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + hwndRichEdit = new_richedit(parent); + + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + strncpy(buffer, templates_delim[j], at_offset); + buffer[at_offset] = '\0'; + strcat(buffer, urls[i].text); + strcat(buffer, templates_delim[j] + at_offset + 1); + end_offset = at_offset + strlen(urls[i].text); + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + for (j = 0; j < sizeof(templates_non_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_non_delim[j], 'X'); + at_offset = at_pos - templates_non_delim[j]; + strncpy(buffer, templates_non_delim[j], at_offset); + buffer[at_offset] = '\0'; + strcat(buffer, urls[i].text); + strcat(buffer, templates_non_delim[j] + at_offset + 1); + end_offset = at_offset + strlen(urls[i].text); + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + for (j = 0; j < sizeof(templates_xten_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_xten_delim[j], 'X'); + at_offset = at_pos - templates_xten_delim[j]; + strncpy(buffer, templates_xten_delim[j], at_offset); + buffer[at_offset] = '\0'; + strcat(buffer, urls[i].text); + strcat(buffer, templates_xten_delim[j] + at_offset + 1); + end_offset = at_offset + strlen(urls[i].text); + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset, end_offset +1, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset +1, buffer); + } + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset + 2, buffer); + if (buffer[end_offset +2] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +2, end_offset +3), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +2, end_offset +3, buffer); + } + } + } + + DestroyWindow(hwndRichEdit); + hwndRichEdit = NULL; + } + + /* Test detection of URLs within normal text - WM_CHAR case. */ + for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + hwndRichEdit = new_richedit(parent); + + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + int u, v; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + end_offset = at_offset + strlen(urls[i].text); + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, 0); + for (u = 0; templates_delim[j][u]; u++) { + if (templates_delim[j][u] == '\r') { + simulate_typing_characters(hwndRichEdit, "\r"); + } else if (templates_delim[j][u] != 'X') { + SendMessage(hwndRichEdit, WM_CHAR, templates_delim[j][u], 1); + } else { + for (v = 0; urls[i].text[v]; v++) { + SendMessage(hwndRichEdit, WM_CHAR, urls[i].text[v], 1); + } + } + } + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + trace("Using template: %s\n", templates_delim[j]); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + + /* The following will insert a paragraph break after the first character + of the URL candidate, thus breaking the URL. It is expected that the + CFE_LINK attribute should break across both pieces of the URL */ + SendMessage(hwndRichEdit, EM_SETSEL, at_offset+1, at_offset+1); + simulate_typing_characters(hwndRichEdit, "\r"); + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + /* end_offset moved because of paragraph break */ + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset+1, buffer); + ok(buffer[end_offset], "buffer \"%s\" ended prematurely. Is it missing a newline character?\n", buffer); + if (buffer[end_offset] != 0 && buffer[end_offset+1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset+1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset+1, end_offset +2, buffer); + if (buffer[end_offset +2] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +2, end_offset +3), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +2, end_offset +3, buffer); + } + } + + /* The following will remove the just-inserted paragraph break, thus + restoring the URL */ + SendMessage(hwndRichEdit, EM_SETSEL, at_offset+2, at_offset+2); + simulate_typing_characters(hwndRichEdit, "\b"); + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + DestroyWindow(hwndRichEdit); + hwndRichEdit = NULL; + } + + /* Test detection of URLs within normal text - EM_SETTEXTEX case. */ + for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + SETTEXTEX st; + + hwndRichEdit = new_richedit(parent); + + /* There are at least three ways in which EM_SETTEXTEX must cause URLs to + be detected: + 1) Set entire text, a la WM_SETTEXT + 2) Set a selection of the text to the URL + 3) Set a portion of the text at a time, which eventually results in + an URL + All of them should give equivalent results + */ + + /* Set entire text in one go, like WM_SETTEXT */ + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + st.codepage = CP_ACP; + st.flags = ST_DEFAULT; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + strncpy(buffer, templates_delim[j], at_offset); + buffer[at_offset] = '\0'; + strcat(buffer, urls[i].text); + strcat(buffer, templates_delim[j] + at_offset + 1); + end_offset = at_offset + strlen(urls[i].text); + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&st, (LPARAM) buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + /* Set selection with X to the URL */ + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + end_offset = at_offset + strlen(urls[i].text); + + st.codepage = CP_ACP; + st.flags = ST_DEFAULT; + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&st, (LPARAM) templates_delim[j]); + st.flags = ST_SELECTION; + SendMessage(hwndRichEdit, EM_SETSEL, at_offset, at_offset+1); + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&st, (LPARAM) urls[i].text); + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + /* Set selection with X to the first character of the URL, then the rest */ + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + end_offset = at_offset + strlen(urls[i].text); + + strcpy(buffer, "YY"); + buffer[0] = urls[i].text[0]; + + st.codepage = CP_ACP; + st.flags = ST_DEFAULT; + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&st, (LPARAM) templates_delim[j]); + st.flags = ST_SELECTION; + SendMessage(hwndRichEdit, EM_SETSEL, at_offset, at_offset+1); + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&st, (LPARAM) buffer); + SendMessage(hwndRichEdit, EM_SETSEL, at_offset+1, at_offset+2); + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)(urls[i].text + 1)); + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + DestroyWindow(hwndRichEdit); + hwndRichEdit = NULL; + } + + /* Test detection of URLs within normal text - EM_REPLACESEL case. */ + for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + hwndRichEdit = new_richedit(parent); + + /* Set selection with X to the URL */ + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + end_offset = at_offset + strlen(urls[i].text); + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) templates_delim[j]); + SendMessage(hwndRichEdit, EM_SETSEL, at_offset, at_offset+1); + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) urls[i].text); + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + /* Set selection with X to the first character of the URL, then the rest */ + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + end_offset = at_offset + strlen(urls[i].text); + + strcpy(buffer, "YY"); + buffer[0] = urls[i].text[0]; + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) templates_delim[j]); + SendMessage(hwndRichEdit, EM_SETSEL, at_offset, at_offset+1); + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) buffer); + SendMessage(hwndRichEdit, EM_SETSEL, at_offset+1, at_offset+2); + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)(urls[i].text + 1)); + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + DestroyWindow(hwndRichEdit); + hwndRichEdit = NULL; + } + DestroyWindow(parent); } @@ -2353,23 +3467,18 @@ r = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); + if (!redraw) + /* This is needed to avoid interferring with keybd_event calls + * on other tests that simulate keyboard events. */ + SendMessage(hwndRichEdit, WM_SETREDRAW, TRUE, 0); + DestroyWindow(hwndRichEdit); } static void test_WM_PASTE(void) { - MSG msg; int result; char buffer[1024] = {0}; - char key_info[][3] = - { - /* VirtualKey, ScanCode, WM_CHAR code */ - {'C', 0x2e, 3}, /* Ctrl-C */ - {'X', 0x2d, 24}, /* Ctrl-X */ - {'V', 0x2f, 22}, /* Ctrl-V */ - {'Z', 0x2c, 26}, /* Ctrl-Z */ - {'Y', 0x15, 25}, /* Ctrl-Y */ - }; const char* text1 = "testing paste\r"; const char* text1_step1 = "testing paste\r\ntesting paste\r\n"; const char* text1_after = "testing paste\r\n"; @@ -2382,34 +3491,25 @@ messages, probably because it inspects the keyboard state itself. Therefore, native requires this in order to obey Ctrl-<key> keystrokes. */ -#define SEND_CTRL_KEY(hwnd, k) \ - keybd_event(VK_CONTROL, 0x1d, 0, 0);\ - keybd_event(k[0], k[1], 0, 0);\ - keybd_event(k[0], k[1], KEYEVENTF_KEYUP, 0);\ - keybd_event(VK_CONTROL, 0x1d, KEYEVENTF_KEYUP, 0); \ - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { \ - TranslateMessage(&msg); \ - DispatchMessage(&msg); \ - } - -#define SEND_CTRL_C(hwnd) SEND_CTRL_KEY(hwnd, key_info[0]) -#define SEND_CTRL_X(hwnd) SEND_CTRL_KEY(hwnd, key_info[1]) -#define SEND_CTRL_V(hwnd) SEND_CTRL_KEY(hwnd, key_info[2]) -#define SEND_CTRL_Z(hwnd) SEND_CTRL_KEY(hwnd, key_info[3]) -#define SEND_CTRL_Y(hwnd) SEND_CTRL_KEY(hwnd, key_info[4]) + +#define SEND_CTRL_C(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'C') +#define SEND_CTRL_X(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'X') +#define SEND_CTRL_V(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'V') +#define SEND_CTRL_Z(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'Z') +#define SEND_CTRL_Y(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, 'Y') SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text1); SendMessage(hwndRichEdit, EM_SETSEL, 0, 14); - SEND_CTRL_C(hwndRichEdit) /* Copy */ + SEND_CTRL_C(hwndRichEdit); /* Copy */ SendMessage(hwndRichEdit, EM_SETSEL, 14, 14); - SEND_CTRL_V(hwndRichEdit) /* Paste */ + SEND_CTRL_V(hwndRichEdit); /* Paste */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Pasted text should be visible at this step */ result = strcmp(text1_step1, buffer); ok(result == 0, "test paste: strcmp = %i\n", result); - SEND_CTRL_Z(hwndRichEdit) /* Undo */ + SEND_CTRL_Z(hwndRichEdit); /* Undo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ result = strcmp(text1_after, buffer); @@ -2418,21 +3518,21 @@ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text2); SendMessage(hwndRichEdit, EM_SETSEL, 8, 13); - SEND_CTRL_C(hwndRichEdit) /* Copy */ + SEND_CTRL_C(hwndRichEdit); /* Copy */ SendMessage(hwndRichEdit, EM_SETSEL, 14, 14); - SEND_CTRL_V(hwndRichEdit) /* Paste */ + SEND_CTRL_V(hwndRichEdit); /* Paste */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Pasted text should be visible at this step */ result = strcmp(text3, buffer); ok(result == 0, "test paste: strcmp = %i\n", result); - SEND_CTRL_Z(hwndRichEdit) /* Undo */ + SEND_CTRL_Z(hwndRichEdit); /* Undo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ result = strcmp(text2_after, buffer); ok(result == 0, "test paste: strcmp = %i\n", result); - SEND_CTRL_Y(hwndRichEdit) /* Redo */ + SEND_CTRL_Y(hwndRichEdit); /* Redo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Text should revert to post-paste state */ result = strcmp(buffer,text3); @@ -2531,6 +3631,30 @@ return 0; } +struct StringWithLength { + int length; + char *buffer; +}; + +/* This callback is used to handled the null characters in a string. */ +static DWORD CALLBACK test_EM_STREAMIN_esCallback2(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + struct StringWithLength* str = (struct StringWithLength*)dwCookie; + int size = str->length; + *pcb = cb; + if (*pcb > size) { + *pcb = size; + } + if (*pcb > 0) { + memcpy(pbBuff, str->buffer, *pcb); + str->buffer += *pcb; + str->length -= *pcb; + } + return 0; +} static void test_EM_STREAMIN(void) { @@ -2560,6 +3684,15 @@ const char * streamText3 = "RichEdit1"; + struct StringWithLength cookieForStream4; + const char * streamText4 = + "This text just needs to be long enough to cause run to be split onto "\ + "two seperate lines and make sure the null terminating character is "\ + "handled properly.\0"; + int length4 = strlen(streamText4) + 1; + cookieForStream4.buffer = (char *)streamText4; + cookieForStream4.length = length4; + /* Minimal test without \par at the end */ es.dwCookie = (DWORD_PTR)&streamText0; es.dwError = 0; @@ -2642,6 +3775,17 @@ ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); ok(es.dwError == -16, "EM_STREAMIN: Test 3 set error %d, expected %d\n", es.dwError, -16); + + es.dwCookie = (DWORD_PTR)&cookieForStream4; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback2; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_TEXT), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == length4, + "EM_STREAMIN: Test 4 returned %ld, expected %d\n", result, length4); + ok(es.dwError == 0, "EM_STREAMIN: Test 4 set error %d, expected %d\n", es.dwError, 0); DestroyWindow(hwndRichEdit); } @@ -2718,6 +3862,7 @@ "EM_STREAMIN with SFF_SELECTION and selection set " "should create an undo\n"); + DestroyWindow(hwndRichEdit); } static BOOL is_em_settextex_supported(HWND hwnd) @@ -3208,6 +4353,203 @@ DestroyWindow(parent); } +static void test_undo_coalescing(void) +{ + HWND hwnd; + int result; + char buffer[64] = {0}; + + /* multi-line control inserts CR normally */ + hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP|ES_MULTILINE, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + result = SendMessage(hwnd, EM_CANUNDO, 0, 0); + ok (result == FALSE, "Can undo after window creation.\n"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == FALSE, "Undo operation successful with nothing to undo.\n"); + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == FALSE, "Can redo after window creation.\n"); + result = SendMessage(hwnd, EM_REDO, 0, 0); + ok (result == FALSE, "Redo operation successful with nothing undone.\n"); + + /* Test the effect of arrows keys during typing on undo transactions*/ + simulate_typing_characters(hwnd, "one two three"); + SendMessage(hwnd, WM_KEYDOWN, VK_RIGHT, 1); + SendMessage(hwnd, WM_KEYUP, VK_RIGHT, 1); + simulate_typing_characters(hwnd, " four five six"); + + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == FALSE, "Can redo before anything is undone.\n"); + result = SendMessage(hwnd, EM_CANUNDO, 0, 0); + ok (result == TRUE, "Cannot undo typed characters.\n"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == TRUE, "EM_UNDO Failed to undo typed characters.\n"); + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == TRUE, "Cannot redo after undo.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "one two three"); + ok (result == 0, "expected '%s' but got '%s'\n", "one two three", buffer); + + result = SendMessage(hwnd, EM_CANUNDO, 0, 0); + ok (result == TRUE, "Cannot undo typed characters.\n"); + result = SendMessage(hwnd, WM_UNDO, 0, 0); + ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, ""); + ok (result == 0, "expected '%s' but got '%s'\n", "", buffer); + + /* Test the effect of focus changes during typing on undo transactions*/ + simulate_typing_characters(hwnd, "one two three"); + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == FALSE, "Redo buffer should have been cleared by typing.\n"); + SendMessage(hwnd, WM_KILLFOCUS, (WPARAM)NULL, 0); + SendMessage(hwnd, WM_SETFOCUS, (WPARAM)NULL, 0); + simulate_typing_characters(hwnd, " four five six"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "one two three"); + ok (result == 0, "expected '%s' but got '%s'\n", "one two three", buffer); + + /* Test the effect of the back key during typing on undo transactions */ + SendMessage(hwnd, EM_EMPTYUNDOBUFFER, 0, 0); + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + ok (result == TRUE, "Failed to clear the text.\n"); + simulate_typing_characters(hwnd, "one two threa"); + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == FALSE, "Redo buffer should have been cleared by typing.\n"); + SendMessage(hwnd, WM_KEYDOWN, VK_BACK, 1); + SendMessage(hwnd, WM_KEYUP, VK_BACK, 1); + simulate_typing_characters(hwnd, "e four five six"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, ""); + ok (result == 0, "expected '%s' but got '%s'\n", "", buffer); + + /* Test the effect of the delete key during typing on undo transactions */ + SendMessage(hwnd, EM_EMPTYUNDOBUFFER, 0, 0); + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"abcd"); + ok(result == TRUE, "Failed to set the text.\n"); + SendMessage(hwnd, EM_SETSEL, (WPARAM)1, (LPARAM)1); + SendMessage(hwnd, WM_KEYDOWN, VK_DELETE, 1); + SendMessage(hwnd, WM_KEYUP, VK_DELETE, 1); + SendMessage(hwnd, WM_KEYDOWN, VK_DELETE, 1); + SendMessage(hwnd, WM_KEYUP, VK_DELETE, 1); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "acd"); + ok (result == 0, "expected '%s' but got '%s'\n", "acd", buffer); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "abcd"); + ok (result == 0, "expected '%s' but got '%s'\n", "abcd", buffer); + + /* Test the effect of EM_STOPGROUPTYPING on undo transactions*/ + SendMessage(hwnd, EM_EMPTYUNDOBUFFER, 0, 0); + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + ok (result == TRUE, "Failed to clear the text.\n"); + simulate_typing_characters(hwnd, "one two three"); + result = SendMessage(hwnd, EM_STOPGROUPTYPING, 0, 0); + ok (result == 0, "expected %d but got %d\n", 0, result); + simulate_typing_characters(hwnd, " four five six"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "one two three"); + ok (result == 0, "expected '%s' but got '%s'\n", "one two three", buffer); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == TRUE, "Failed to undo typed characters.\n"); + ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, ""); + ok (result == 0, "expected '%s' but got '%s'\n", "", buffer); + + DestroyWindow(hwnd); +} + +#define SEND_CTRL_LEFT(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, VK_LEFT) +#define SEND_CTRL_RIGHT(hwnd) pressKeyWithModifier(hwnd, VK_CONTROL, VK_RIGHT) + +static void test_word_movement(void) +{ + HWND hwnd; + int result; + int sel_start, sel_end; + + /* multi-line control inserts CR normally */ + hwnd = new_richedit(NULL); + + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"one two three"); + ok (result == TRUE, "Failed to clear the text.\n"); + SendMessage(hwnd, EM_SETSEL, 0, 0); + /* |one two three */ + + SEND_CTRL_RIGHT(hwnd); + /* one |two three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 4, "Cursur is at %d instead of %d\n", sel_start, 4); + + SEND_CTRL_RIGHT(hwnd); + /* one two |three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + + SEND_CTRL_LEFT(hwnd); + /* one |two three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 4, "Cursur is at %d instead of %d\n", sel_start, 4); + + SEND_CTRL_LEFT(hwnd); + /* |one two three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 0, "Cursur is at %d instead of %d\n", sel_start, 0); + + SendMessage(hwnd, EM_SETSEL, 8, 8); + /* one two | three */ + SEND_CTRL_RIGHT(hwnd); + /* one two |three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + + SendMessage(hwnd, EM_SETSEL, 11, 11); + /* one two th|ree */ + SEND_CTRL_LEFT(hwnd); + /* one two |three */ + SendMessage(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "Selection should be empty\n"); + ok(sel_start == 9, "Cursur is at %d instead of %d\n", sel_start, 9); + + DestroyWindow(hwnd); +} + +static void test_EM_CHARFROMPOS(void) +{ + HWND hwnd; + int result; + POINTL point; + point.x = 0; + point.y = 50; + + /* multi-line control inserts CR normally */ + hwnd = new_richedit(NULL); + result = SendMessageA(hwnd, WM_SETTEXT, 0, + (LPARAM)"one two three four five six seven"); + + result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + ok(result == 0, "expected character index of 0 but got %d\n", result); + + DestroyWindow(hwnd); +} + START_TEST( editor ) { MSG msg; @@ -3220,6 +4562,7 @@ test_WM_CHAR(); test_EM_FINDTEXT(); test_EM_GETLINE(); + test_EM_POSFROMCHAR(); test_EM_SCROLLCARET(); test_EM_SCROLL(); test_WM_SETTEXT(); @@ -3231,7 +4574,6 @@ test_WM_GETTEXT(); test_EM_GETTEXTRANGE(); test_EM_GETSELTEXT(); - test_EM_AUTOURLDETECT(); test_EM_SETUNDOLIMIT(); test_ES_PASSWORD(); test_EM_SETTEXTEX(); @@ -3251,7 +4593,11 @@ test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY(); + test_EM_AUTOURLDETECT(); test_eventMask(); + test_undo_coalescing(); + test_word_movement(); + test_EM_CHARFROMPOS(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. Modified: trunk/rostests/winetests/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/riched… ============================================================================== --- trunk/rostests/winetests/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/riched20.rbuild [iso-8859-1] Tue Jul 8 05:09:42 2008 @@ -6,8 +6,10 @@ <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> <file>editor.c</file> + <file>richole.c</file> <file>testlist.c</file> <library>wine</library> + <library>uuid</library> <library>ole32</library> <library>user32</library> <library>gdi32</library> Added: trunk/rostests/winetests/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/richol… ============================================================================== --- trunk/rostests/winetests/riched20/richole.c (added) +++ trunk/rostests/winetests/riched20/richole.c [iso-8859-1] Tue Jul 8 05:09:42 2008 @@ -1,0 +1,120 @@ +/* + * Tests for IRichEditOle and friends. + * + * Copyright 2008 Google (Dan Hipschman) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <assert.h> +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <ole2.h> +#include <richedit.h> +#include <richole.h> +#include <tom.h> +#include <wine/test.h> + +#include <initguid.h> +DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); +DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); +DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); + +static HMODULE hmoduleRichEdit; + +static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) +{ + HWND hwnd + = CreateWindow(lpClassName, NULL, + dwStyle | WS_POPUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, + 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); + return hwnd; +} + +static HWND new_richedit(HWND parent) +{ + return new_window(RICHEDIT_CLASS, ES_MULTILINE, parent); +} + + +START_TEST(richole) +{ + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + IUnknown *punk; + HRESULT hres; + LRESULT res; + HWND w; + + /* Must explicitly LoadLibrary(). The test has no references to functions in + * RICHED20.DLL, so the linker doesn't actually link to it. */ + hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); + ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + + w = new_richedit(NULL); + if (!w) { + skip("Couldn't create window\n"); + return; + } + + res = SendMessage(w, EM_GETOLEINTERFACE, 0, (LPARAM) &reOle); + ok(res, "SendMessage\n"); + ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); + + hres = IUnknown_QueryInterface(reOle, &IID_ITextDocument, + (void **) &txtDoc); + ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); + ok(txtDoc != NULL, "IRichEditOle_QueryInterface\n"); + + hres = ITextDocument_GetSelection(txtDoc, &txtSel); + ok(hres == S_OK, "ITextDocument_GetSelection\n"); + ok(txtSel != NULL, "ITextDocument_GetSelection\n"); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtSel, &IID_ITextSelection, (void **) &punk); + ok(hres == S_OK, "ITextSelection_QueryInterface\n"); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtSel, &IID_ITextRange, (void **) &punk); + ok(hres == S_OK, "ITextSelection_QueryInterface\n"); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + punk = NULL; + hres = ITextSelection_QueryInterface(txtSel, &IID_IDispatch, (void **) &punk); + ok(hres == S_OK, "ITextSelection_QueryInterface\n"); + ok(punk != NULL, "ITextSelection_QueryInterface\n"); + IUnknown_Release(punk); + + ITextDocument_Release(txtDoc); + IUnknown_Release(reOle); + DestroyWindow(w); + + /* Methods should return CO_E_RELEASED if the backing document has + been released. One test should suffice. */ + hres = ITextSelection_CanEdit(txtSel, NULL); + ok(hres == CO_E_RELEASED, "ITextSelection after ITextDocument destroyed\n"); + + ITextSelection_Release(txtSel); +} Propchange: trunk/rostests/winetests/riched20/richole.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/riched20/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/testli… ============================================================================== --- trunk/rostests/winetests/riched20/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/testlist.c [iso-8859-1] Tue Jul 8 05:09:42 2008 @@ -7,9 +7,11 @@ #include "wine/test.h" extern void func_editor(void); +extern void func_richole(void); const struct test winetest_testlist[] = { { "editor", func_editor }, + { "richole", func_richole }, { 0, 0 } };

16 years, 5 months

[pschweitzer] 34367: Synced riched20.dll with Wine HEAD

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Jul 8 05:08:54 2008 New Revision: 34367 URL: http://svn.reactos.org/svn/reactos?rev=34367&view=rev Log: Synced riched20.dll with Wine HEAD Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/list.c trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/riched20.rbuild trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/run.c trunk/reactos/dll/win32/riched20/string.c trunk/reactos/dll/win32/riched20/style.c trunk/reactos/dll/win32/riched20/undo.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/include/psdk/richedit.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… Modified: trunk/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/list.c?… Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2… Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… Modified: trunk/reactos/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/string.… Modified: trunk/reactos/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/style.c… Modified: trunk/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/undo.c?… Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re…

16 years, 5 months

[ros-arm-bringup] 34366: - Rewrite the low-level trap/exception/system call code from the ground up: - Do not corrupt the stack anymore - Use a consistent trap frame layout (enable OldIrql and PreviousMode, and set the 0xBADB0D00 debug mark) - Use slower but more correct trap prolog/epilog code for now. - Generalize all prolog/epilog code into macros just like on x86. As a result, traps are now 6 lines of code. - Rewrite the system call interface from the ground up: - System calls didn't actuall

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Jul 8 04:11:44 2008 New Revision: 34366 URL: http://svn.reactos.org/svn/reactos?rev=34366&view=rev Log: - Rewrite the low-level trap/exception/system call code from the ground up: - Do not corrupt the stack anymore - Use a consistent trap frame layout (enable OldIrql and PreviousMode, and set the 0xBADB0D00 debug mark) - Use slower but more correct trap prolog/epilog code for now. - Generalize all prolog/epilog code into macros just like on x86. As a result, traps are now 6 lines of code. - Rewrite the system call interface from the ground up: - System calls didn't actually work: a debug print made the stack layout magical enough so that they didn't normally crush, but only slowly ate the stack. - Copying arguments from caller to system call was, as the comment on the original code so aptly put it, "total shit". - Due to ABI concerns, and to provide an actual template on how you're -supposed- to implement something like system calls on RISC processors, we now use a model similar to BSD, but about ten times better (with that much less code too). We'll document it later on the RosPSG Wiki. - This code probably contains some of the most vile-yet-elegant macro magic ever written for such low-level code as system call dispatching. - The result of all this is that we're at the same place as before (RamdiskAddDevice needs to be implemented by the Ramdisk guys) but with a sane low-level backend that isn't slowly eating away the stack, corrupting data, and basically working through random chance. - Move timebase code from stubs.c to its own file, time.c. - Silence multiple debug prints and fix a corrupted debug print in KiSystemStartup. Added: trunk/reactos/ntoskrnl/ke/arm/ke_i.h (with props) trunk/reactos/ntoskrnl/ke/arm/time.c (with props) trunk/reactos/ntoskrnl/ke/arm/usercall.c (with props) Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/stubs.c trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -759,7 +759,6 @@ // // Force a software interrupt // - DPRINT1("[SOFTINT]: %d\n", Request); WRITE_REGISTER_ULONG(VIC_SOFT_INT, 1 << Request); } @@ -768,9 +767,8 @@ HalClearSoftwareInterrupt(IN KIRQL Request) { // - // Force a software interrupt - // - DPRINT1("[SOFTINTC] %d\n", Request); + // Clear a software interrupt + // WRITE_REGISTER_ULONG(VIC_SOFT_INT_CLEAR, 1 << Request); } Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -59,13 +59,11 @@ // typedef struct _KTRAP_FRAME { - ULONG OldIrql; - // UCHAR PreviousMode; // ULONG Fpscr; // ULONG FpExc; // ULONG S[33]; - // ULONG FpExtra[8]; - ULONG Spsr; + // ULONG FpExtra[8]; + ULONG DbgArgMark; ULONG R0; ULONG R1; ULONG R2; @@ -84,6 +82,9 @@ ULONG SvcSp; ULONG SvcLr; ULONG Pc; + ULONG Spsr; + ULONG OldIrql; + ULONG PreviousMode; } KTRAP_FRAME, *PKTRAP_FRAME; #ifndef NTOS_MODE_USER Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -42,8 +42,27 @@ /* * Trap Frame offsets */ -.equ TrR0, 0x00 -.equ TrapFrameLength, 0x144 +.equ TrDbgArgMark, 0x00 +.equ TrR0, 0x04 +.equ TrR1, 0x08 +.equ TrR2, 0x0C +.equ TrR3, 0x10 +.equ TrR4, 0x14 +.equ TrR5, 0x18 +.equ TrR6, 0x1C +.equ TrR7, 0x20 +.equ TrR8, 0x24 +.equ TrR9, 0x28 +.equ TrR10, 0x2C +.equ TrR11, 0x30 +.equ TrR12, 0x34 +.equ TrUserSp, 0x38 +.equ TrUserLr, 0x3C +.equ TrSvcSp, 0x40 +.equ TrSvcLr, 0x44 +.equ TrPc, 0x48 +.equ TrSpsr, 0x4C +.equ TrapFrameLength, (22 * 0x04) /* * PCR Modified: trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/kxarm.h [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -19,3 +19,171 @@ end_&Name: .endfunc .endm + +.macro TRAP_PROLOG Abort + // + // Fixup lr + // +.if \Abort + sub lr, lr, #8 +.else + sub lr, lr, #4 +.endif + + // + // Save the bottom 4 registers + // + stmdb sp, {r0-r3} + + // + // Save the abort lr, sp, spsr, cpsr + // + mov r0, lr + mov r1, sp + mrs r2, cpsr + mrs r3, spsr + + // + // Switch to SVC mode + // + bic r2, r2, #CPSR_MODES + orr r2, r2, #CPSR_SVC_MODE + msr cpsr_c, r2 + + // + // Save the SVC sp before we modify it + // + mov r2, sp + + // + // Make space for the trap frame + // + sub sp, sp, #TrapFrameLength + + // + // Save abt32 state + // + str r0, [sp, #TrPc] + str lr, [sp, #TrSvcLr] + str r2, [sp, #TrSvcSp] + + // + // Restore the saved SPSR + // + msr spsr_all, r3 + + // + // Restore our 4 registers + // + ldmdb r1, {r0-r3} + + // + // Build trap frame + // FIXME: Change to stmdb later + // + str r0, [sp, #TrR0] + str r1, [sp, #TrR1] + str r2, [sp, #TrR2] + str r3, [sp, #TrR3] + str r4, [sp, #TrR4] + str r5, [sp, #TrR5] + str r6, [sp, #TrR6] + str r7, [sp, #TrR7] + str r8, [sp, #TrR8] + str r9, [sp, #TrR9] + str r10, [sp, #TrR10] + str r11, [sp, #TrR11] + str r12, [sp, #TrR12] + mov r12, sp + add r12, r12, #TrUserSp + stm r12, {sp, lr}^ + mrs r0, spsr_all + str r0, [sp, #TrSpsr] + ldr r0, =0xBADB0D00 + str r0, [sp, #TrDbgArgMark] +.endm + +.macro SYSCALL_PROLOG + // + // Make space for the trap frame + // + sub sp, sp, #TrapFrameLength + + // + // Build trap frame + // FIXME: Change to stmdb later + // + str r0, [sp, #TrR0] + str r1, [sp, #TrR1] + str r2, [sp, #TrR2] + str r3, [sp, #TrR3] + str r4, [sp, #TrR4] + str r5, [sp, #TrR5] + str r6, [sp, #TrR6] + str r7, [sp, #TrR7] + str r8, [sp, #TrR8] + str r9, [sp, #TrR9] + str r10, [sp, #TrR10] + str r11, [sp, #TrR11] + str r12, [sp, #TrR12] + mov r12, sp + add r12, r12, #TrUserSp + stm r12, {sp, lr}^ + str sp, [sp, #TrSvcSp] + str lr, [sp, #TrPc] + mrs r0, spsr_all + str r0, [sp, #TrSpsr] + ldr r0, =0xBADB0D00 + str r0, [sp, #TrDbgArgMark] +.endm + +.macro TRAP_EPILOG SystemCall + // + // ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00) + // + ldr r0, [sp, #TrDbgArgMark] + ldr r1, =0xBADB0D00 + cmp r0, r1 + bne 1f + + // + // Get the SPSR and restore it + // + ldr r0, [sp, #TrSpsr] + msr spsr_all, r0 + + // + // Restore the registers + // FIXME: Use LDMIA later + // + mov r0, sp + add r0, r0, #TrUserSp + ldm r0, {sp, lr}^ + ldr r0, [sp, #TrR0] + ldr r1, [sp, #TrR1] + ldr r2, [sp, #TrR2] + ldr r3, [sp, #TrR3] + ldr r4, [sp, #TrR4] + ldr r5, [sp, #TrR5] + ldr r6, [sp, #TrR6] + ldr r7, [sp, #TrR7] + ldr r8, [sp, #TrR8] + ldr r9, [sp, #TrR9] + ldr r10, [sp, #TrR10] + ldr r11, [sp, #TrR11] + ldr r12, [sp, #TrR12] + + // + // Restore program execution state + // +.if \SystemCall + ldr lr, [sp, #TrPc] + add sp, sp, #TrapFrameLength + movs pc, lr +.else + add sp, sp, #TrSvcSp + ldmia sp, {sp, lr, pc}^ +.endif +1: + b . +.endm Added: trunk/reactos/ntoskrnl/ke/arm/ke_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/ke_i.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/ke_i.h (added) +++ trunk/reactos/ntoskrnl/ke/arm/ke_i.h [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -1,0 +1,104 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ke/arm/ke_i.h + * PURPOSE: Implements macro-generated system call portable wrappers + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +// +// First, cleanup after any previous invocation +// +#undef _1 +#undef _2 +#undef _3 +#undef _4 +#undef _5 +#undef _6 +#undef _7 +#undef _8 +#undef _9 +#undef a +#undef b +#undef c +#undef d +#undef e +#undef f +#undef _10 +#undef _11 +#undef SYSCALL + +// +// Are we building the typedef prototypes? +// +#ifdef PROTO + // + // Then, each parameter is actually a prototype argument + // + #define _1 PVOID + #define _2 PVOID + #define _3 PVOID + #define _4 PVOID + #define _5 PVOID + #define _6 PVOID + #define _7 PVOID + #define _8 PVOID + #define _9 PVOID + #define a PVOID + #define b PVOID + #define c PVOID + #define d PVOID + #define e PVOID + #define f PVOID + #define _10 PVOID + #define _11 PVOID + + // + // And we generate the typedef + // + #define SYSCALL(x, y) typedef NTSTATUS (*PKI_SYSCALL_##x##PARAM)y; + + // + // Cleanup for next run + // + #undef PROTO +#else + // + // Each parameter is actually an argument for the system call + // + #define _1 g[0x00] + #define _2 g[0x01] + #define _3 g[0x02] + #define _4 g[0x03] + #define _5 g[0x04] + #define _6 g[0x05] + #define _7 g[0x06] + #define _8 g[0x07] + #define _9 g[0x08] + #define a g[0x09] + #define b g[0x0A] + #define c g[0x0B] + #define d g[0x0C] + #define e g[0x0D] + #define f g[0x0E] + #define _10 g[0x0F] + #define _11 g[0x10] + + // + // And we generate the actual system call + // + #define SYSCALL(x, y) \ + NTSTATUS \ + KiSyscall##x##Param( \ + IN PVOID p, \ + IN PVOID *g \ + ) \ + { \ + return ((PKI_SYSCALL_##x##PARAM)p)y; \ + } + + // + // Cleanup for next run + // + #undef FUNC +#endif Propchange: trunk/reactos/ntoskrnl/ke/arm/ke_i.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ke/arm/ke_i.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -80,7 +80,7 @@ PKPCR Pcr; ULONG i; DPRINT1("[INIT] Process: %p Thread: %p Stack: %p PRCB: %p Number: %d LoaderBlock: %p\n", - __FUNCTION__, InitProcess, InitThread, IdleStack, Prcb, Number, LoaderBlock); + InitProcess, InitThread, IdleStack, Prcb, Number, LoaderBlock); // // Initialize the platform Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -9,284 +9,3 @@ ULONG KeProcessorLevel; ULONG KeProcessorRevision; ULONG KeFeatureBits; - - -extern LONG KiTickOffset; -extern ULONG KeTimeAdjustment; - -ULONG -KiComputeTimerTableIndex(IN LONGLONG DueTime) -{ - ULONG Hand; - DPRINT1("DueTime: %I64x Max: %lx\n", DueTime, KeMaximumIncrement); - - // - // Compute the timer table index - // - Hand = (DueTime / KeMaximumIncrement); - DPRINT1("HAND: %lx\n", Hand); - Hand %= TIMER_TABLE_SIZE; - DPRINT1("HAND: %lx\n", Hand); - return Hand; -} - -VOID -NTAPI -KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql, - IN ULONG Increment) -{ - PKPRCB Prcb = KeGetPcr()->Prcb; - ULARGE_INTEGER SystemTime, InterruptTime; - ULONG Hand; - - // - // Do nothing if this tick is being skipped - // - if (Prcb->SkipTick) - { - // - // Handle it next time - // - Prcb->SkipTick = FALSE; - return; - } - - // - // Add the increment time to the shared data - // - InterruptTime.HighPart = SharedUserData->InterruptTime.High1Time; - InterruptTime.LowPart = SharedUserData->InterruptTime.LowPart; - InterruptTime.QuadPart += Increment; - SharedUserData->InterruptTime.High1Time = InterruptTime.HighPart; - SharedUserData->InterruptTime.LowPart = InterruptTime.LowPart; - SharedUserData->InterruptTime.High2Time = InterruptTime.HighPart; - - // - // Update tick count - // - KiTickOffset -= Increment; - - // - // Check for incomplete tick - // - if (KiTickOffset <= 0) - { - // - // Update the system time - // - SystemTime.HighPart = SharedUserData->SystemTime.High1Time; - SystemTime.LowPart = SharedUserData->SystemTime.LowPart; - SystemTime.QuadPart += KeTimeAdjustment; - SharedUserData->SystemTime.High1Time = SystemTime.HighPart; - SharedUserData->SystemTime.LowPart = SystemTime.LowPart; - SharedUserData->SystemTime.High2Time = SystemTime.HighPart; - - // - // Update the tick count - // - SystemTime.HighPart = KeTickCount.High1Time; - SystemTime.LowPart = KeTickCount.LowPart; - SystemTime.QuadPart += 1; - KeTickCount.High1Time = SystemTime.HighPart; - KeTickCount.LowPart = SystemTime.LowPart; - KeTickCount.High2Time = SystemTime.HighPart; - - // - // Update it in the shared user data - // - SharedUserData->TickCount.High1Time = SystemTime.HighPart; - SharedUserData->TickCount.LowPart = SystemTime.LowPart; - SharedUserData->TickCount.High2Time = SystemTime.HighPart; - } - - // - // Check for timer expiration - // - Hand = KeTickCount.LowPart % TIMER_TABLE_SIZE; - if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) - { - // - // Timer has expired! - // - DPRINT1("hand: %d\n", Hand); - DPRINT1("Interrupt time: %I64x\n", InterruptTime.QuadPart); - DPRINT1("TIMER EXPIRATION: %I64x!!!\n", KiTimerTableListHead[Hand].Time.QuadPart); - while (TRUE); - } - - // - // Check if we should request a debugger break - // - if (KdDebuggerEnabled) - { - // - // Check if we should break - // - if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); - } - - // - // Check if this was a full tick - // - if (KiTickOffset <= 0) - { - // - // Updare the tick offset - // - KiTickOffset += KeMaximumIncrement; - - // - // Update system runtime - // - KeUpdateRunTime(TrapFrame, CLOCK2_LEVEL); - } - else - { - // - // Increase interrupt count and exit - // - Prcb->InterruptCount++; - } -} - -VOID -NTAPI -KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql) -{ - PKTHREAD Thread = KeGetCurrentThread(); - PKPROCESS Process = Thread->ApcState.Process; - PKPRCB Prcb = KeGetCurrentPrcb(); - - // - // Do nothing if this tick is being skipped - // - if (Prcb->SkipTick) - { - // - // Handle it next time - // - Prcb->SkipTick = FALSE; - return; - } - - // - // Increase interrupt count - // - Prcb->InterruptCount++; - - // - // Check if we came from user mode - // - if (0) //(TrapFrame->PreviousMode != KernelMode) - { - // - // Increase process user time - // - InterlockedIncrement((PLONG)&Process->UserTime); - Prcb->UserTime++; - Thread->UserTime++; - } - else - { - // - // See if we were in an ISR - // - if (TrapFrame->OldIrql > DISPATCH_LEVEL) - { - // - // Handle that - // - Prcb->InterruptTime++; - } - else if ((TrapFrame->OldIrql < DISPATCH_LEVEL) || - !(Prcb->DpcRoutineActive)) - { - // - // Handle being in kernel mode - // - Thread->KernelTime++; - InterlockedIncrement((PLONG)&Process->KernelTime); - } - else - { - // - // Handle being in a DPC - // - Prcb->DpcTime++; - - // - // FIXME: Handle DPC checks - // - } - } - - // - // Update DPC rates - // - Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + - Prcb->DpcRequestRate) >> 1; - Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; - - // - // Check if the queue is large enough - // - if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) - { - // - // Request a DPC - // - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - - // - // Fix the maximum queue depth - // - if ((Prcb->DpcRequestRate < KiIdealDpcRate) && - (Prcb->MaximumDpcQueueDepth > 1)) - { - // - // Make it smaller - // - Prcb->MaximumDpcQueueDepth--; - } - } - else - { - // - // Check if we've reached the adjustment limit - // - if (!(--Prcb->AdjustDpcThreshold)) - { - // - // Reset it, and check the queue maximum - // - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) - { - // - // Increase it - // - Prcb->MaximumDpcQueueDepth++; - } - } - } - - // - // Decrement the thread quantum - // - Thread->Quantum -= CLOCK_QUANTUM_DECREMENT; - - // - // Check if the time expired - // - if ((Thread->Quantum <= 0) && (Thread != Prcb->IdleThread)) - { - // - // Schedule a quantum end - // - Prcb->QuantumEnd = 1; - //HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } -} Added: trunk/reactos/ntoskrnl/ke/arm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/time.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/time.c (added) +++ trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -1,0 +1,295 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ke/arm/time.c + * PURPOSE: Implements timebase functionality on ARM processors + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +LONG KiTickOffset; +ULONG KeTimeAdjustment; + +/* FUNCTIONS ******************************************************************/ + +ULONG +KiComputeTimerTableIndex(IN LONGLONG DueTime) +{ + ULONG Hand; + + // + // Compute the timer table index + // + Hand = (DueTime / KeMaximumIncrement); + Hand %= TIMER_TABLE_SIZE; + return Hand; +} + +VOID +NTAPI +KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql, + IN ULONG Increment) +{ + PKPRCB Prcb = KeGetPcr()->Prcb; + ULARGE_INTEGER SystemTime, InterruptTime; + ULONG Hand; + + // + // Do nothing if this tick is being skipped + // + if (Prcb->SkipTick) + { + // + // Handle it next time + // + Prcb->SkipTick = FALSE; + return; + } + + // + // Add the increment time to the shared data + // + InterruptTime.HighPart = SharedUserData->InterruptTime.High1Time; + InterruptTime.LowPart = SharedUserData->InterruptTime.LowPart; + InterruptTime.QuadPart += Increment; + SharedUserData->InterruptTime.High1Time = InterruptTime.HighPart; + SharedUserData->InterruptTime.LowPart = InterruptTime.LowPart; + SharedUserData->InterruptTime.High2Time = InterruptTime.HighPart; + + // + // Update tick count + // + KiTickOffset -= Increment; + + // + // Check for incomplete tick + // + if (KiTickOffset <= 0) + { + // + // Update the system time + // + SystemTime.HighPart = SharedUserData->SystemTime.High1Time; + SystemTime.LowPart = SharedUserData->SystemTime.LowPart; + SystemTime.QuadPart += KeTimeAdjustment; + SharedUserData->SystemTime.High1Time = SystemTime.HighPart; + SharedUserData->SystemTime.LowPart = SystemTime.LowPart; + SharedUserData->SystemTime.High2Time = SystemTime.HighPart; + + // + // Update the tick count + // + SystemTime.HighPart = KeTickCount.High1Time; + SystemTime.LowPart = KeTickCount.LowPart; + SystemTime.QuadPart += 1; + KeTickCount.High1Time = SystemTime.HighPart; + KeTickCount.LowPart = SystemTime.LowPart; + KeTickCount.High2Time = SystemTime.HighPart; + + // + // Update it in the shared user data + // + SharedUserData->TickCount.High1Time = SystemTime.HighPart; + SharedUserData->TickCount.LowPart = SystemTime.LowPart; + SharedUserData->TickCount.High2Time = SystemTime.HighPart; + } + + // + // Check for timer expiration + // + Hand = KeTickCount.LowPart % TIMER_TABLE_SIZE; + if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) + { + // + // Timer has expired! + // + DPRINT1("hand: %d\n", Hand); + DPRINT1("Interrupt time: %I64x\n", InterruptTime.QuadPart); + DPRINT1("TIMER EXPIRATION: %I64x!!!\n", + KiTimerTableListHead[Hand].Time.QuadPart); + while (TRUE); + } + + // + // Check if we should request a debugger break + // + if (KdDebuggerEnabled) + { + // + // Check if we should break + // + if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + } + + // + // Check if this was a full tick + // + if (KiTickOffset <= 0) + { + // + // Updare the tick offset + // + KiTickOffset += KeMaximumIncrement; + + // + // Update system runtime + // + KeUpdateRunTime(TrapFrame, CLOCK2_LEVEL); + } + else + { + // + // Increase interrupt count and exit + // + Prcb->InterruptCount++; + } +} + +VOID +NTAPI +KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql) +{ + PKTHREAD Thread = KeGetCurrentThread(); + PKPROCESS Process = Thread->ApcState.Process; + PKPRCB Prcb = KeGetCurrentPrcb(); + + // + // Do nothing if this tick is being skipped + // + if (Prcb->SkipTick) + { + // + // Handle it next time + // + Prcb->SkipTick = FALSE; + return; + } + + // + // Increase interrupt count + // + Prcb->InterruptCount++; + + // + // Check if we came from user mode + // + if (0) //(TrapFrame->PreviousMode != KernelMode) + { + // + // Increase process user time + // + InterlockedIncrement((PLONG)&Process->UserTime); + Prcb->UserTime++; + Thread->UserTime++; + } + else + { + // + // See if we were in an ISR + // + if (TrapFrame->OldIrql > DISPATCH_LEVEL) + { + // + // Handle that + // + Prcb->InterruptTime++; + } + else if ((TrapFrame->OldIrql < DISPATCH_LEVEL) || + !(Prcb->DpcRoutineActive)) + { + // + // Handle being in kernel mode + // + Thread->KernelTime++; + InterlockedIncrement((PLONG)&Process->KernelTime); + } + else + { + // + // Handle being in a DPC + // + Prcb->DpcTime++; + + // + // FIXME: Handle DPC checks + // + } + } + + // + // Update DPC rates + // + Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + + Prcb->DpcRequestRate) >> 1; + Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; + + // + // Check if the queue is large enough + // + if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) + { + // + // Request a DPC + // + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + + // + // Fix the maximum queue depth + // + if ((Prcb->DpcRequestRate < KiIdealDpcRate) && + (Prcb->MaximumDpcQueueDepth > 1)) + { + // + // Make it smaller + // + Prcb->MaximumDpcQueueDepth--; + } + } + else + { + // + // Check if we've reached the adjustment limit + // + if (!(--Prcb->AdjustDpcThreshold)) + { + // + // Reset it, and check the queue maximum + // + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) + { + // + // Increase it + // + Prcb->MaximumDpcQueueDepth++; + } + } + } + + // + // Decrement the thread quantum + // + Thread->Quantum -= CLOCK_QUANTUM_DECREMENT; + + // + // Check if the time expired + // + if ((Thread->Quantum <= 0) && (Thread != Prcb->IdleThread)) + { + // + // Schedule a quantum end + // + Prcb->QuantumEnd = 1; + //HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } +} Propchange: trunk/reactos/ntoskrnl/ke/arm/time.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ke/arm/time.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -7,7 +7,7 @@ */ .title "ARM Trap Dispatching and Handling" - .include "ntoskrnl/include/internal/arm/kxarm.h" + #include "ntoskrnl/include/internal/arm/kxarm.h" .include "ntoskrnl/include/internal/arm/ksarm.h" .global KiArmVectorTable @@ -28,7 +28,7 @@ _KiReservedJump: .word KiReservedException _KiInterruptJump: .word KiInterruptException _KiFastInterruptJump: .word KiFastInterruptException - + TEXTAREA NESTED_ENTRY KiUndefinedInstructionException PROLOG_END KiUndefinedInstructionException @@ -42,76 +42,25 @@ NESTED_ENTRY KiSoftwareInterruptException PROLOG_END KiSoftwareInterruptException - - // - // Save the current lr - // - str lr, [sp, #-4]! - - // - // Save the SVC lr and sp - // - str lr, [sp, #-4]! - str sp, [sp, #-4]! // - // Make space for trap frame + // Handle trap entry // - sub sp, sp, #(4*15) - - // - // Save user-mode registers - // - stmia sp, {r0-r12} - add r0, sp, #(4*13) - stmia r0, {r13-r14}^ - mov r0, r0 - - // - // Save SPSR - // - mrs r0, spsr_all - str r0, [sp, #-4]! - - // - // Make space for IRQL - // - sub sp, sp, #4 + SYSCALL_PROLOG // // Call the C handler // + adr lr, 1f mov r0, sp - bl KiSoftwareInterruptHandler - + ldr pc, =KiSoftwareInterruptHandler + +1: // - // Skip IRQL - // - add sp, sp, #(4) + // Handle trap exit + // + TRAP_EPILOG 1 // FromSystemCall - // - // Get the SPSR and restore it - // - ldr r0, [sp], #4 - msr spsr_all, r0 - - // - // Restore the registers - // - ldmia sp, {r0-r14}^ - mov r0, r0 - - // - // Advance in the trap frame - // - add sp, sp, #(4*17) - - // - // Restore program execution state - // - ldr lr, [sp], #4 - movs pc, lr - b . ENTRY_END KiSoftwareInterruptException NESTED_ENTRY KiPrefetchAbortException @@ -128,233 +77,47 @@ PROLOG_END KiDataAbortException // - // Fixup lr + // Handle trap entry // - sub lr, lr, #8 + TRAP_PROLOG 1 // FromAbort - // - // Save the bottom 4 registers - // - stmdb sp, {r0-r3} - - // - // Save the abort lr, sp, spsr, cpsr - // - mov r0, lr - mov r1, sp - mrs r2, cpsr - mrs r3, spsr - - // - // Switch to SVC mode - // - bic r2, r2, #CPSR_MODES - orr r2, r2, #CPSR_SVC_MODE - msr cpsr_c, r2 - - // - // Save the SVC sp before we modify it - // - mov r2, sp - - // - // Save the abort lr - // - str r0, [sp, #-4]! - - // - // Save the SVC lr and sp - // - str lr, [sp, #-4]! - str r2, [sp, #-4]! - - // - // Restore the saved SPSR - // - msr spsr_all, r3 - - // - // Restore our 4 registers - // - ldmdb r1, {r0-r3} - - // - // Make space for the trap frame - // - sub sp, sp, #(4*15) // TrapFrameLength - - // - // Save user-mode registers - // - stmia sp, {r0-r12} - add r0, sp, #(4*13) - stmia r0, {r13-r14}^ - mov r0, r0 - - // - // Save SPSR - // - mrs r0, spsr_all - str r0, [sp, #-4]! - - // - // Make space for IRQL - // - sub sp, sp, #4 - // // Call the C handler // - adr lr, AbortExit + adr lr, 1f mov r0, sp ldr pc, =KiDataAbortHandler -AbortExit: +1: + // + // Handle trap exit + // + TRAP_EPILOG 0 // NotFromSystemCall - // - // Skip IRQL - // - add sp, sp, #(4) - - // - // Get the SPSR and restore it - // - ldr r0, [sp], #4 - msr spsr_all, r0 - - // - // Restore the registers - // - ldmia sp, {r0-r14}^ - mov r0, r0 - - // - // Advance in the trap frame - // - add sp, sp, #(4*15) - - // - // Restore program execution state - // - ldmia sp, {sp, lr, pc}^ - b . ENTRY_END KiDataAbortException NESTED_ENTRY KiInterruptException PROLOG_END KiInterruptException + + // + // Handle trap entry + // + TRAP_PROLOG 0 // NotFromAbort - // - // Fixup lr - // - sub lr, lr, #4 - - // - // Save the bottom 4 registers - // - stmdb sp, {r0-r3} - - // - // Save the IRQ lr, sp, spsr, cpsr - // - mov r0, lr - mov r1, sp - mrs r2, cpsr - mrs r3, spsr - - // - // Switch to SVC mode - // - bic r2, r2, #CPSR_MODES - orr r2, r2, #CPSR_SVC_MODE - msr cpsr_c, r2 - - // - // Save the SVC sp before we modify it - // - mov r2, sp - - // - // Save the IRQ lr - // - str r0, [sp, #-4]! - - // - // Save the SVC lr and sp - // - str lr, [sp, #-4]! - str r2, [sp, #-4]! - - // - // Restore the saved SPSR - // - msr spsr_all, r3 - - // - // Restore our 4 registers - // - ldmdb r1, {r0-r3} - - // - // Make space for the trap frame - // - sub sp, sp, #(4*15) // TrapFrameLength - - // - // Save user-mode registers - // - stmia sp, {r0-r12} - add r0, sp, #(4*13) - stmia r0, {r13-r14}^ - mov r0, r0 - - // - // Save SPSR - // - mrs r0, spsr_all - str r0, [sp, #-4]! - - // - // Make space for IRQL - // - sub sp, sp, #4 - // // Call the C handler // - adr lr, IntExit + adr lr, 1f mov r0, sp mov r1, #0 ldr pc, =KiInterruptHandler -IntExit: - +1: // - // Skip IRQL - // - add sp, sp, #(4) - - // - // Get the SPSR and restore it - // - ldr r0, [sp], #4 - msr spsr_all, r0 + // Handle trap exit + // + TRAP_EPILOG 0 // NotFromSystemCall - // - // Restore the registers - // - ldmia sp, {r0-r14}^ - mov r0, r0 - - // - // Advance in the trap frame - // - add sp, sp, #(4*15) - - // - // Restore program execution state - // - ldmia sp, {sp, lr, pc}^ - b . ENTRY_END KiInterruptException NESTED_ENTRY KiFastInterruptException @@ -377,85 +140,3 @@ b . ENTRY_END KiReservedException - - - NESTED_ENTRY KiSystemCall - PROLOG_END KiSystemCall - - // - // a1 has the function pointer, a2 has an array of arguments, a3 has the count - // Save these to better locations - // - mov r4, a1 - mov r5, a2 - mov r6, a3 - - // - // Load up A1-A4 from the argument array - // It doesn't matter if we had less than 4 arguments, we'll be loading some - // of the registers with garbage, but nobody will know/care. - // - ldmia r5, {a1-a4} - add r5, r5, #(4* 4) - - // - // - // This code is complete shit. - // - // - - // - // Save stack address and return address - // - mov r11, sp - mov r10, lr - - // - // Check if we have more than 4 arguments - // - cmp r6, #4 - ble SysCall - - // - // Make space on stack - // - sub r6, r6, #4 - sub sp, sp, r6, lsl #2 - -CopyLoop: - // - // Copy one parameter - // - ldr r7, [r5] - str r7, [sp] - add r5, r5, #4 - add sp, sp, #4 - - // - // Keep looping until we've copied them all - // - cmp sp, r11 - bne CopyLoop - - // - // Set the stack - // - sub sp, sp, r6, lsl #2 - - // - // Now do the system call - // -SysCall: - mov lr, pc - mov pc, r4 - - // - // Restore the stack - // - mov sp, r11 - - // - // Get us back - // - mov pc, r10 - ENTRY_END KiSystemCall Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -18,13 +18,6 @@ #define KiGetPreviousMode(tf) \ ((tf->Spsr & CPSR_MODES) == CPSR_USER_MODE) ? UserMode: KernelMode -NTSTATUS -KiSystemCall( - IN PVOID Handler, - IN PULONG Arguments, - IN ULONG ArgumentCount -); - VOID FASTCALL KiRetireDpcList( @@ -35,6 +28,13 @@ FASTCALL KiQuantumEnd( VOID +); + +VOID +KiSystemService( + IN PKTHREAD Thread, + IN PKTRAP_FRAME TrapFrame, + IN ULONG Instruction ); /* FUNCTIONS ******************************************************************/ @@ -237,7 +237,7 @@ KPROCESSOR_MODE PreviousMode; KEXCEPTION_FRAME ExceptionFrame; PKTRAP_FRAME TrapFrame = KeGetCurrentThread()->TrapFrame; - DPRINT1("[APC]\n"); + //DPRINT1("[APC]\n"); // // Isolate previous mode @@ -360,6 +360,7 @@ ULONG InterruptCause, InterruptMask; PKPCR Pcr; PKTRAP_FRAME OldTrapFrame; + ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); // // Increment interrupt count @@ -424,7 +425,7 @@ // DPRINT1("[ISR RETURN]\n"); // - // Re-enable interrupts and return IRQL + // Restore IRQL and interrupts // KeLowerIrql(OldIrql); _enable(); @@ -435,6 +436,7 @@ { NTSTATUS Status; PVOID Address = (PVOID)KeArmFaultAddressRegisterGet(); + ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); DPRINT1("[ABORT] (%x) @ %p/%p/%p\n", KeArmFaultStatusRegisterGet(), Address, TrapFrame->SvcLr, TrapFrame->Pc); @@ -456,144 +458,12 @@ } VOID -KiSystemService(IN PKTHREAD Thread, - IN PKTRAP_FRAME TrapFrame, - IN ULONG Instruction) -{ - ULONG Id, Number, ArgumentCount, i; - PKPCR Pcr; - ULONG_PTR ServiceTable, Offset; - PKSERVICE_TABLE_DESCRIPTOR DescriptorTable; - PVOID SystemCall; - PULONG Argument; - ULONG Arguments[16]; // Maximum 20 arguments - - // - // Increase count of system calls - // - Pcr = (PKPCR)KeGetPcr(); - Pcr->Prcb->KeSystemCalls++; - - // - // Get the system call ID - // - Id = Instruction & 0xFFFFF; - DPRINT1("[SWI] (%x) %p (%d) \n", Id, Thread, Thread->PreviousMode); - - // - // Get the descriptor table - // - ServiceTable = (ULONG_PTR)Thread->ServiceTable; - Offset = ((Id >> SERVICE_TABLE_SHIFT) & SERVICE_TABLE_MASK); - ServiceTable += Offset; - DescriptorTable = (PVOID)ServiceTable; - - // - // Get the service call number and validate it - // - Number = Id & SERVICE_NUMBER_MASK; - if (Number > DescriptorTable->Limit) - { - // - // Check if this is a GUI call - // - UNIMPLEMENTED; - ASSERT(FALSE); - } - - // - // Save the function responsible for handling this system call - // - SystemCall = (PVOID)DescriptorTable->Base[Number]; - - // - // Check if this is a GUI call - // - if (Offset & SERVICE_TABLE_TEST) - { - // - // TODO - // - UNIMPLEMENTED; - ASSERT(FALSE); - } - - // - // Check how many arguments this system call takes - // - ArgumentCount = DescriptorTable->Number[Number] / 4; - ASSERT(ArgumentCount <= 20); - - // - // Copy the register-arguments first - // First four arguments are in a1, a2, a3, a4 - // - Argument = &TrapFrame->R0; - for (i = 0; (i < ArgumentCount) && (i < 4); i++) - { - // - // Copy them into the kernel stack - // - DPRINT1("Argument: %p\n", *Argument); - Arguments[i] = *Argument; - Argument++; - } - - // - // If more than four, we'll have some on the user stack - // - if (ArgumentCount > 4) - { - // - // Check where the stack is - // - if (Thread->PreviousMode == UserMode) - { - // - // FIXME: Validate the user stack - // - Argument = (PULONG)TrapFrame->UserSp; - } - else - { - // - // We were called from the kernel - // - Argument = (PULONG)TrapFrame->SvcSp; - - // - // Bias for the values we saved - // - Argument += 2; - } - - // - // Copy the rest - // - for (i = 4; i < ArgumentCount; i++) - { - // - // Copy into kernel stack - // - DPRINT1("Argument: %p\n", *Argument); - Arguments[i] = *Argument; - Argument++; - } - } - - // - // Do the system call and save result in EAX - // - TrapFrame->R0 = KiSystemCall(SystemCall, Arguments, ArgumentCount); - DPRINT1("Returned: %lx\n", TrapFrame->R0); -} - -VOID KiSoftwareInterruptHandler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; KPROCESSOR_MODE PreviousMode; ULONG Instruction; + ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); // // Get the current thread @@ -606,9 +476,9 @@ PreviousMode = KiGetPreviousMode(TrapFrame); // - // FIXME: Save old previous mode - // - //TrapFrame->PreviousMode = PreviousMode; + // Save old previous mode + // + TrapFrame->PreviousMode = PreviousMode; // // Save previous mode and trap frame Added: trunk/reactos/ntoskrnl/ke/arm/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/usercall.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/usercall.c (added) +++ trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -1,0 +1,207 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ke/arm/usercall.c + * PURPOSE: Implements system calls and user-mode callbacks for ARM + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +// +// System call wrapper generator +// +#define BUILD_SYSCALLS \ +SYSCALL(00, ()) \ +SYSCALL(01, (_1)) \ +SYSCALL(02, (_1, _2)) \ +SYSCALL(03, (_1, _2, _3)) \ +SYSCALL(04, (_1, _2, _3, _4 )) \ +SYSCALL(05, (_1, _2, _3, _4, _5)) \ +SYSCALL(06, (_1, _2, _3, _4, _5, _6)) \ +SYSCALL(07, (_1, _2, _3, _4, _5, _6, _7)) \ +SYSCALL(08, (_1, _2, _3, _4, _5, _6, _7, _8)) \ +SYSCALL(09, (_1, _2, _3, _4, _5, _6, _7, _8, _9)) \ +SYSCALL(0A, (_1, _2, _3, _4, _5, _6, _7, _8, _9, a)) \ +SYSCALL(0B, (_1, _2, _3, _4, _5, _6, _7, _8, _9, a, b)) \ +SYSCALL(0C, (_1, _2, _3, _4, _5, _6, _7, _8, _9, a, b, c)) \ +SYSCALL(0D, (_1, _2, _3, _4, _5, _6, _7, _8, _9, a, b, c, d)) \ +SYSCALL(0E, (_1, _2, _3, _4, _5, _6, _7, _8, _9, a, b, c, d, e)) \ +SYSCALL(0F, (_1, _2, _3, _4, _5, _6, _7, _8, _9, a, b, c, d, e, f)) \ +SYSCALL(10, (_1, _2, _3, _4, _5, _6, _7, _8, _9, a, b, c, d, e, f, _10)) \ +SYSCALL(11, (_1, _2, _3, _4, _5, _6, _7, _8, _9, a, b, c, d, e, f, _10, _11)) + +// +// Generate function pointer definitions +// +#define PROTO +#include "ke_i.h" +BUILD_SYSCALLS + +// +// Generate function code +// +#define FUNC +#include "ke_i.h" +BUILD_SYSCALLS + +/* SYSTEM CALL STUBS **********************************************************/ + +typedef NTSTATUS (*PKI_SYSCALL_PARAM_HANDLER)(IN PVOID p, IN PVOID *g); +PKI_SYSCALL_PARAM_HANDLER KiSyscallHandlers[0x12] = +{ + KiSyscall00Param, + KiSyscall01Param, + KiSyscall02Param, + KiSyscall03Param, + KiSyscall04Param, + KiSyscall05Param, + KiSyscall06Param, + KiSyscall07Param, + KiSyscall08Param, + KiSyscall09Param, + KiSyscall0AParam, + KiSyscall0BParam, + KiSyscall0CParam, + KiSyscall0DParam, + KiSyscall0EParam, + KiSyscall0FParam, + KiSyscall10Param, + KiSyscall11Param, +}; + +/* FUNCIONS *******************************************************************/ + +VOID +KiSystemService(IN PKTHREAD Thread, + IN PKTRAP_FRAME TrapFrame, + IN ULONG Instruction) +{ + ULONG Id, Number, ArgumentCount, i; + PKPCR Pcr; + ULONG_PTR ServiceTable, Offset; + PKSERVICE_TABLE_DESCRIPTOR DescriptorTable; + PVOID SystemCall; + PVOID* Argument; + PVOID Arguments[0x11]; // Maximum 17 arguments + ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); + + // + // Increase count of system calls + // + Pcr = (PKPCR)KeGetPcr(); + Pcr->Prcb->KeSystemCalls++; + + // + // Get the system call ID + // + Id = Instruction & 0xFFFFF; + //DPRINT1("[SWI] (%x) %p (%d) \n", Id, Thread, Thread->PreviousMode); + + // + // Get the descriptor table + // + ServiceTable = (ULONG_PTR)Thread->ServiceTable; + Offset = ((Id >> SERVICE_TABLE_SHIFT) & SERVICE_TABLE_MASK); + ServiceTable += Offset; + DescriptorTable = (PVOID)ServiceTable; + + // + // Get the service call number and validate it + // + Number = Id & SERVICE_NUMBER_MASK; + if (Number > DescriptorTable->Limit) + { + // + // Check if this is a GUI call + // + UNIMPLEMENTED; + ASSERT(FALSE); + } + + // + // Save the function responsible for handling this system call + // + SystemCall = (PVOID)DescriptorTable->Base[Number]; + + // + // Check if this is a GUI call + // + if (Offset & SERVICE_TABLE_TEST) + { + // + // TODO + // + UNIMPLEMENTED; + ASSERT(FALSE); + } + + // + // Check how many arguments this system call takes + // + ArgumentCount = DescriptorTable->Number[Number] / 4; + ASSERT(ArgumentCount <= 20); + + // + // Copy the register-arguments first + // First four arguments are in a1, a2, a3, a4 + // + Argument = (PVOID*)&TrapFrame->R0; + for (i = 0; (i < ArgumentCount) && (i < 4); i++) + { + // + // Copy them into the kernel stack + // + Arguments[i] = *Argument; + Argument++; + } + + // + // If more than four, we'll have some on the user stack + // + if (ArgumentCount > 4) + { + // + // Check where the stack is + // + if (Thread->PreviousMode == UserMode) + { + // + // FIXME: Validate the user stack + // + ASSERT(FALSE); + Argument = (PVOID*)TrapFrame->UserSp; + } + else + { + // + // We were called from the kernel + // + Argument = (PVOID*)(TrapFrame + 1); + } + + // + // Copy the rest + // + for (i = 4; i < ArgumentCount; i++) + { + // + // Copy into kernel stack + // + Arguments[i] = *Argument; + Argument++; + } + } + + // + // Do the system call and save result in EAX + // + TrapFrame->R0 = KiSyscallHandlers[ArgumentCount]((PVOID)SystemCall, + (PVOID)Arguments); +} Propchange: trunk/reactos/ntoskrnl/ke/arm/usercall.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/ke/arm/usercall.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jul 8 04:11:44 2008 @@ -69,8 +69,10 @@ <file>stubs_asm.s</file> <file>stubs.c</file> <file>thrdini.c</file> + <file>time.c</file> <file>trap.s</file> <file>trapc.c</file> + <file>usercall.c</file> </directory> </if> <if property="ARCH" value="powerpc">

16 years, 5 months

[fireball] 34365: - Add IActiveScriptSiteDebug32 IID.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jul 8 02:45:31 2008 New Revision: 34365 URL: http://svn.reactos.org/svn/reactos?rev=34365&view=rev Log: - Add IActiveScriptSiteDebug32 IID. Modified: trunk/reactos/lib/sdk/strmiids/strmiids.c Modified: trunk/reactos/lib/sdk/strmiids/strmiids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/strmiids/strmiids.… ============================================================================== --- trunk/reactos/lib/sdk/strmiids/strmiids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/strmiids/strmiids.c [iso-8859-1] Tue Jul 8 02:45:31 2008 @@ -348,6 +348,7 @@ DEFINE_GUID(FORMAT_VideoInfo2,0xf72a76a0,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba); DEFINE_GUID(FORMAT_VIDEOINFO2,0xf72a76a0,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba); DEFINE_GUID(FORMAT_WaveFormatEx,0x05589f81,0xc356,0x11ce,0xbf,0x01,0x00,0xaa,0x00,0x55,0x59,0x5a); +DEFINE_GUID(IID_IActiveScriptSiteDebug32,0x51973c11,0xcb0c,0x11d0,0xb5,0xc9,0x00,0xa0,0x24,0x4a,0x0e,0x7a); DEFINE_GUID(IID_IAMAnalogVideoDecoder,0xc6e13350,0x30ac,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56); DEFINE_GUID(IID_IAMAnalogVideoEncoder,0xc6e133b0,0x30ac,0x11d0,0xa1,0x8c,0x00,0xa0,0xc9,0x11,0x89,0x56); DEFINE_GUID(IID_IAMAudioInputMixer,0x54c39221,0x8380,0x11d0,0xb3,0xf0,0x00,0xaa,0x00,0x37,0x61,0xc5);

16 years, 5 months

[jimtabor] 34364: Update the rest of the prototypes and stubs.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 8 02:38:28 2008 New Revision: 34364 URL: http://svn.reactos.org/svn/reactos?rev=34364&view=rev Log: Update the rest of the prototypes and stubs. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul 8 02:38:28 2008 @@ -1207,10 +1207,10 @@ DWORD dwUnknown ); -DWORD +BOOL NTAPI NtUserFlashWindowEx( - DWORD Unknown0); + IN PFLASHWINFO pfwi); BOOL NTAPI @@ -1230,16 +1230,16 @@ NtUserGetAppImeLevel( DWORD dwUnknown1); -DWORD +SHORT NTAPI NtUserGetAsyncKeyState( - DWORD Unknown0); + INT Key); DWORD NTAPI NtUserGetAtomName( - DWORD dwUnknown1, - DWORD dwUnknown2); + ATOM nAtom, + LPWSTR lpBuffer); UINT NTAPI @@ -1738,9 +1738,9 @@ DWORD NTAPI NtUserMinMaximize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + HWND hWnd, + UINT cmd, // Wine SW_ commands + BOOL Hide); DWORD NTAPI @@ -2072,12 +2072,12 @@ ULONG_PTR dwNewLong, BOOL Ansi ); -DWORD +WORD NTAPI NtUserSetClassWord( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hWnd, + INT nIndex, + WORD wNewWord); HANDLE NTAPI @@ -2176,15 +2176,15 @@ DWORD NTAPI NtUserSetInternalWindowPos( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); - -DWORD + HWND hwnd, + UINT showCmd, + LPRECT rect, + LPPOINT pt); + +BOOL NTAPI NtUserSetKeyboardState( - LPBYTE Unknown0); + LPBYTE lpKeyState); BOOL NTAPI @@ -2194,10 +2194,10 @@ BYTE bAlpha, DWORD dwFlags); -DWORD +BOOL NTAPI NtUserSetLogonNotifyWindow( - DWORD Unknown0); + HWND hWnd); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Tue Jul 8 02:38:28 2008 @@ -2103,10 +2103,12 @@ return Ret; } -DWORD STDCALL -NtUserSetClassWord(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) +WORD +STDCALL +NtUserSetClassWord( + HWND hWnd, + INT nIndex, + WORD wNewWord) { return(0); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Tue Jul 8 02:38:28 2008 @@ -396,17 +396,17 @@ -DWORD +SHORT STDCALL NtUserGetAsyncKeyState( - DWORD key) -{ - DECLARE_RETURN(DWORD); + INT key) +{ + DECLARE_RETURN(SHORT); DPRINT("Enter NtUserGetAsyncKeyState\n"); UserEnterExclusive(); - RETURN(UserGetAsyncKeyState(key)); + RETURN((SHORT)UserGetAsyncKeyState(key)); CLEANUP: DPRINT("Leave NtUserGetAsyncKeyState, ret=%i\n",_ret_); @@ -526,7 +526,7 @@ END_CLEANUP; } -DWORD +BOOL STDCALL NtUserSetKeyboardState(LPBYTE lpKeyState) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Jul 8 02:38:28 2008 @@ -731,8 +731,8 @@ DWORD NTAPI NtUserGetAtomName( - DWORD dwUnknown1, - DWORD dwUnknown2) + ATOM nAtom, + LPWSTR lpBuffer) { UNIMPLEMENTED; return 0; @@ -832,9 +832,9 @@ DWORD NTAPI NtUserMinMaximize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) + HWND hWnd, + UINT cmd, // Wine SW_ commands + BOOL Hide) { UNIMPLEMENTED; return 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 8 02:38:28 2008 @@ -2792,8 +2792,8 @@ /* * @unimplemented */ -DWORD STDCALL -NtUserFlashWindowEx(DWORD Unknown0) +BOOL STDCALL +NtUserFlashWindowEx(IN PFLASHWINFO pfwi) { UNIMPLEMENTED @@ -4088,10 +4088,11 @@ * @unimplemented */ DWORD STDCALL -NtUserSetInternalWindowPos(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) +NtUserSetInternalWindowPos( + HWND hwnd, + UINT showCmd, + LPRECT rect, + LPPOINT pt) { UNIMPLEMENTED @@ -4117,8 +4118,8 @@ /* * @unimplemented */ -DWORD STDCALL -NtUserSetLogonNotifyWindow(DWORD Unknown0) +BOOL STDCALL +NtUserSetLogonNotifyWindow(HWND hWnd) { UNIMPLEMENTED

16 years, 5 months

[jimtabor] 34363: Update more prototypes and stubs.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 8 00:43:14 2008 New Revision: 34363 URL: http://svn.reactos.org/svn/reactos?rev=34363&view=rev Log: Update more prototypes and stubs. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul 8 00:43:14 2008 @@ -1181,13 +1181,13 @@ HDC hDC, HWND hWnd); -DWORD +BOOL NTAPI NtUserFillWindow( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWND hWndPaint, + HWND hWndPaint1, + HDC hDC, + HBRUSH hBrush); HICON NTAPI @@ -1313,13 +1313,13 @@ HDC hdc, UINT ctlType); -DWORD +HBRUSH NTAPI NtUserGetControlColor( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWND hwndParent, + HWND hwnd, + HDC hdc, + UINT CtlMsg); DWORD NTAPI @@ -1408,9 +1408,9 @@ DWORD NTAPI NtUserGetInternalWindowPos( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hwnd, + LPRECT rectWnd, + LPPOINT ptIcon); HKL NTAPI @@ -1442,10 +1442,10 @@ NTAPI NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ); -DWORD +SHORT NTAPI NtUserGetKeyState( - DWORD Unknown0); + INT VirtKey); BOOL NTAPI @@ -2497,18 +2497,18 @@ DWORD Unknown1, DWORD Unknown2); -DWORD +BOOL NTAPI NtUserUpdateLayeredWindow( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8); + HWND hwnd, + HDC hdcDst, + POINT *pptDst, + SIZE *psize, + HDC hdcSrc, + POINT *pptSrc, + COLORREF crKey, + BLENDFUNCTION *pblend, + DWORD dwFlags); BOOL NTAPI @@ -2705,7 +2705,7 @@ /* Should be done in usermode */ HANDLE NTAPI -NtUserGetProp(HWND hWnd, ATOM Atom); +NtUserGetProp(HWND hWnd, ATOM Atom); // Done in both User/Kernel BOOL NTAPI @@ -2829,7 +2829,7 @@ RTL_ATOM NTAPI -NtUserRegisterClassEx( +NtUserRegisterClassEx( // Need to use NtUserRegisterClassExWOW. CONST WNDCLASSEXW* lpwcx, PUNICODE_STRING ClassName, PUNICODE_STRING MenuName, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Tue Jul 8 00:43:14 2008 @@ -361,10 +361,10 @@ } -DWORD +SHORT STDCALL NtUserGetKeyState( - DWORD key) + INT key) { DECLARE_RETURN(DWORD); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Jul 8 00:43:14 2008 @@ -254,13 +254,17 @@ return 0; } -DWORD + +/* + * Called from PaintRect, works almost like wine PaintRect16 but returns hBrush. + */ +HBRUSH STDCALL NtUserGetControlColor( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) + HWND hwndParent, + HWND hwnd, + HDC hdc, + UINT CtlMsg) // Wine PaintRect: WM_CTLCOLORMSGBOX + hbrush { UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 8 00:43:14 2008 @@ -2505,13 +2505,16 @@ /* + * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND. + */ +/* * @unimplemented */ -DWORD STDCALL -NtUserFillWindow(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) +BOOL STDCALL +NtUserFillWindow(HWND hWndPaint, + HWND hWndPaint1, + HDC hDC, + HBRUSH hBrush) { UNIMPLEMENTED @@ -2949,9 +2952,9 @@ * @unimplemented */ DWORD STDCALL -NtUserGetInternalWindowPos(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) +NtUserGetInternalWindowPos( HWND hwnd, + LPRECT rectWnd, + LPPOINT ptIcon) { UNIMPLEMENTED @@ -4490,23 +4493,23 @@ /* * @unimplemented */ -DWORD STDCALL -NtUserUpdateLayeredWindow(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8) +BOOL +STDCALL +NtUserUpdateLayeredWindow( + HWND hwnd, + HDC hdcDst, + POINT *pptDst, + SIZE *psize, + HDC hdcSrc, + POINT *pptSrc, + COLORREF crKey, + BLENDFUNCTION *pblend, + DWORD dwFlags) { UNIMPLEMENTED return 0; } - - /*

16 years, 5 months

[jimtabor] 34362: Update prototypes and stubs.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 8 00:11:40 2008 New Revision: 34362 URL: http://svn.reactos.org/svn/reactos?rev=34362&view=rev Log: Update prototypes and stubs. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.def trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Tue Jul 8 00:11:40 2008 @@ -378,21 +378,6 @@ /* * @unimplemented */ -BOOL -STDCALL -GetLayeredWindowAttributes( - HWND hwnd, - COLORREF *pcrKey, - BYTE *pbAlpha, - DWORD *pdwFlags) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ UINT STDCALL GetRawInputBuffer( Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Tue Jul 8 00:11:40 2008 @@ -302,7 +302,7 @@ GetKeyboardType@4 GetLastActivePopup@4 GetLastInputInfo@4 -GetLayeredWindowAttributes@16 +GetLayeredWindowAttributes@16=NtUserGetLayeredWindowAttributes@16 GetListBoxInfo@4 GetMenu@4 GetMenuBarInfo@16 Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul 8 00:11:40 2008 @@ -552,12 +552,12 @@ DWORD Unknown1, DWORD Unknown2); -DWORD +BOOL NTAPI NtUserAttachThreadInput( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + IN DWORD idAttach, + IN DWORD idAttachTo, + IN BOOL fAttach); HDC NTAPI NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs); @@ -987,12 +987,12 @@ DWORD Unknown5, DWORD Unknown6); -DWORD +BOOL NTAPI NtUserDdeGetQualityOfService( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + IN HWND hwndClient, + IN HWND hWndServer, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev); DWORD NTAPI @@ -1003,12 +1003,12 @@ DWORD Unknown3, DWORD Unknown4); -DWORD +BOOL NTAPI NtUserDdeSetQualityOfService( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + IN HWND hwndClient, + IN PSECURITY_QUALITY_OF_SERVICE pqosNew, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev); HDWP NTAPI NtUserDeferWindowPos(HDWP WinPosInfo, @@ -1074,13 +1074,13 @@ DWORD dw1, HCURSOR hc1); -DWORD +BOOL NTAPI NtUserDrawAnimatedRects( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWND hwnd, + INT idAni, + RECT *lprcFrom, + RECT *lprcTo); BOOL NTAPI @@ -1178,8 +1178,8 @@ DWORD NTAPI NtUserExcludeUpdateRgn( - DWORD Unknown0, - DWORD Unknown1); + HDC hDC, + HWND hWnd); DWORD NTAPI @@ -1212,15 +1212,15 @@ NtUserFlashWindowEx( DWORD Unknown0); -DWORD +BOOL NTAPI NtUserGetAltTabInfo( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5); + HWND hwnd, + INT iItem, + PALTTABINFO pati, + LPTSTR pszItemText, + UINT cchItemText, + BOOL Ansi); HWND NTAPI NtUserGetAncestor(HWND hWnd, UINT Flags); @@ -1306,12 +1306,12 @@ HWND hWnd, PCOMBOBOXINFO pcbi); -DWORD +HBRUSH NTAPI NtUserGetControlBrush( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hwnd, + HDC hdc, + UINT ctlType); DWORD NTAPI @@ -1447,13 +1447,13 @@ NtUserGetKeyState( DWORD Unknown0); -DWORD +BOOL NTAPI NtUserGetLayeredWindowAttributes( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4); + HWND hwnd, + COLORREF *pcrKey, + BYTE *pbAlpha, + DWORD *pdwFlags); DWORD NTAPI @@ -1509,40 +1509,40 @@ DWORD NTAPI NtUserGetRawInputBuffer( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + PRAWINPUT pData, + PUINT pcbSize, + UINT cbSizeHeader); DWORD NTAPI NtUserGetRawInputData( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5); + HRAWINPUT hRawInput, + UINT uiCommand, + LPVOID pData, + PUINT pcbSize, + UINT cbSizeHeader); DWORD NTAPI NtUserGetRawInputDeviceInfo( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4); + HANDLE hDevice, + UINT uiCommand, + LPVOID pData, + PUINT pcbSize); DWORD NTAPI NtUserGetRawInputDeviceList( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + PRAWINPUTDEVICELIST pRawInputDeviceList, + PUINT puiNumDevices, + UINT cbSize); DWORD NTAPI NtUserGetRegisteredRawInputDevices( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + PRAWINPUTDEVICE pRawInputDevices, + PUINT puiNumDevices, + UINT cbSize); BOOL NTAPI @@ -1614,11 +1614,11 @@ DWORD dwUnknown2, DWORD dwUnknown3); -DWORD +BOOL NTAPI NtUserImpersonateDdeClientWindow( - DWORD Unknown0, - DWORD Unknown1); + HWND hWndClient, + HWND hWndServer); DWORD NTAPI @@ -1706,7 +1706,7 @@ NtUserLockWindowUpdate( DWORD Unknown0); -DWORD +BOOL NTAPI NtUserLockWorkStation(VOID); @@ -1858,12 +1858,12 @@ WPARAM wParam, LPARAM lParam); -DWORD +BOOL NTAPI NtUserPrintWindow( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + HWND hwnd, + HDC hdcBlt, + UINT nFlags); DWORD NTAPI @@ -1956,12 +1956,12 @@ DWORD dwUnknown6, DWORD dwUnknown7); -DWORD +BOOL NTAPI NtUserRegisterRawInputDevices( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + IN PCRAWINPUTDEVICE pRawInputDevices, + IN UINT uiNumDevices, + IN UINT cbSize); DWORD NTAPI @@ -2396,7 +2396,7 @@ HWND hWnd, LONG nCmdShow); -DWORD +BOOL NTAPI NtUserSoundSentry(VOID); @@ -2429,10 +2429,10 @@ UINT wFlags, HKL dwhkl ); -DWORD +BOOL NTAPI NtUserTrackMouseEvent( - DWORD Unknown0); + LPTRACKMOUSEEVENT lpEventTrack); int NTAPI @@ -2516,12 +2516,12 @@ DWORD dwReserved, BOOL bEnable); -DWORD +BOOL NTAPI NtUserUserHandleGrantAccess( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + IN HANDLE hUserHandle, + IN HANDLE hJob, + IN BOOL bGrant); BOOL NTAPI @@ -2552,9 +2552,9 @@ DWORD NTAPI NtUserWaitForInputIdle( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + IN HANDLE hProcess, + IN DWORD dwMilliseconds, + IN BOOL Unknown2); // Always FALSE DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Jul 8 00:11:40 2008 @@ -24,12 +24,13 @@ return 0; } -DWORD -STDCALL + +BOOL +NTAPI NtUserAttachThreadInput( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) + IN DWORD idAttach, + IN DWORD idAttachTo, + IN BOOL fAttach) { UNIMPLEMENTED @@ -106,12 +107,12 @@ return 0; } -DWORD -STDCALL +BOOL +NTAPI NtUserDdeGetQualityOfService( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) + IN HWND hwndClient, + IN HWND hWndServer, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) { UNIMPLEMENTED @@ -132,20 +133,20 @@ return 0; } -DWORD -STDCALL +BOOL +NTAPI NtUserDdeSetQualityOfService( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL + IN HWND hwndClient, + IN PSECURITY_QUALITY_OF_SERVICE pqosNew, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) +{ + UNIMPLEMENTED + + return 0; +} + +DWORD +NTAPI NtUserDragObject( HWND hwnd1, HWND hwnd2, @@ -159,13 +160,13 @@ return 0; } -DWORD -STDCALL +BOOL +NTAPI NtUserDrawAnimatedRects( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) + HWND hwnd, + INT idAni, + RECT *lprcFrom, + RECT *lprcTo) { UNIMPLEMENTED @@ -216,37 +217,37 @@ } DWORD -STDCALL +NTAPI NtUserExcludeUpdateRgn( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL + HDC hDC, + HWND hWnd) +{ + UNIMPLEMENTED + + return 0; +} + +BOOL +NTAPI NtUserGetAltTabInfo( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL + HWND hwnd, + INT iItem, + PALTTABINFO pati, + LPTSTR pszItemText, + UINT cchItemText, + BOOL Ansi) +{ + UNIMPLEMENTED + + return 0; +} + +HBRUSH +NTAPI NtUserGetControlBrush( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) + HWND hwnd, + HDC hdc, + UINT ctlType) { UNIMPLEMENTED @@ -337,11 +338,11 @@ -DWORD -STDCALL +BOOL +NTAPI NtUserImpersonateDdeClientWindow( - DWORD Unknown0, - DWORD Unknown1) + HWND hWndClient, + HWND hWndServer) { UNIMPLEMENTED @@ -382,8 +383,8 @@ return 0; } -DWORD -STDCALL +BOOL +NTAPI NtUserLockWorkStation(VOID) { UNIMPLEMENTED @@ -572,10 +573,10 @@ return 0; } -DWORD -STDCALL +BOOL +NTAPI NtUserTrackMouseEvent( - DWORD Unknown0) + LPTRACKMOUSEEVENT lpEventTrack) { UNIMPLEMENTED @@ -607,24 +608,24 @@ return 0; } -DWORD -STDCALL +BOOL +NTAPI NtUserUserHandleGrantAccess( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL + IN HANDLE hUserHandle, + IN HANDLE hJob, + IN BOOL bGrant) +{ + UNIMPLEMENTED + + return 0; +} + +DWORD +NTAPI NtUserWaitForInputIdle( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) + IN HANDLE hProcess, + IN DWORD dwMilliseconds, + IN BOOL Unknown2) // Always FALSE { UNIMPLEMENTED @@ -746,6 +747,65 @@ DWORD NTAPI NtUserGetRawInputBuffer( + PRAWINPUT pData, + PUINT pcbSize, + UINT cbSizeHeader) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputData( + HRAWINPUT hRawInput, + UINT uiCommand, + LPVOID pData, + PUINT pcbSize, + UINT cbSizeHeader) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputDeviceInfo( + HANDLE hDevice, + UINT uiCommand, + LPVOID pData, + PUINT pcbSize +) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputDeviceList( + PRAWINPUTDEVICELIST pRawInputDeviceList, + PUINT puiNumDevices, + UINT cbSize) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRegisteredRawInputDevices( + PRAWINPUTDEVICE pRawInputDevices, + PUINT puiNumDevices, + UINT cbSize) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserHardErrorControl( DWORD dwUnknown1, DWORD dwUnknown2, DWORD dwUnknown3) @@ -756,20 +816,29 @@ DWORD NTAPI -NtUserGetRawInputData( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -NTAPI -NtUserGetRawInputDeviceInfo( +NtUserInitialize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserMinMaximize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserNotifyProcessCreate( DWORD dwUnknown1, DWORD dwUnknown2, DWORD dwUnknown3, @@ -779,79 +848,12 @@ return 0; } -DWORD -NTAPI -NtUserGetRawInputDeviceList( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -NTAPI -NtUserGetRegisteredRawInputDevices( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -NTAPI -NtUserHardErrorControl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -NTAPI -NtUserInitialize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -NTAPI -NtUserMinMaximize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -NTAPI -NtUserNotifyProcessCreate( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD +BOOL NTAPI NtUserPrintWindow( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) + HWND hwnd, + HDC hdcBlt, + UINT nFlags) { UNIMPLEMENTED; return 0; @@ -941,12 +943,12 @@ return 0; } -DWORD +BOOL NTAPI NtUserRegisterRawInputDevices( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) + IN PCRAWINPUTDEVICE pRawInputDevices, + IN UINT uiNumDevices, + IN UINT cbSize) { UNIMPLEMENTED; return 0; @@ -1017,7 +1019,7 @@ return 0; } -DWORD +BOOL NTAPI NtUserSoundSentry(VOID) { @@ -1070,13 +1072,13 @@ return 0; } -DWORD +BOOL NTAPI NtUserGetLayeredWindowAttributes( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) + HWND hwnd, + COLORREF *pcrKey, + BYTE *pbAlpha, + DWORD *pdwFlags) { UNIMPLEMENTED; return 0;

16 years, 5 months

[arty] 34361: Move completion out of the spinlock. Spotted by aicom

by arty＠svn.reactos.org

Author: arty Date: Mon Jul 7 22:01:56 2008 New Revision: 34361 URL: http://svn.reactos.org/svn/reactos?rev=34361&view=rev Log: Move completion out of the spinlock. Spotted by aicom Modified: trunk/reactos/drivers/network/afd/afd/event.c Modified: trunk/reactos/drivers/network/afd/afd/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ev… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/event.c [iso-8859-1] Mon Jul 7 22:01:56 2008 @@ -141,6 +141,7 @@ NTSTATUS Status; KIRQL OldIrql; ULONG Count; + BOOLEAN CompleteIrp; AFD_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -173,7 +174,7 @@ KeAcquireSpinLock(&FCB->ReceiveQueueLock, &OldIrql); - if (!IsListEmpty(&FCB->ReadRequestQueue)) { + if (CompleteIrp = !IsListEmpty(&FCB->ReadRequestQueue)) { AFD_DbgPrint(MAX_TRACE, ("Satisfying read request.\n")); Entry = RemoveHeadList(&FCB->ReceiveQueue); @@ -190,15 +191,15 @@ ReadRequest->Irp->IoStatus.Information = 0; ReadRequest->Irp->IoStatus.Status = Status; - + } + + KeReleaseSpinLock(&FCB->ReceiveQueueLock, OldIrql); + + if (CompleteIrp) { AFD_DbgPrint(MAX_TRACE, ("Completing IRP at (0x%X).\n", ReadRequest->Irp)); - IoCompleteRequest(ReadRequest->Irp, IO_NETWORK_INCREMENT); + *BytesTaken = BytesAvailable; } - - KeReleaseSpinLock(&FCB->ReceiveQueueLock, OldIrql); - - *BytesTaken = BytesAvailable; AFD_DbgPrint(MAX_TRACE, ("Leaving.\n"));

16 years, 5 months

[silverblade] 34360: Wave buffers are now split up into chunks before being fed to the sound driver. Testing by writing 65, 536 bytes using an un-even block size of 16, 383. Results in 4 x 16, 383 byte blocks and 1 x 4 byte block, as expected. Completion of one buffer results in submission of the next. Doesn't handle multiple WAVEHDRs yet.

by silverblade＠svn.reactos.org

Author: silverblade Date: Mon Jul 7 17:59:45 2008 New Revision: 34360 URL: http://svn.reactos.org/svn/reactos?rev=34360&view=rev Log: Wave buffers are now split up into chunks before being fed to the sound driver. Testing by writing 65,536 bytes using an un-even block size of 16,383. Results in 4 x 16,383 byte blocks and 1 x 4 byte block, as expected. Completion of one buffer results in submission of the next. Doesn't handle multiple WAVEHDRs yet. Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Mon Jul 7 17:59:45 2008 @@ -169,7 +169,8 @@ PWAVEHDR FirstBuffer; PWAVEHDR LastBuffer; - /*DWORD RemainingBytes;*/ + /* How much data is waiting with the driver */ + DWORD RemainingBytes; } WAVE_THREAD_DATA, *PWAVE_THREAD_DATA; /* Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Mon Jul 7 17:59:45 2008 @@ -12,6 +12,11 @@ 4 July 2008 - Created 5 July 2008 - Implemented basic request processing 6 July 2008 - Added I/O completion handling + + Possible improvements: + Spawn *one* thread to deal with requests and I/O completion, rather + than have a thread per sound device instance. This wouldn't be too + hard to do but not worth doing right now. */ /* Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] Mon Jul 7 17:59:45 2008 @@ -23,23 +23,97 @@ /* - Just a neat wrapper around the writing routine. -*/ - -MMRESULT -WriteWaveBufferToSoundDevice( + How much we can feed to the driver at a time. + This is deliberately set low at the moment for testing purposes, and + intentionally set to be "one out" from 16384 so that writing 65536 bytes + results in 4x16383 byte buffers followed by 1x4 byte buffer. + + Should it be configurable? Some sound drivers let you set buffer size... +*/ +#define MAX_SOUND_BUFFER_SIZE 16383 + + +/* + Audio buffer I/O streaming handler. Slices 'n dices your buffers and + serves them up on a platter with a side dressing of your choice. + + It's safe to update the buffer information post-submission within this + routine since any completion will be done in an APC for the same thread, + so we're not likely to be rudely interrupted by a completion routine + bursting through the door. +*/ +MMRESULT +StreamWaveData( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PWAVE_THREAD_DATA ThreadData, - IN PWAVEHDR WaveHeader) -{ - SOUND_ASSERT(SoundDeviceInstance); - SOUND_ASSERT(ThreadData); - SOUND_ASSERT(WaveHeader); - - return OverlappedWriteToSoundDevice(SoundDeviceInstance, - (PVOID) WaveHeader, - WaveHeader->lpData, - WaveHeader->dwBufferLength); + IN PWAVE_THREAD_DATA ThreadData) +{ + PWAVEHDR Buffer = ThreadData->CurrentBuffer; + DWORD BufferOffset, BytesToStream, BytesAvailable; + MMRESULT Result; + + SOUND_ASSERT(ThreadData->RemainingBytes <= MAX_SOUND_BUFFER_SIZE); + SOUND_ASSERT(Buffer); + + /* The 'reserved' member of Buffer contains the offset */ + BufferOffset = Buffer->reserved; + + /* Work out how much data can be streamed with the driver */ + BytesAvailable = MAX_SOUND_BUFFER_SIZE - ThreadData->RemainingBytes; + + /* + If no space available, don't do anything. The routine will be revisited + as buffers complete, at which point the backlog will start being + dealt with. + */ + if ( BytesAvailable == 0 ) + return MMSYSERR_NOERROR; + + /* + Adjust the amount of data to be streamed based on how much of the + current buffer has actually been dealt with already. + */ + BytesToStream = Buffer->dwBufferLength - BufferOffset; + + /* + No point in doing work unless we have to... This is, however, a + completed buffer, so it should be dealt with!! + */ + if ( BytesToStream == 0 ) + { + /* TODO */ + return MMSYSERR_NOERROR; + } + + /* + Now we know how much buffer is waiting to be provided to the driver, + we need to consider how much the driver can accept. + */ + if ( BytesToStream > BytesAvailable ) + { + /* Buffer can't fit entirely - fill the available space */ + BytesToStream = BytesAvailable; + } + + /* + Now the audio buffer sets sail on its merry way to the sound driver... + NOTE: Will need to implement a 'read' function, too. + */ + Result = OverlappedWriteToSoundDevice(SoundDeviceInstance, + (PVOID) ThreadData, + Buffer->lpData + BufferOffset, + BytesToStream); + + if ( Result != MMSYSERR_NOERROR ) + return Result; + + /* Update the offset ready for the next streaming operation */ + BufferOffset += BytesToStream; + Buffer->reserved = BufferOffset; + + /* More data has been sent to the driver, so this is updated, too */ + ThreadData->RemainingBytes += BytesToStream; + + return MMSYSERR_NOERROR; } @@ -53,12 +127,15 @@ IN PWAVE_THREAD_DATA ThreadData, IN PWAVEHDR Buffer) { +/* DWORD BytesSubmitted = 0;*/ + SOUND_ASSERT(Instance != NULL); SOUND_ASSERT(Buffer != NULL); SOUND_ASSERT(Instance->Thread != NULL); - /* Store the device instance */ - Buffer->reserved = (DWORD) Instance; + /* This is used to mark the offset within the buffer */ + Buffer->reserved = 0; + /* TODO: Clear completion flag */ /* Set the head of the buffer list if this is the first buffer */ if ( ! ThreadData->FirstBuffer ) @@ -78,18 +155,13 @@ /* Increment the number of buffers queued */ ++ ThreadData->BufferCount; - /* HACK */ - ThreadData->CurrentBuffer = ThreadData->FirstBuffer; - - WriteWaveBufferToSoundDevice(Instance, ThreadData, Buffer); - -/* - Result = WriteSoundDeviceBuffer(Instance, - ThreadData->CurrentBuffer->lpData, - ThreadData->CurrentBuffer->dwBufferLength, - WaveBufferCompleted, - (LPOVERLAPPED) &Thread->Wave.Overlapped); -*/ + /* If nothing is playing, we'll need to start things off */ + if ( ThreadData->RemainingBytes == 0 ) + { + ThreadData->CurrentBuffer = ThreadData->FirstBuffer; + StreamWaveData(Instance, ThreadData); + } + return MMSYSERR_NOERROR; } @@ -141,10 +213,12 @@ IN PVOID ContextData, IN DWORD BytesTransferred) { - LPWAVEHDR WaveHeader = (LPWAVEHDR) ContextData; - - SOUND_DEBUG(L"ProcessWaveIoCompletion called :)"); - SOUND_DEBUG_HEX(WaveHeader); + PWAVE_THREAD_DATA ThreadData = (PWAVE_THREAD_DATA) ContextData; + SOUND_ASSERT(ThreadData); + WCHAR msg[1024]; + + /*SOUND_DEBUG(L"ProcessWaveIoCompletion called :)");*/ + /*SOUND_DEBUG_HEX(WaveHeader);*/ /* At this point we know: @@ -164,6 +238,21 @@ thread will wait for more requests from the client before it does anything else. */ + + /* Discount the amount of buffer which has been processed */ + SOUND_ASSERT(BytesTransferred <= ThreadData->RemainingBytes); + ThreadData->RemainingBytes -= BytesTransferred; + + wsprintf(msg, L"Wave header: %x\nOffset: %d\nTransferred: %d bytes\nRemaining: %d bytes", + ThreadData->CurrentBuffer, + ThreadData->CurrentBuffer->reserved, + BytesTransferred, + ThreadData->RemainingBytes); + + MessageBox(0, msg, L"I/O COMPLETE", MB_OK | MB_TASKMODAL); + + /* TODO: Check return value */ + StreamWaveData(Instance, ThreadData); }

16 years, 5 months

← Newer
1
...
60
61
62
63
64
65
66
...
77
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008