Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 45643: - Sync to wine release 1.1.39.
by jimtabor＠svn.reactos.org 21 Feb '10

21 Feb '10

Author: jimtabor Date: Sun Feb 21 04:11:32 2010 New Revision: 45643 URL: http://svn.reactos.org/svn/reactos?rev=45643&view=rev Log: - Sync to wine release 1.1.39. Modified: trunk/rostests/winetests/user32/combo.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/input.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/combo.c?… ============================================================================== --- trunk/rostests/winetests/user32/combo.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/combo.c [iso-8859-1] Sun Feb 21 04:11:32 2010 @@ -401,6 +401,106 @@ DestroyWindow(hCombo); } +static void test_editselection(void) +{ + HWND hCombo; + INT start,end; + HWND hEdit; + COMBOBOXINFO cbInfo; + BOOL ret; + DWORD len; + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + char edit[20]; + + pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo){ + win_skip("GetComboBoxInfo is not available\n"); + return; + } + + /* Build a combo */ + hCombo = build_combo(CBS_SIMPLE); + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get combobox info structure. LastError=%d\n", + GetLastError()); + hEdit = cbInfo.hwndItem; + + /* Initially combo selection is empty*/ + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Set some text, and press a key to replace it */ + edit[0] = 0x00; + SendMessage(hCombo, WM_SETTEXT, 0, (LPARAM)"Jason1"); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason1")==0, "Unexpected text retrieved %s\n", edit); + + /* Now what is the selection - still empty */ + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Give it focus, and it gets selected */ + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now emulate a key press */ + edit[0] = 0x00; + SendMessage(hCombo, WM_CHAR, 'A', 0x1c0001); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "A")==0, "Unexpected text retrieved %s\n", edit); + + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now what happens when it gets more focus a second time - it doesnt reselect */ + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); + DestroyWindow(hCombo); + + /* Start again - Build a combo */ + hCombo = build_combo(CBS_SIMPLE); + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get combobox info structure. LastError=%d\n", + GetLastError()); + hEdit = cbInfo.hwndItem; + + /* Set some text and give focus so it gets selected */ + edit[0] = 0x00; + SendMessage(hCombo, WM_SETTEXT, 0, (LPARAM)"Jason2"); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason2")==0, "Unexpected text retrieved %s\n", edit); + + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + + /* Now what is the selection */ + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now change the selection to the apparently invalid start -1, end -1 and + show it means no selection (ie start -1) but cursor at end */ + SendMessage(hCombo, CB_SETEDITSEL, 0, -1); + edit[0] = 0x00; + SendMessage(hCombo, WM_CHAR, 'A', 0x1c0001); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason2A")==0, "Unexpected text retrieved %s\n", edit); + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindow("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -414,6 +514,7 @@ test_WM_LBUTTONDOWN(); test_changesize(CBS_DROPDOWN); test_changesize(CBS_DROPDOWNLIST); + test_editselection(); DestroyWindow(hMainWnd); } Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Sun Feb 21 04:11:32 2010 @@ -868,6 +868,14 @@ len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); test_notify(1, 0, 1); + + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + SendMessage(hParent, WM_SETFOCUS, 0, (LPARAM)hWnd); + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); Modified: trunk/rostests/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/input.c?… ============================================================================== --- trunk/rostests/winetests/user32/input.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/input.c [iso-8859-1] Sun Feb 21 04:11:32 2010 @@ -44,7 +44,7 @@ * */ -#define _WIN32_WINNT 0x500 +#define _WIN32_WINNT 0x401 #define _WIN32_IE 0x0500 #include <stdarg.h> Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Sun Feb 21 04:11:32 2010 @@ -1890,8 +1890,10 @@ { INPUT_KEYBOARD, {{0}}, {'D', 0}, FALSE, FALSE }, { INPUT_KEYBOARD, {{0}}, {VK_MENU, 'M', 'P', 0}, TRUE, FALSE }, { INPUT_KEYBOARD, {{0}}, {'E', 0}, FALSE, FALSE }, - - { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 18 */ + { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE }, + { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE }, + + { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */ { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sun Feb 21 04:11:32 2010 @@ -297,7 +297,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_STATECHANGED }, /* in the 1st MDI child */ { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, /* in the 1st MDI child */ { WM_CHILDACTIVATE, sent|defwinproc }, /* in the 1st MDI child */ - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, /* in the 1st MDI child */ + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, /* in the 1st MDI child */ { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* in the 1st MDI child */ /* Lock redraw 2nd MDI child */ { WM_SETREDRAW, sent|wparam|defwinproc, 0 }, /* in the 2nd MDI child */ @@ -306,7 +306,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_STATECHANGED },/* in the 2nd MDI child */ { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 },/* in the 2nd MDI child */ { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, /* in the 2nd MDI child */ - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, /* in the 2nd MDI child */ + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, /* in the 2nd MDI child */ { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, /* in the 2nd MDI child */ { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* in the 2nd MDI child */ /* Redraw 2nd MDI child */ @@ -2475,7 +2475,7 @@ { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* in MDI frame */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -2528,7 +2528,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, /* in MDI frame */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -2550,7 +2550,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* in MDI frame */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -2615,7 +2615,7 @@ { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* in MDI frame */ @@ -2721,7 +2721,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* in MDI frame */ @@ -2763,7 +2763,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|defwinproc|wparam, 1 }, { WM_CHILDACTIVATE, sent|defwinproc|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* restore the 2nd MDI child */ @@ -2774,7 +2774,7 @@ { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI frame */ @@ -3021,7 +3021,7 @@ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional|defwinproc }, { WM_MDIACTIVATE, sent|optional|defwinproc }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* in MDI frame */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -3136,7 +3136,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, /* in MDI frame */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -3152,7 +3152,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, /* in MDI frame */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -3169,7 +3169,7 @@ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_NOCLIENTSIZE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ @@ -3186,7 +3186,7 @@ { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_NOCLIENTSIZE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { WM_CHILDACTIVATE, sent|wparam|lparam|defwinproc, 0, 0 }, @@ -3203,7 +3203,7 @@ { WM_NCCALCSIZE, sent|wparam, 1 }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, /* in MDI frame */ { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -3359,6 +3359,7 @@ CLIENTCREATESTRUCT client_cs; HWND mdi_frame, mdi_child, mdi_child2, active_child; BOOL zoomed; + RECT rc; HMENU hMenu = CreateMenu(); assert(mdi_RegisterWindowClasses()); @@ -3379,12 +3380,13 @@ ok(GetFocus() == mdi_frame, "wrong focus window %p\n", GetFocus()); trace("creating MDI client window\n"); + GetClientRect(mdi_frame, &rc); client_cs.hWindowMenu = 0; client_cs.idFirstChild = MDI_FIRST_CHILD_ID; mdi_client = CreateWindowExA(0, "MDI_client_class", NULL, WS_CHILD | WS_VISIBLE | MDIS_ALLCHILDSTYLES, - 0, 0, 0, 0, + rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, mdi_frame, 0, GetModuleHandleA(0), &client_cs); assert(mdi_client); ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); @@ -3570,7 +3572,7 @@ flush_sequence(); ShowWindow(mdi_child2, SW_RESTORE); - ok_sequence(WmRestoreMDIchildVisibleSeq_2, "ShowWindow(SW_RESTORE):minimized MDI child", TRUE); + ok_sequence(WmRestoreMDIchildVisibleSeq_2, "ShowWindow(SW_RESTORE):minimized MDI child", FALSE); ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetFocus() == mdi_child2, "wrong focus window %p\n", GetFocus()); @@ -6903,6 +6905,32 @@ { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, { 0 } }; +static const struct message WmShiftF10Seq[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 1 }, /* XP */ + { WM_KEYDOWN, wparam|lparam, VK_SHIFT, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_SHIFT, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, + { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, -1 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_KEYMENU }, + { HCBT_SYSCOMMAND, hook }, + { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_INITMENU, sent|defwinproc }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xd0000001 }, /* XP */ + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0x10000001 }, /* XP */ + { WM_CAPTURECHANGED, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0xc0000001 }, /* XP */ + { WM_KEYUP, wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { 0 } +}; static void pump_msg_loop(HWND hwnd, HACCEL hAccel) { @@ -7122,6 +7150,16 @@ keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, 0); ok_sequence(WmVkF10Seq, "VK_F10 press/release", TRUE); + + trace("testing SHIFT+F10 press/release\n"); + keybd_event(VK_SHIFT, 0, 0, 0); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_ESCAPE, 0, 0, 0); + keybd_event(VK_ESCAPE, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmShiftF10Seq, "SHIFT+F10 press/release", TRUE); trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Sun Feb 21 04:11:32 2010 @@ -52,6 +52,7 @@ static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); +static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -61,6 +62,8 @@ static const char* szAWRClass = "Winsize"; static HMENU hmenu; static DWORD our_pid; + +static BOOL is_win9x = FALSE; #define COUNTOF(arr) (sizeof(arr)/sizeof(arr[0])) @@ -444,6 +447,17 @@ ret = SetParent( test, child ); ok( ret == desktop, "SetParent return value %p expected %p\n", ret, desktop ); check_parents( test, child, child, 0, 0, hwndMain, test ); + + if (!is_win9x) + { + ShowWindow( test, SW_SHOW ); + ret = SetParent( test, test ); + ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); + ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); + check_parents( test, child, child, 0, 0, hwndMain, test ); + } + else + win_skip( "Test crashes on Win9x/WinMe\n" ); DestroyWindow( test ); /* owned popup */ @@ -639,7 +653,6 @@ } case WM_WINDOWPOSCHANGING: { - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; WINDOWPOS *winpos = (WINDOWPOS *)lparam; trace("main: WM_WINDOWPOSCHANGING %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", winpos->hwnd, winpos->hwndInsertAfter, @@ -848,7 +861,6 @@ DWORD style, exstyle; RECT rc_window, rc_client, rc; BOOL menu; - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; LRESULT ret; style = GetWindowLongA(hwnd, GWL_STYLE); @@ -1032,9 +1044,9 @@ HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; HWND shellWindow, nextWnd; - if (!GetWindowLongW(GetDesktopWindow(), GWL_STYLE)) - { - trace("Skipping shell window test on Win9x\n"); + if (is_win9x) + { + win_skip("Skipping shell window test on Win9x\n"); return; } @@ -1899,7 +1911,6 @@ { RECT orig_win_rc, rect; LONG_PTR old_proc; - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; SetRect(&rect, 111, 222, 333, 444); ok(!GetWindowRect(0, &rect), "GetWindowRect succeeded\n"); @@ -1962,7 +1973,6 @@ { HWND child; HMENU hMenu, ret; - BOOL is_win9x = GetWindowLongPtrW(parent, GWLP_WNDPROC) == 0; BOOL retok; DWORD style; @@ -2149,7 +2159,7 @@ /*trace("skipping next %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDNEXT); } - ok_(file, line)(next == test, "expected next %p, got %p\n", next, test); + ok_(file, line)(next == test, "%p: expected next %p, got %p\n", hwnd, next, test); test = GetWindow(hwnd, GW_HWNDPREV); /* skip foreign windows */ @@ -2161,13 +2171,14 @@ /*trace("skipping prev %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDPREV); } - ok_(file, line)(prev == test, "expected prev %p, got %p\n", prev, test); + ok_(file, line)(prev == test, "%p: expected prev %p, got %p\n", hwnd, prev, test); test = GetWindow(hwnd, GW_OWNER); - ok_(file, line)(owner == test, "expected owner %p, got %p\n", owner, test); + ok_(file, line)(owner == test, "%p: expected owner %p, got %p\n", hwnd, owner, test); ex_style = GetWindowLong(hwnd, GWL_EXSTYLE); - ok_(file, line)(!(ex_style & WS_EX_TOPMOST) == !topmost, "expected %stopmost\n", topmost ? "" : "NOT "); + ok_(file, line)(!(ex_style & WS_EX_TOPMOST) == !topmost, "%p: expected %stopmost\n", + hwnd, topmost ? "" : "NOT "); } static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) @@ -2248,6 +2259,20 @@ check_z_order(hwnd_A, hwnd_D, 0, 0, TRUE); #endif + /* make hwnd_C owned by a topmost window */ + DestroyWindow( hwnd_C ); + hwnd_C = CreateWindowEx(0, "MainWindowClass", NULL, + WS_POPUP, + 100, 100, 100, 100, + hwnd_A, 0, GetModuleHandle(0), NULL); + trace("hwnd_C %p\n", hwnd_C); + check_z_order(hwnd_E, 0, hwnd_D, 0, FALSE); + check_z_order(hwnd_D, hwnd_E, hwnd_F, 0, FALSE); + check_z_order(hwnd_F, hwnd_D, hwnd_B, 0, FALSE); + check_z_order(hwnd_B, hwnd_F, hwnd_A, hwnd_F, TRUE); + check_z_order(hwnd_A, hwnd_B, hwnd_C, 0, TRUE); + check_z_order(hwnd_C, hwnd_A, 0, hwnd_A, TRUE); + DestroyWindow(hwnd_A); DestroyWindow(hwnd_B); DestroyWindow(hwnd_C); @@ -2265,7 +2290,7 @@ ok( GetRandomRgn( hdc, hrgn, SYSRGN ) != 0, "GetRandomRgn failed\n" ); GetWindowRect( hwnd, &win_rect ); GetRgnBox( hrgn, &rgn_rect ); - if (GetVersion() & 0x80000000) + if (is_win9x) { trace("win9x, mapping to screen coords\n"); MapWindowPoints( hwnd, 0, (POINT *)&rgn_rect, 2 ); @@ -2697,6 +2722,122 @@ ok (ret, "releasecapture did not return TRUE after second try.\n"); } +static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + GUITHREADINFO gti; + HWND cap_wnd, cap_wnd2, set_cap_wnd; + BOOL status; + switch (msg) + { + case WM_CAPTURECHANGED: + + /* now try to release capture from menu. this should fail */ + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } + cap_wnd = GetCapture(); + + /* check that re-setting the capture for the menu fails */ + set_cap_wnd = SetCapture(cap_wnd); + ok(!set_cap_wnd || broken(set_cap_wnd == cap_wnd), /* nt4 */ + "SetCapture should have failed!\n"); + if (set_cap_wnd) + { + DestroyWindow(hWnd); + break; + } + + /* check that SetCapture fails for another window and that it does not touch the error code */ + set_cap_wnd = SetCapture(hWnd); + ok(!set_cap_wnd, "SetCapture should have failed!\n"); + + /* check that ReleaseCapture fails and does not touch the error code */ + status = ReleaseCapture(); + ok(!status, "ReleaseCapture should have failed!\n"); + + /* check that thread info did not change */ + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } + + /* verify that no capture change took place */ + cap_wnd2 = GetCapture(); + ok(cap_wnd2 == cap_wnd, "Capture changed!\n"); + + /* we are done. kill the window */ + DestroyWindow(hWnd); + break; + + default: + return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); + } + return 0; +} + +/* Test that no-one can mess around with the current capture while a menu is open */ +static void test_capture_4(void) +{ + BOOL ret; + HMENU hmenu; + HWND hwnd; + WNDCLASSA wclass; + HINSTANCE hInstance = GetModuleHandleA( NULL ); + + if (!pGetGUIThreadInfo) + { + win_skip("GetGUIThreadInfo is not available\n"); + return; + } + wclass.lpszClassName = "TestCapture4Class"; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = test_capture_4_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIconA( 0, IDI_APPLICATION ); + wclass.hCursor = LoadCursorA( NULL, IDC_ARROW ); + wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + assert (RegisterClassA( &wclass )); + assert (hwnd = CreateWindowA( wclass.lpszClassName, "MenuTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, + 400, 200, NULL, NULL, hInstance, NULL) ); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + if (!hwnd) return; + hmenu = CreatePopupMenu(); + + ret = AppendMenuA( hmenu, MF_STRING, 1, "winetest2"); + ok( ret, "AppendMenuA has failed!\n"); + + /* set main window to have initial capture */ + SetCapture(hwnd); + + if (is_win9x) + { + win_skip("TrackPopupMenu test crashes on Win9x/WinMe\n"); + } + else + { + /* create popup (it will self-destruct) */ + ret = TrackPopupMenu(hmenu, TPM_RETURNCMD, 100, 100, 0, hwnd, NULL); + ok( ret == 0, "TrackPopupMenu returned %d expected zero\n", ret); + } + + /* clean up */ + DestroyMenu(hmenu); + DestroyWindow(hwnd); +} + /* PeekMessage wrapper that ignores the messages we don't care about */ static BOOL peek_message( MSG *msg ) { @@ -2871,6 +3012,7 @@ if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); + DispatchMessage(&msg); } ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); @@ -3096,6 +3238,7 @@ BOOL ret; HWND desktop = GetDesktopWindow(); HMENU hMenu; + /* FIXME: This detection is not correct as it also covers (all?) XP+ */ BOOL is_win9x = GetWindowLongPtrW(desktop, GWLP_WNDPROC) == 0; HWND parent, child1, child2, child3, child4, sibling; @@ -3156,6 +3299,8 @@ check_parents(child3, child2, child2, child2, 0, child2, parent); check_parents(child4, desktop, child2, child2, child2, child4, parent); } + else + skip("Win9x/WinMe crash\n"); hMenu = CreateMenu(); sibling = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, @@ -5790,8 +5935,13 @@ pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); + pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); if (!RegisterWindowClasses()) assert(0); + + SetLastError(0xdeafbeef); + GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC); + is_win9x = (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); if (!hhook) win_skip( "Cannot set CBT hook, skipping some tests\n" ); @@ -5821,6 +5971,7 @@ test_capture_1(); test_capture_2(); test_capture_3(hwndMain, hwndMain2); + test_capture_4(); test_CreateWindow(); test_parent_owner();

1 0

[jimtabor] 45642: - Sync to wine release 1.1.39.
by jimtabor＠svn.reactos.org 21 Feb '10

21 Feb '10

Author: jimtabor Date: Sun Feb 21 04:00:07 2010 New Revision: 45642 URL: http://svn.reactos.org/svn/reactos?rev=45642&view=rev Log: - Sync to wine release 1.1.39. Modified: trunk/rostests/winetests/gdi32/clipping.c trunk/rostests/winetests/gdi32/font.c Modified: trunk/rostests/winetests/gdi32/clipping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/clipping.… ============================================================================== --- trunk/rostests/winetests/gdi32/clipping.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/clipping.c [iso-8859-1] Sun Feb 21 04:00:07 2010 @@ -265,8 +265,96 @@ DeleteObject(hrgn); } +static void test_GetClipRgn(void) +{ + HDC hdc; + HRGN hrgn, hrgn2, hrgn3, hrgn4; + int ret; + + /* Test calling GetClipRgn with NULL device context and region handles. */ + ret = GetClipRgn(NULL, NULL); + ok(ret == -1, "Expected GetClipRgn to return -1, got %d\n", ret); + + hdc = GetDC(NULL); + ok(hdc != NULL, "Expected GetDC to return a valid device context handle\n"); + + /* Test calling GetClipRgn with a valid device context and NULL region. */ + ret = GetClipRgn(hdc, NULL); + ok(ret == 0 || + ret == -1 /* Win9x */, + "Expected GetClipRgn to return 0, got %d\n", ret); + + /* Initialize the test regions. */ + hrgn = CreateRectRgn(100, 100, 100, 100); + ok(hrgn != NULL, + "Expected CreateRectRgn to return a handle to a new rectangular region\n"); + + hrgn2 = CreateRectRgn(1, 2, 3, 4); + ok(hrgn2 != NULL, + "Expected CreateRectRgn to return a handle to a new rectangular region\n"); + + hrgn3 = CreateRectRgn(1, 2, 3, 4); + ok(hrgn3 != NULL, + "Expected CreateRectRgn to return a handle to a new rectangular region\n"); + + hrgn4 = CreateRectRgn(1, 2, 3, 4); + ok(hrgn4 != NULL, + "Expected CreateRectRgn to return a handle to a new rectangular region\n"); + + /* Try getting a clipping region from the device context + * when the device context's clipping region isn't set. */ + ret = GetClipRgn(hdc, hrgn2); + ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); + + /* The region passed to GetClipRgn should be unchanged. */ + ret = EqualRgn(hrgn2, hrgn3); + ok(ret == 1, + "Expected EqualRgn to compare the two regions as equal, got %d\n", ret); + + /* Try setting and getting back a clipping region. */ + ret = SelectClipRgn(hdc, hrgn); + ok(ret == NULLREGION, + "Expected SelectClipRgn to return NULLREGION, got %d\n", ret); + + /* Passing a NULL region handle when the device context + * has a clipping region results in an error. */ + ret = GetClipRgn(hdc, NULL); + ok(ret == -1, "Expected GetClipRgn to return -1, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn2); + ok(ret == 1, "Expected GetClipRgn to return 1, got %d\n", ret); + + ret = EqualRgn(hrgn, hrgn2); + ok(ret == 1, + "Expected EqualRgn to compare the two regions as equal, got %d\n", ret); + + /* Try unsetting and then query the clipping region. */ + ret = SelectClipRgn(hdc, NULL); + ok(ret == SIMPLEREGION, + "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret); + + ret = GetClipRgn(hdc, NULL); + ok(ret == 0 || + ret == -1 /* Win9x */, + "Expected GetClipRgn to return 0, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn3); + ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); + + ret = EqualRgn(hrgn3, hrgn4); + ok(ret == 1, + "Expected EqualRgn to compare the two regions as equal, got %d\n", ret); + + DeleteObject(hrgn4); + DeleteObject(hrgn3); + DeleteObject(hrgn2); + DeleteObject(hrgn); + ReleaseDC(NULL, hdc); +} + START_TEST(clipping) { test_GetRandomRgn(); test_ExtCreateRegion(); -} + test_GetClipRgn(); +} Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sun Feb 21 04:00:07 2010 @@ -307,9 +307,6 @@ TEXTMETRICA tm_orig; SIZE size_orig; INT ret, i, width_orig, height_orig, scale, lfWidth; - - skip("ROS-HACK: Skipping bitmap font tests!\n"); - return; hdc = GetDC(0); @@ -2851,7 +2848,7 @@ static void test_oemcharset(void) { HDC hdc; - LOGFONTA lf; + LOGFONTA lf, clf; HFONT hfont, old_hfont; int charset; @@ -2866,7 +2863,12 @@ charset = GetTextCharset(hdc); todo_wine ok(charset == OEM_CHARSET, "expected %d charset, got %d\n", OEM_CHARSET, charset); - SelectObject(hdc, old_hfont); + hfont = SelectObject(hdc, old_hfont); + GetObjectA(hfont, sizeof(clf), &clf); + ok(!lstrcmpA(clf.lfFaceName, lf.lfFaceName), "expected %s face name, got %s\n", lf.lfFaceName, clf.lfFaceName); + ok(clf.lfPitchAndFamily == lf.lfPitchAndFamily, "expected %x family, got %x\n", lf.lfPitchAndFamily, clf.lfPitchAndFamily); + ok(clf.lfCharSet == lf.lfCharSet, "expected %d charset, got %d\n", lf.lfCharSet, clf.lfCharSet); + ok(clf.lfHeight == lf.lfHeight, "expected %d height, got %d\n", lf.lfHeight, clf.lfHeight); DeleteObject(hfont); DeleteDC(hdc); }

1 0

[sir_richard] 45641: [NTOS]: Use system PTEs for drivers, both boot drivers and system-loaded drivers. This removes the last user of the deprecated MmAllocateSection internal API. Another side-effect is that drivers will now have much higher load addresses (in the 0xF0000000 and higher range), as you would expect on Windows, plus increasing coverage and usage of system PTEs (which can still be optimized). [NTOS]: Do not "copy" boot drivers from one set of pages to another set of pages. Instead,
by sir_richard＠svn.reactos.org 21 Feb '10

21 Feb '10

Author: sir_richard Date: Sun Feb 21 03:13:20 2010 New Revision: 45641 URL: http://svn.reactos.org/svn/reactos?rev=45641&view=rev Log: [NTOS]: Use system PTEs for drivers, both boot drivers and system-loaded drivers. This removes the last user of the deprecated MmAllocateSection internal API. Another side-effect is that drivers will now have much higher load addresses (in the 0xF0000000 and higher range), as you would expect on Windows, plus increasing coverage and usage of system PTEs (which can still be optimized). [NTOS]: Do not "copy" boot drivers from one set of pages to another set of pages. Instead, use system PTEs to map the boot drivers to a new VA, and set the PFNs to the original PFNs that the loader had obtained (and don't free that memory). This avoids some overhead. [NTOS]: Now the only user of MmMapMemoryArea is the caching code, which I won't touch. Modified: trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Feb 21 03:13:20 2010 @@ -4420,63 +4420,6 @@ return STATUS_NOT_IMPLEMENTED; } - -/********************************************************************** - * NAME INTERNAL - * MmAllocateSection@4 - * - * DESCRIPTION - * - * ARGUMENTS - * Length - * - * RETURN VALUE - * - * NOTE - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - */ -PVOID NTAPI -MmAllocateSection (IN ULONG Length, PVOID BaseAddress) -{ - PVOID Result; - MEMORY_AREA* marea; - NTSTATUS Status; - PMMSUPPORT AddressSpace; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - DPRINT("MmAllocateSection(Length %x)\n",Length); - - BoundaryAddressMultiple.QuadPart = 0; - - AddressSpace = MmGetKernelAddressSpace(); - Result = BaseAddress; - MmLockAddressSpace(AddressSpace); - Status = MmCreateMemoryArea (AddressSpace, - MEMORY_AREA_SYSTEM, - &Result, - Length, - 0, - &marea, - FALSE, - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(AddressSpace); - - if (!NT_SUCCESS(Status)) - { - return (NULL); - } - DPRINT("Result %p\n",Result); - - /* Create a virtual mapping for this memory area */ - MmMapMemoryArea(Result, Length, MC_NPPOOL, PAGE_READWRITE); - - return ((PVOID)Result); -} - - /********************************************************************** * NAME EXPORTED * MmMapViewOfSection Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Sun Feb 21 03:13:20 2010 @@ -4,13 +4,18 @@ * FILE: ntoskrnl/mm/sysldr.c * PURPOSE: Contains the Kernel Loader (SYSLDR) for loading PE files. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#line 16 "ARMÂ³::LOADER" +#define MODULE_INVOLVED_IN_ARM3 +#include "./ARM3/miarm.h" /* GCC's incompetence strikes again */ __inline @@ -25,7 +30,7 @@ va_end(ap); } -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ LIST_ENTRY PsLoadedModuleList; LIST_ENTRY MmLoadedUserImageList; @@ -39,7 +44,7 @@ PVOID MmTriageActionTaken; PVOID KernelVerifier; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ PVOID NTAPI @@ -66,25 +71,6 @@ /* Return the directory */ return DebugDirectory; -} - -VOID -NTAPI -MiFreeBootDriverMemory(PVOID BaseAddress, - ULONG Length) -{ - ULONG i; - - /* Loop each page */ - for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) - { - /* Free the page */ - MmDeleteVirtualMapping(NULL, - (PVOID)((ULONG_PTR)BaseAddress + i * PAGE_SIZE), - TRUE, - NULL, - NULL); - } } NTSTATUS @@ -103,8 +89,10 @@ KAPC_STATE ApcState; LARGE_INTEGER SectionOffset = {{0, 0}}; BOOLEAN LoadSymbols = FALSE; - ULONG DriverSize; + PFN_NUMBER PteCount; + PMMPTE PointerPte, LastPte; PVOID DriverBase; + MMPTE TempPte; PAGED_CODE(); /* Detect session load */ @@ -117,7 +105,7 @@ /* Not session load, shouldn't have an entry */ ASSERT(LdrEntry == NULL); - + /* Attach to the system process */ KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); @@ -159,16 +147,37 @@ KeUnstackDetachProcess(&ApcState); return Status; } - - /* Get the driver size */ - DriverSize = Section->ImageSection->ImageSize; - - /* Allocate a virtual section for the module */ - DriverBase = MmAllocateSection(DriverSize, NULL); + + /* Reserve system PTEs needed */ + PteCount = ROUND_TO_PAGES(Section->ImageSection->ImageSize) >> PAGE_SHIFT; + PointerPte = MiReserveSystemPtes(PteCount, SystemPteSpace); + if (!PointerPte) return STATUS_INSUFFICIENT_RESOURCES; + + /* New driver base */ + LastPte = PointerPte + PteCount; + DriverBase = MiPteToAddress(PointerPte); + + /* The driver is here */ *ImageBase = DriverBase; + /* Loop the new driver PTEs */ + TempPte = ValidKernelPte; + while (PointerPte < LastPte) + { + /* Allocate a page */ + TempPte.u.Hard.PageFrameNumber = MmAllocPage(MC_NPPOOL); + + /* Write it */ + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte = TempPte; + + /* Move on */ + PointerPte++; + } + /* Copy the image */ - RtlCopyMemory(DriverBase, Base, DriverSize); + RtlCopyMemory(DriverBase, Base, PteCount << PAGE_SHIFT); /* Now unmap the view */ Status = MmUnmapViewOfSection(Process, Base); @@ -1210,6 +1219,10 @@ PIMAGE_DATA_DIRECTORY DataDirectory; PVOID DllBase, NewImageAddress; NTSTATUS Status; + PMMPTE PointerPte, StartPte, LastPte; + PFN_NUMBER PteCount; + PMMPFN Pfn1; + MMPTE TempPte, OldPte; /* Loop driver list */ for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; @@ -1266,29 +1279,70 @@ /* Remember the original address */ DllBase = LdrEntry->DllBase; - - /* Allocate a virtual section for the module */ - NewImageAddress = MmAllocateSection(LdrEntry->SizeOfImage, NULL); - if (!NewImageAddress) + + /* Get the first PTE and the number of PTEs we'll need */ + PointerPte = StartPte = MiAddressToPte(LdrEntry->DllBase); + PteCount = ROUND_TO_PAGES(LdrEntry->SizeOfImage) >> PAGE_SHIFT; + LastPte = StartPte + PteCount; + + /* Loop the PTEs */ + while (PointerPte < LastPte) + { + /* Mark the page modified in the PFN database */ + ASSERT(PointerPte->u.Hard.Valid == 1); + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + ASSERT(Pfn1->u3.e1.Rom == 0); + Pfn1->u3.e1.Modified = TRUE; + + /* Next */ + PointerPte++; + } + + /* Now reserve system PTEs for the image */ + PointerPte = MiReserveSystemPtes(PteCount, SystemPteSpace); + if (!PointerPte) { /* Shouldn't happen */ DPRINT1("[Mm0]: Couldn't allocate driver section!\n"); while (TRUE); } + + /* This is the new virtual address for the module */ + LastPte = PointerPte + PteCount; + NewImageAddress = MiPteToAddress(PointerPte); /* Sanity check */ DPRINT("[Mm0]: Copying from: %p to: %p\n", DllBase, NewImageAddress); ASSERT(ExpInitializationPhase == 0); - - /* Now copy the entire driver over */ - RtlCopyMemory(NewImageAddress, DllBase, LdrEntry->SizeOfImage); + + /* Loop the new driver PTEs */ + TempPte = ValidKernelPte; + while (PointerPte < LastPte) + { + /* Copy the old data */ + OldPte = *StartPte; + ASSERT(OldPte.u.Hard.Valid == 1); + + /* Set page number from the loader's memory */ + TempPte.u.Hard.PageFrameNumber = OldPte.u.Hard.PageFrameNumber; + + /* Write it */ + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte = TempPte; + + /* Move on */ + PointerPte++; + StartPte++; + } + + /* Update position */ + PointerPte -= PteCount; /* Sanity check */ ASSERT(*(PULONG)NewImageAddress == *(PULONG)DllBase); /* Set the image base to the address where the loader put it */ - NtHeader->OptionalHeader.ImageBase = (ULONG_PTR)DllBase; - NtHeader = RtlImageNtHeader(NewImageAddress); NtHeader->OptionalHeader.ImageBase = (ULONG_PTR)DllBase; /* Check if we had relocations */ @@ -1323,10 +1377,9 @@ LdrEntry->Flags |= LDRP_SYSTEM_MAPPED; LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)NewImageAddress + NtHeader->OptionalHeader.AddressOfEntryPoint); - LdrEntry->SizeOfImage = LdrEntry->SizeOfImage; - - /* Free the old copy */ - MiFreeBootDriverMemory(DllBase, LdrEntry->SizeOfImage); + LdrEntry->SizeOfImage = PteCount << PAGE_SHIFT; + + /* FIXME: We'll need to fixup the PFN linkage when switching to ARM3 */ } }

1 0

[ekohl] 45640: Partially revert patches 45626 and 45633. Several services do not report their status to the service manager properly. Therefore we must not use any code that relies on service status information as part of the setup and boot processes as long as these issues have not been fixed. The service manager still needs to provide fake information about the service status.
by ekohl＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: ekohl Date: Sun Feb 21 00:10:53 2010 New Revision: 45640 URL: http://svn.reactos.org/svn/reactos?rev=45640&view=rev Log: Partially revert patches 45626 and 45633. Several services do not report their status to the service manager properly. Therefore we must not use any code that relies on service status information as part of the setup and boot processes as long as these issues have not been fixed. The service manager still needs to provide fake information about the service status. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Feb 21 00:10:53 2010 @@ -1054,7 +1054,7 @@ { Group->ServicesRunning = TRUE; } - Service->Status.dwCurrentState = SERVICE_START_PENDING; + Service->Status.dwCurrentState = SERVICE_RUNNING; } #if 0 else Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun Feb 21 00:10:53 2010 @@ -473,34 +473,17 @@ static BOOL EnableUserModePnpManager(VOID) { - SERVICE_STATUS_PROCESS ServiceStatus; SC_HANDLE hSCManager = NULL; SC_HANDLE hService = NULL; - DWORD dwStartTickCount; - DWORD dwOldCheckPoint; - DWORD BytesNeeded = 0; - DWORD dwWaitTime; - DWORD dwMaxWait; - HANDLE hEvent; BOOL ret = FALSE; - hEvent = OpenEventW(EVENT_ALL_ACCESS, - FALSE, - L"SC_AutoStartComplete"); - if (hEvent == NULL) - goto cleanup; - - WaitForSingleObject(hEvent, INFINITE); - - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_CONNECT); + hSCManager = OpenSCManager(NULL, NULL, 0); if (hSCManager == NULL) goto cleanup; hService = OpenServiceW(hSCManager, L"PlugPlay", - SERVICE_CHANGE_CONFIG | SERVICE_START | SERVICE_QUERY_STATUS); + SERVICE_CHANGE_CONFIG | SERVICE_START); if (hService == NULL) goto cleanup; @@ -515,69 +498,9 @@ ret = StartServiceW(hService, 0, NULL); if (!ret) - { - /* If the service is already running, just return TRUE */ - ret = GetLastError() == ERROR_SERVICE_ALREADY_RUNNING; goto cleanup; - } - - ret = QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded); - if (!ret) - goto cleanup; - - /* We don't want to wait for more than 30 seconds */ - dwMaxWait = 30000; - dwStartTickCount = GetTickCount(); - - /* Loop until it's running */ - while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) - { - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - dwWaitTime = ServiceStatus.dwWaitHint / 10; - - /* Get the latest status info */ - if (!QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - /* Something went wrong... */ - break; - } - - /* Is the service making progress? */ - if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) - { - /* It is, get the latest tickcount to reset the max wait time */ - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - } - else - { - /* It's not, make sure we haven't exceeded our wait time */ - if (GetTickCount() >= dwStartTickCount + dwMaxWait) - { - /* We have, give up */ - break; - } - } - - /* Adjust the wait hint times */ - if (dwWaitTime < 200) - dwWaitTime = 200; - else if (dwWaitTime > 10000) - dwWaitTime = 10000; - - /* Wait before trying again */ - Sleep(dwWaitTime); - } - - ret = ServiceStatus.dwCurrentState == SERVICE_RUNNING; + + ret = TRUE; cleanup: if (hSCManager != NULL)

1 0

[fireball] 45639: - Don't prepend fastcall forward's target with @. Fixes binding issues in videoprt, thanks to Olaf Siejka for identifying the issue.
by fireball＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: fireball Date: Sat Feb 20 23:53:11 2010 New Revision: 45639 URL: http://svn.reactos.org/svn/reactos?rev=45639&view=rev Log: - Don't prepend fastcall forward's target with @. Fixes binding issues in videoprt, thanks to Olaf Siejka for identifying the issue. Modified: trunk/reactos/tools/winebuild/ros_diff.patch trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/ros_diff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/ros_diff.p… ============================================================================== --- trunk/reactos/tools/winebuild/ros_diff.patch [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/ros_diff.patch [iso-8859-1] Sat Feb 20 23:53:11 2010 @@ -282,7 +282,7 @@ if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { -@@ -825,6 +883,51 @@ +@@ -825,6 +883,50 @@ } break; } @@ -296,7 +296,6 @@ + if (odp->flags & FLAG_FORWARD) + { + output( "=" ); -+ if (!kill_at) output( "@" ); + output( "%s", odp->link_name ); + } + else if (strcmp(name, odp->link_name)) /* try to reduce output */ Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] Sat Feb 20 23:53:11 2010 @@ -893,7 +893,6 @@ if (odp->flags & FLAG_FORWARD) { output( "=" ); - if (!kill_at) output( "@" ); output( "%s", odp->link_name ); } else if (strcmp(name, odp->link_name)) /* try to reduce output */

1 0

[sir_richard] 45638: [NTOS]: Make MM init read MmProductType to determine what SKU of ReactOS this is, instead of assuming Server. If you want to go back to the old behavior, you need to change "WinNT" to "ServerNT" in the hivesys under Product Type. [NTOS]: Configure the MmSystemSize variable properly based on SKU and RAM. Previously, ReactOS told all drivers and applications you were running on a system with < 13MB RAM. [NTOS]: Initialize thresholds for low and high memory (in pages), low and
by sir_richard＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: sir_richard Date: Sat Feb 20 22:48:36 2010 New Revision: 45638 URL: http://svn.reactos.org/svn/reactos?rev=45638&view=rev Log: [NTOS]: Make MM init read MmProductType to determine what SKU of ReactOS this is, instead of assuming Server. If you want to go back to the old behavior, you need to change "WinNT" to "ServerNT" in the hivesys under Product Type. [NTOS]: Configure the MmSystemSize variable properly based on SKU and RAM. Previously, ReactOS told all drivers and applications you were running on a system with < 13MB RAM. [NTOS]: Initialize thresholds for low and high memory (in pages), low and high paged pool memory, and low and high nonpaged pool memory. These are described in the source. [NTOS]: Initialize events for each of those thresholds, and populate the \KernelObject\xxxCondition events that are documented in MSDN for driver and app developers. [NTOS]: Define some internal thresholds to use later, representing the minimum number of free pages under we go berserk, and the minimum number of free pages that we consider "plenty". [NTOS]: Rename MiRemoveFromList to MiUnlinkFreeOrZeroedPage (Windows name). Make the function handle MmAvailablePages decrement, instead of having the caller do it. [NTOS]: Remove run-time initialization of the PFN lists, just initialize them statically (also fixes the fact we forgot to initialize their names). [NTOS]: Move some more initialization code to ARM3 instead of mm. [NTOS]: Read ProductType from registry into MmProductType instead of dummy value. Remove duplicate "Mirroring" variable read. Modified: trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -11,11 +11,12 @@ #include "ntoskrnl.h" #define NDEBUG #include "debug.h" - + /* GLOBALS *******************************************************************/ ULONG DummyData; ULONG CmNtGlobalFlag; +extern ULONG MmProductType; WCHAR CmDefaultLanguageId[12]; ULONG CmDefaultLanguageIdLength = sizeof(CmDefaultLanguageId); @@ -266,14 +267,6 @@ { L"Session Manager\\Memory Management", - L"Mirroring", - &DummyData, - NULL, - NULL - }, - - { - L"Session Manager\\Memory Management", L"SystemViewSize", &DummyData, NULL, @@ -667,7 +660,7 @@ { L"ProductOptions", L"ProductType", - &DummyData, + &MmProductType, NULL, NULL }, Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -404,6 +404,9 @@ DPRINT("PFN DB PA PFN begins at: %lx\n", PageFrameIndex); DPRINT("NP PA PFN begins at: %lx\n", PageFrameIndex + MxPfnAllocation); + /* Convert nonpaged pool size from bytes to pages */ + MmMaximumNonPagedPoolInPages = MmMaximumNonPagedPoolInBytes >> PAGE_SHIFT; + // // Now we need some pages to create the page tables for the NP system VA // which includes system PTEs and expansion NP @@ -496,10 +499,9 @@ ASSERT(MiAddressToPte(MmNonPagedSystemStart) < MiAddressToPte(MmNonPagedPoolExpansionStart)); - // - // Now go ahead and initialize the ARMÂ³ nonpaged pool - // - MiInitializeArmPool(); + /* Now go ahead and initialize the nonpaged pool */ + MiInitializeNonPagedPool(); + MiInitializeNonPagedPoolThresholds(); /* Map the PFN database pages */ MiMapPfnDatabase(LoaderBlock); Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -168,6 +168,8 @@ extern ULONG MmSizeOfNonPagedPoolInBytes; extern ULONG MmMaximumNonPagedPoolInBytes; +extern PFN_NUMBER MmMaximumNonPagedPoolInPages; +extern PFN_NUMBER MmSizeOfPagedPoolInPages; extern PVOID MmNonPagedSystemStart; extern PVOID MmNonPagedPoolStart; extern PVOID MmNonPagedPoolExpansionStart; @@ -217,6 +219,22 @@ extern ULONG MmMaximumNonPagedPoolPercent; extern ULONG MmLargeStackSize; extern PMMCOLOR_TABLES MmFreePagesByColor[FreePageList + 1]; +extern ULONG MmProductType; +extern MM_SYSTEMSIZE MmSystemSize; +extern PKEVENT MiLowMemoryEvent; +extern PKEVENT MiHighMemoryEvent; +extern PKEVENT MiLowPagedPoolEvent; +extern PKEVENT MiHighPagedPoolEvent; +extern PKEVENT MiLowNonPagedPoolEvent; +extern PKEVENT MiHighNonPagedPoolEvent; +extern PFN_NUMBER MmLowMemoryThreshold; +extern PFN_NUMBER MmHighMemoryThreshold; +extern PFN_NUMBER MiLowPagedPoolThreshold; +extern PFN_NUMBER MiHighPagedPoolThreshold; +extern PFN_NUMBER MiLowNonPagedPoolThreshold; +extern PFN_NUMBER MiHighNonPagedPoolThreshold; +extern PFN_NUMBER MmMinimumFreePages; +extern PFN_NUMBER MmPlentyFreePages; #define MI_PFN_TO_PFNENTRY(x) (&MmPfnDatabase[1][x]) #define MI_PFNENTRY_TO_PFN(x) (x - MmPfnDatabase[1]) @@ -258,6 +276,12 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +BOOLEAN +NTAPI +MiInitializeMemoryEvents( + VOID +); + PFN_NUMBER NTAPI MxGetNextPage( @@ -296,7 +320,19 @@ VOID NTAPI -MiInitializeArmPool( +MiInitializeNonPagedPool( + VOID +); + +VOID +NTAPI +MiInitializeNonPagedPoolThresholds( + VOID +); + +VOID +NTAPI +MiInitializePoolEvents( VOID ); @@ -389,7 +425,7 @@ VOID NTAPI -MiRemoveFromList( +MiUnlinkFreeOrZeroedPage( IN PMMPFN Entry ); Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -25,6 +25,9 @@ ULONG MmMaximumNonPagedPoolPercent; ULONG MmSizeOfNonPagedPoolInBytes; ULONG MmMaximumNonPagedPoolInBytes; + +/* Some of the same values, in pages */ +PFN_NUMBER MmMaximumNonPagedPoolInPages; // // These numbers describe the discrete equation components of the nonpaged @@ -257,6 +260,46 @@ */ C_ASSERT(FreePageList == 1); PMMCOLOR_TABLES MmFreePagesByColor[FreePageList + 1]; + +/* An event used in Phase 0 before the rest of the system is ready to go */ +KEVENT MiTempEvent; + +/* All the events used for memory threshold notifications */ +PKEVENT MiLowMemoryEvent; +PKEVENT MiHighMemoryEvent; +PKEVENT MiLowPagedPoolEvent; +PKEVENT MiHighPagedPoolEvent; +PKEVENT MiLowNonPagedPoolEvent; +PKEVENT MiHighNonPagedPoolEvent; + +/* The actual thresholds themselves, in page numbers */ +PFN_NUMBER MmLowMemoryThreshold; +PFN_NUMBER MmHighMemoryThreshold; +PFN_NUMBER MiLowPagedPoolThreshold; +PFN_NUMBER MiHighPagedPoolThreshold; +PFN_NUMBER MiLowNonPagedPoolThreshold; +PFN_NUMBER MiHighNonPagedPoolThreshold; + +/* + * This number determines how many free pages must exist, at minimum, until we + * start trimming working sets and flushing modified pages to obtain more free + * pages. + * + * This number changes if the system detects that this is a server product + */ +PFN_NUMBER MmMinimumFreePages = 26; + +/* + * This number indicates how many pages we consider to be a low limit of having + * "plenty" of free memory. + * + * It is doubled on systems that have more than 63MB of memory + */ +PFN_NUMBER MmPlentyFreePages = 400; + +/* These values store the type of system this is (small, med, large) and if server */ +ULONG MmProductType; +MM_SYSTEMSIZE MmSystemSize; /* PRIVATE FUNCTIONS **********************************************************/ @@ -907,6 +950,217 @@ VOID NTAPI +MiAdjustWorkingSetManagerParameters(IN BOOLEAN Client) +{ + /* This function needs to do more work, for now, we tune page minimums */ + + /* Check for a system with around 64MB RAM or more */ + if (MmNumberOfPhysicalPages >= (63 * _1MB) / PAGE_SIZE) + { + /* Double the minimum amount of pages we consider for a "plenty free" scenario */ + MmPlentyFreePages *= 2; + } +} + +VOID +NTAPI +MiNotifyMemoryEvents(VOID) +{ + /* Are we in a low-memory situation? */ + if (MmAvailablePages < MmLowMemoryThreshold) + { + /* Clear high, set low */ + if (KeReadStateEvent(MiHighMemoryEvent)) KeClearEvent(MiHighMemoryEvent); + if (!KeReadStateEvent(MiLowMemoryEvent)) KeSetEvent(MiLowMemoryEvent, 0, FALSE); + } + else if (MmAvailablePages < MmHighMemoryThreshold) + { + /* We are in between, clear both */ + if (KeReadStateEvent(MiHighMemoryEvent)) KeClearEvent(MiHighMemoryEvent); + if (KeReadStateEvent(MiLowMemoryEvent)) KeClearEvent(MiLowMemoryEvent); + } + else + { + /* Clear low, set high */ + if (KeReadStateEvent(MiLowMemoryEvent)) KeClearEvent(MiLowMemoryEvent); + if (!KeReadStateEvent(MiHighMemoryEvent)) KeSetEvent(MiHighMemoryEvent, 0, FALSE); + } +} + +NTSTATUS +NTAPI +MiCreateMemoryEvent(IN PUNICODE_STRING Name, + OUT PKEVENT *Event) +{ + PACL Dacl; + HANDLE EventHandle; + ULONG DaclLength; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + SECURITY_DESCRIPTOR SecurityDescriptor; + + /* Create the SD */ + Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) return Status; + + /* One ACL with 3 ACEs, containing each one SID */ + DaclLength = sizeof(ACL) + + 3 * sizeof(ACCESS_ALLOWED_ACE) + + RtlLengthSid(SeLocalSystemSid) + + RtlLengthSid(SeAliasAdminsSid) + + RtlLengthSid(SeWorldSid); + + /* Allocate space for the DACL */ + Dacl = ExAllocatePoolWithTag(PagedPool, DaclLength, 'lcaD'); + if (!Dacl) return STATUS_INSUFFICIENT_RESOURCES; + + /* Setup the ACL inside it */ + Status = RtlCreateAcl(Dacl, DaclLength, ACL_REVISION); + if (!NT_SUCCESS(Status)) goto CleanUp; + + /* Add query rights for everyone */ + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + SYNCHRONIZE | EVENT_QUERY_STATE | READ_CONTROL, + SeWorldSid); + if (!NT_SUCCESS(Status)) goto CleanUp; + + /* Full rights for the admin */ + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + EVENT_ALL_ACCESS, + SeAliasAdminsSid); + if (!NT_SUCCESS(Status)) goto CleanUp; + + /* As well as full rights for the system */ + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + EVENT_ALL_ACCESS, + SeLocalSystemSid); + if (!NT_SUCCESS(Status)) goto CleanUp; + + /* Set this DACL inside the SD */ + Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, + TRUE, + Dacl, + FALSE); + if (!NT_SUCCESS(Status)) goto CleanUp; + + /* Setup the event attributes, making sure it's a permanent one */ + InitializeObjectAttributes(&ObjectAttributes, + Name, + OBJ_KERNEL_HANDLE | OBJ_PERMANENT, + NULL, + &SecurityDescriptor); + + /* Create the event */ + Status = ZwCreateEvent(&EventHandle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + NotificationEvent, + FALSE); +CleanUp: + /* Free the DACL */ + ExFreePool(Dacl); + + /* Check if this is the success path */ + if (NT_SUCCESS(Status)) + { + /* Add a reference to the object, then close the handle we had */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + KernelMode, + (PVOID*)Event, + NULL); + ZwClose (EventHandle); + } + + /* Return status */ + return Status; +} + +BOOLEAN +NTAPI +MiInitializeMemoryEvents(VOID) +{ + UNICODE_STRING LowString = RTL_CONSTANT_STRING(L"\\KernelObjects\\LowMemoryCondition"); + UNICODE_STRING HighString = RTL_CONSTANT_STRING(L"\\KernelObjects\\HighMemoryCondition"); + UNICODE_STRING LowPagedPoolString = RTL_CONSTANT_STRING(L"\\KernelObjects\\LowPagedPoolCondition"); + UNICODE_STRING HighPagedPoolString = RTL_CONSTANT_STRING(L"\\KernelObjects\\HighPagedPoolCondition"); + UNICODE_STRING LowNonPagedPoolString = RTL_CONSTANT_STRING(L"\\KernelObjects\\LowNonPagedPoolCondition"); + UNICODE_STRING HighNonPagedPoolString = RTL_CONSTANT_STRING(L"\\KernelObjects\\HighNonPagedPoolCondition"); + NTSTATUS Status; + + /* Check if we have a registry setting */ + if (MmLowMemoryThreshold) + { + /* Convert it to pages */ + MmLowMemoryThreshold *= (_1MB / PAGE_SIZE); + } + else + { + /* The low memory threshold is hit when we don't consider that we have "plenty" of free pages anymore */ + MmLowMemoryThreshold = MmPlentyFreePages; + + /* More than one GB of memory? */ + if (MmNumberOfPhysicalPages > 0x40000) + { + /* Start at 32MB, and add another 16MB for each GB */ + MmLowMemoryThreshold = (32 * _1MB) / PAGE_SIZE; + MmLowMemoryThreshold += ((MmNumberOfPhysicalPages - 0x40000) >> 7); + } + else if (MmNumberOfPhysicalPages > 0x8000) + { + /* For systems with > 128MB RAM, add another 4MB for each 128MB */ + MmLowMemoryThreshold += ((MmNumberOfPhysicalPages - 0x8000) >> 5); + } + + /* Don't let the minimum threshold go past 64MB */ + MmLowMemoryThreshold = min(MmLowMemoryThreshold, (64 * _1MB) / PAGE_SIZE); + } + + /* Check if we have a registry setting */ + if (MmHighMemoryThreshold) + { + /* Convert it into pages */ + MmHighMemoryThreshold *= (_1MB / PAGE_SIZE); + } + else + { + /* Otherwise, the default is three times the low memory threshold */ + MmHighMemoryThreshold = 3 * MmLowMemoryThreshold; + ASSERT(MmHighMemoryThreshold > MmLowMemoryThreshold); + } + + /* Make sure high threshold is actually higher than the low */ + MmHighMemoryThreshold = max(MmHighMemoryThreshold, MmLowMemoryThreshold); + + /* Create the memory events for all the thresholds */ + Status = MiCreateMemoryEvent(&LowString, &MiLowMemoryEvent); + if (!NT_SUCCESS(Status)) return FALSE; + Status = MiCreateMemoryEvent(&HighString, &MiHighMemoryEvent); + if (!NT_SUCCESS(Status)) return FALSE; + Status = MiCreateMemoryEvent(&LowPagedPoolString, &MiLowPagedPoolEvent); + if (!NT_SUCCESS(Status)) return FALSE; + Status = MiCreateMemoryEvent(&HighPagedPoolString, &MiHighPagedPoolEvent); + if (!NT_SUCCESS(Status)) return FALSE; + Status = MiCreateMemoryEvent(&LowNonPagedPoolString, &MiLowNonPagedPoolEvent); + if (!NT_SUCCESS(Status)) return FALSE; + Status = MiCreateMemoryEvent(&HighNonPagedPoolString, &MiHighNonPagedPoolEvent); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Now setup the pool events */ + MiInitializePoolEvents(); + + /* Set the initial event state */ + MiNotifyMemoryEvents(); + return TRUE; +} + +VOID +NTAPI MmDumpArmPfnDatabase(VOID) { ULONG i; @@ -1324,10 +1578,14 @@ // InitializePool(PagedPool, 0); - // - // Initialize the paged pool mutex - // - KeInitializeGuardedMutex(&MmPagedPoolMutex); + /* Default low threshold of 30MB or one fifth of paged pool */ + MiLowPagedPoolThreshold = (30 * _1MB) >> PAGE_SHIFT; + MiLowPagedPoolThreshold = min(MiLowPagedPoolThreshold, Size / 5); + + /* Default high threshold of 60MB or 25% */ + MiHighPagedPoolThreshold = (60 * _1MB) >> PAGE_SHIFT; + MiHighPagedPoolThreshold = min(MiHighPagedPoolThreshold, (Size * 2) / 5); + ASSERT(MiLowPagedPoolThreshold < MiHighPagedPoolThreshold); } NTSTATUS @@ -1353,6 +1611,17 @@ IncludeType[LoaderBBTMemory] = FALSE; if (Phase == 0) { + /* Initialize the phase 0 temporary event */ + KeInitializeEvent(&MiTempEvent, NotificationEvent, FALSE); + + /* Set all the events to use the temporary event for now */ + MiLowMemoryEvent = &MiTempEvent; + MiHighMemoryEvent = &MiTempEvent; + MiLowPagedPoolEvent = &MiTempEvent; + MiHighPagedPoolEvent = &MiTempEvent; + MiLowNonPagedPoolEvent = &MiTempEvent; + MiHighNonPagedPoolEvent = &MiTempEvent; + // // Define the basic user vs. kernel address space separation // @@ -1432,6 +1701,16 @@ // MiSystemViewStart = (PVOID)((ULONG_PTR)MmSessionBase - MmSystemViewSize); + + + /* Initialize the user mode image list */ + InitializeListHead(&MmLoadedUserImageList); + + /* Initialize the paged pool mutex */ + KeInitializeGuardedMutex(&MmPagedPoolMutex); + + /* Initialize the Loader Lock */ + KeInitializeMutant(&MmSystemLoadLock, FALSE); // // Count physical pages on the system @@ -1538,6 +1817,77 @@ // Size up paged pool and build the shadow system page directory // MiBuildPagedPool(); + + /* Check how many pages the system has */ + if (MmNumberOfPhysicalPages <= (13 * _1MB)) + { + /* Set small system */ + MmSystemSize = MmSmallSystem; + } + else if (MmNumberOfPhysicalPages <= (19 * _1MB)) + { + /* Set small system */ + MmSystemSize = MmSmallSystem; + } + else + { + /* Set medium system */ + MmSystemSize = MmMediumSystem; + } + + /* Check for more than 32MB */ + if (MmNumberOfPhysicalPages >= ((32 * _1MB) / PAGE_SIZE)) + { + /* Check for product type being "Wi" for WinNT */ + if (MmProductType == '\0i\0W') + { + /* Then this is a large system */ + MmSystemSize = MmLargeSystem; + } + else + { + /* For servers, we need 64MB to consider this as being large */ + if (MmNumberOfPhysicalPages >= ((64 * _1MB) / PAGE_SIZE)) + { + /* Set it as large */ + MmSystemSize = MmLargeSystem; + } + } + } + + /* Now setup the shared user data fields */ + ASSERT(SharedUserData->NumberOfPhysicalPages == 0); + SharedUserData->NumberOfPhysicalPages = MmNumberOfPhysicalPages; + SharedUserData->LargePageMinimum = 0; + + /* Check for workstation (Wi for WinNT) */ + if (MmProductType == '\0i\0W') + { + /* Set Windows NT Workstation product type */ + SharedUserData->NtProductType = NtProductWinNt; + MmProductType = 0; + } + else + { + /* Check for LanMan server */ + if (MmProductType == '\0a\0L') + { + /* This is a domain controller */ + SharedUserData->NtProductType = NtProductLanManNt; + } + else + { + /* Otherwise it must be a normal server */ + SharedUserData->NtProductType = NtProductServer; + } + + /* Set the product type, and make the system more aggressive with low memory */ + MmProductType = 1; + MmMinimumFreePages = 81; + } + + /* Update working set tuning parameters */ + MiAdjustWorkingSetManagerParameters(!MmProductType); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -15,11 +15,6 @@ #line 15 "ARMÂ³::MMSUP" #define MODULE_INVOLVED_IN_ARM3 #include "../ARM3/miarm.h" - -/* GLOBALS ********************************************************************/ - -BOOLEAN IsThisAnNtAsSystem = FALSE; -MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; /* PUBLIC FUNCTIONS ***********************************************************/ @@ -137,10 +132,8 @@ NTAPI MmIsThisAnNtAsSystem(VOID) { - // - // Return if this is a server system - // - return IsThisAnNtAsSystem; + /* Return if this is a server system */ + return MmProductType; } /* @@ -150,9 +143,7 @@ NTAPI MmQuerySystemSize(VOID) { - // - // Return the low, medium or high memory system type - // + /* Return the low, medium or high memory system type */ return MmSystemSize; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -18,12 +18,25 @@ /* GLOBALS ********************************************************************/ -MMPFNLIST MmZeroedPageListHead; -MMPFNLIST MmFreePageListHead; -MMPFNLIST MmStandbyPageListHead; -MMPFNLIST MmModifiedPageListHead; -MMPFNLIST MmModifiedNoWritePageListHead; - +MMPFNLIST MmZeroedPageListHead = {0, ZeroedPageList, LIST_HEAD, LIST_HEAD}; +MMPFNLIST MmFreePageListHead = {0, FreePageList, LIST_HEAD, LIST_HEAD}; +MMPFNLIST MmStandbyPageListHead = {0, StandbyPageList, LIST_HEAD, LIST_HEAD}; +MMPFNLIST MmModifiedPageListHead = {0, ModifiedPageList, LIST_HEAD, LIST_HEAD}; +MMPFNLIST MmModifiedNoWritePageListHead = {0, ModifiedNoWritePageList, LIST_HEAD, LIST_HEAD}; +MMPFNLIST MmBadPageListHead = {0, BadPageList, LIST_HEAD, LIST_HEAD}; +MMPFNLIST MmRomPageListHead = {0, StandbyPageList, LIST_HEAD, LIST_HEAD}; + +PMMPFNLIST MmPageLocationList[] = +{ + &MmZeroedPageListHead, + &MmFreePageListHead, + &MmStandbyPageListHead, + &MmModifiedPageListHead, + &MmModifiedNoWritePageListHead, + &MmBadPageListHead, + NULL, + NULL +}; /* FUNCTIONS ******************************************************************/ VOID @@ -57,25 +70,28 @@ VOID NTAPI -MiRemoveFromList(IN PMMPFN Entry) +MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry) { PFN_NUMBER OldFlink, OldBlink; PMMPFNLIST ListHead; - - /* Find the list for this */ - if (Entry->u3.e1.PageLocation == ZeroedPageList) - { - ListHead = &MmZeroedPageListHead; - } - else if (Entry->u3.e1.PageLocation == FreePageList) - { - ListHead = &MmFreePageListHead; - } - else - { - ListHead = NULL; - ASSERT(ListHead != NULL); - } + MMLISTS ListName; + + /* Make sure the PFN lock is held */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + /* Make sure the PFN entry isn't in-use */ + ASSERT(Entry->u3.e1.WriteInProgress == 0); + ASSERT(Entry->u3.e1.ReadInProgress == 0); + + /* Find the list for this entry, make sure it's the free or zero list */ + ListHead = MmPageLocationList[Entry->u3.e1.PageLocation]; + ListName = ListHead->ListName; + ASSERT(ListHead != NULL); + ASSERT(ListName <= FreePageList); + + /* Remove one count */ + ASSERT(ListHead->Total != 0); + ListHead->Total--; /* Get the forward and back pointers */ OldFlink = Entry->u1.Flink; @@ -106,8 +122,27 @@ } /* We are not on a list anymore */ - ListHead->Total--; Entry->u1.Flink = Entry->u2.Blink = 0; + + /* FIXME: Deal with color list */ + + /* See if we hit any thresholds */ + if (MmAvailablePages == MmHighMemoryThreshold) + { + /* Clear the high memory event */ + KeClearEvent(MiHighMemoryEvent); + } + else if (MmAvailablePages == MmLowMemoryThreshold) + { + /* Signal the low memory event */ + KeSetEvent(MiLowMemoryEvent, 0, FALSE); + } + + /* One less page */ + if (--MmAvailablePages < MmMinimumFreePages) + { + /* FIXME: Should wake up the MPW and working set manager, if we had one */ + } } PMMPFN Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -31,7 +31,97 @@ VOID NTAPI -MiInitializeArmPool(VOID) +MiInitializeNonPagedPoolThresholds(VOID) +{ + PFN_NUMBER Size = MmMaximumNonPagedPoolInPages; + + /* Default low threshold of 8MB or one third of nonpaged pool */ + MiLowNonPagedPoolThreshold = (8 * _1MB) >> PAGE_SHIFT; + MiLowNonPagedPoolThreshold = min(MiLowNonPagedPoolThreshold, Size / 3); + + /* Default high threshold of 20MB or 50% */ + MiHighNonPagedPoolThreshold = (20 * _1MB) >> PAGE_SHIFT; + MiHighNonPagedPoolThreshold = min(MiHighNonPagedPoolThreshold, Size / 2); + ASSERT(MiLowNonPagedPoolThreshold < MiHighNonPagedPoolThreshold); +} + +VOID +NTAPI +MiInitializePoolEvents(VOID) +{ + KIRQL OldIrql; + PFN_NUMBER FreePoolInPages; + + /* Lock paged pool */ + KeAcquireGuardedMutex(&MmPagedPoolMutex); + + /* Total size of the paged pool minus the allocated size, is free */ + FreePoolInPages = MmSizeOfPagedPoolInPages - MmPagedPoolInfo.AllocatedPagedPool; + + /* Check the initial state high state */ + if (FreePoolInPages >= MiHighPagedPoolThreshold) + { + /* We have plenty of pool */ + KeSetEvent(MiHighPagedPoolEvent, 0, FALSE); + } + else + { + /* We don't */ + KeClearEvent(MiHighPagedPoolEvent); + } + + /* Check the initial low state */ + if (FreePoolInPages <= MiLowPagedPoolThreshold) + { + /* We're very low in free pool memory */ + KeSetEvent(MiLowPagedPoolEvent, 0, FALSE); + } + else + { + /* We're not */ + KeClearEvent(MiLowPagedPoolEvent); + } + + /* Release the paged pool lock */ + KeReleaseGuardedMutex(&MmPagedPoolMutex); + + /* Now it's time for the nonpaged pool lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueMmNonPagedPoolLock); + + /* Free pages are the maximum minus what's been allocated */ + FreePoolInPages = MmMaximumNonPagedPoolInPages - MmAllocatedNonPagedPool; + + /* Check if we have plenty */ + if (FreePoolInPages >= MiHighNonPagedPoolThreshold) + { + /* We do, set the event */ + KeSetEvent(MiHighNonPagedPoolEvent, 0, FALSE); + } + else + { + /* We don't, clear the event */ + KeClearEvent(MiHighNonPagedPoolEvent); + } + + /* Check if we have very little */ + if (FreePoolInPages <= MiLowNonPagedPoolThreshold) + { + /* We do, set the event */ + KeSetEvent(MiLowNonPagedPoolEvent, 0, FALSE); + } + else + { + /* We don't, clear it */ + KeClearEvent(MiLowNonPagedPoolEvent); + } + + /* We're done, release the nonpaged pool lock */ + KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); +} + +VOID +NTAPI +MiInitializeNonPagedPool(VOID) { ULONG i; PFN_NUMBER PoolPages; Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -245,14 +245,9 @@ do { // - // One less free page - // - MmAvailablePages--; - - // // This PFN is now a used page, set it up // - MiRemoveFromList(Pfn1); + MiUnlinkFreeOrZeroedPage(Pfn1); Pfn1->u3.e2.ReferenceCount = 1; // @@ -638,12 +633,6 @@ PMEMORY_ALLOCATION_DESCRIPTOR Md; PLIST_ENTRY NextEntry; ULONG NrSystemPages = 0; - - /* Initialize the page lists */ - MmFreePageListHead.Flink = MmFreePageListHead.Blink = LIST_HEAD; - MmZeroedPageListHead.Flink = MmZeroedPageListHead.Blink = LIST_HEAD; - MmZeroedPageListHead.Total = 0; - MmFreePageListHead.Total = 0; /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sat Feb 20 22:48:36 2010 @@ -402,25 +402,11 @@ MiInitializeUserPfnBitmap(); MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); - /* Initialize the user mode image list */ - InitializeListHead(&MmLoadedUserImageList); - - /* Initialize the Loader Lock */ - KeInitializeMutant(&MmSystemLoadLock, FALSE); - /* Reload boot drivers */ MiReloadBootLoadedDrivers(LoaderBlock); /* Initialize the loaded module list */ MiInitializeLoadedModuleList(LoaderBlock); - - /* Setup shared user data settings that NT does as well */ - ASSERT(SharedUserData->NumberOfPhysicalPages == 0); - SharedUserData->NumberOfPhysicalPages = MmNumberOfPhysicalPages; - SharedUserData->LargePageMinimum = 0; - - /* For now, we assume that we're always Server */ - SharedUserData->NtProductType = NtProductServer; } else if (Phase == 1) { @@ -454,6 +440,9 @@ TempPte.u.Hard.PageFrameNumber = PageFrameNumber; *MmSharedUserDataPte = TempPte; + /* Setup the memory threshold events */ + if (!MiInitializeMemoryEvents()) return FALSE; + /* * Unmap low memory */

1 0

[ekohl] 45637: [SERVICES] Disable a number of debug messages in the service manager.
by ekohl＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: ekohl Date: Sat Feb 20 21:52:14 2010 New Revision: 45637 URL: http://svn.reactos.org/svn/reactos?rev=45637&view=rev Log: [SERVICES] Disable a number of debug messages in the service manager. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Feb 20 21:52:14 2010 @@ -191,7 +191,7 @@ VOID ScmDeleteServiceRecord(PSERVICE lpService) { - DPRINT1("Deleting Service %S\n", lpService->lpServiceName); + DPRINT("Deleting Service %S\n", lpService->lpServiceName); /* Delete the display name */ if (lpService->lpDisplayName != NULL && @@ -215,12 +215,12 @@ /* Remove the Service from the List */ RemoveEntryList(&lpService->ServiceListEntry); - DPRINT1("Deleted Service %S\n", lpService->lpServiceName); + DPRINT("Deleted Service %S\n", lpService->lpServiceName); /* Delete the service record */ HeapFree(GetProcessHeap(), 0, lpService); - DPRINT1("Done\n"); + DPRINT("Done\n"); } Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Feb 20 21:52:14 2010 @@ -118,7 +118,7 @@ NULL); if (Status != RPC_S_OK) { - DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); return; } @@ -127,14 +127,14 @@ NULL); if (Status != RPC_S_OK) { - DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); + DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); return; } Status = RpcServerListen(1, 20, TRUE); if (Status != RPC_S_OK) { - DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); + DPRINT("RpcServerListen() failed (Status %lx)\n", Status); return; } @@ -153,12 +153,12 @@ if (_wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0) { - DPRINT1("Database %S, does not exist\n",lpDatabaseName); + DPRINT("Database %S, does not exist\n",lpDatabaseName); return ERROR_DATABASE_DOES_NOT_EXIST; } else if (_wcsicmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0) { - DPRINT1("Invalid Database name %S.\n",lpDatabaseName); + DPRINT("Invalid Database name %S.\n",lpDatabaseName); return ERROR_INVALID_NAME; } @@ -284,7 +284,7 @@ NULL); if (dwError != ERROR_SUCCESS) { - DPRINT1("ERROR! Unable to get number of services keys.\n"); + DPRINT("ERROR! Unable to get number of services keys.\n"); return dwError; } @@ -341,7 +341,7 @@ if (!lpCurrentService) { /* This should never happen! */ - DPRINT1("This should not happen at this point, report to Developer\n"); + DPRINT("This should not happen at this point, report to Developer\n"); return ERROR_NOT_FOUND; } @@ -473,7 +473,7 @@ &hServicesKey); if (dwError != ERROR_SUCCESS) { - DPRINT1("Failed to open services key\n"); + DPRINT("Failed to open services key\n"); return dwError; } @@ -488,7 +488,7 @@ /* if pcbBytesNeeded returned a value then there are services running that are dependent on this service*/ if (pcbBytesNeeded) { - DPRINT1("Deletion failed due to running dependencies.\n"); + DPRINT("Deletion failed due to running dependencies.\n"); RegCloseKey(hServicesKey); return ERROR_SUCCESS; } @@ -504,7 +504,7 @@ if (dwError != ERROR_SUCCESS) { - DPRINT1("Failed to Delete the Service Registry key\n"); + DPRINT("Failed to Delete the Service Registry key\n"); return dwError; } @@ -517,7 +517,7 @@ return ERROR_SUCCESS; } - DPRINT1("Invalid handle tag (Tag %lx)\n", hManager->Handle.Tag); + DPRINT("Invalid handle tag (Tag %lx)\n", hManager->Handle.Tag); return ERROR_INVALID_HANDLE; } @@ -546,7 +546,7 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } @@ -554,7 +554,7 @@ lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -603,7 +603,7 @@ &hServicesKey); if (dwError != ERROR_SUCCESS) { - DPRINT1("Failed to open services key\n"); + DPRINT("Failed to open services key\n"); return dwError; } @@ -685,7 +685,7 @@ lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -693,7 +693,7 @@ if (lpService->bDeleted) { - DPRINT1("The service has already been marked for delete!\n"); + DPRINT("The service has already been marked for delete!\n"); return ERROR_SERVICE_MARKED_FOR_DELETE; } @@ -761,7 +761,7 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } @@ -776,14 +776,14 @@ if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, DesiredAccess)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -838,12 +838,12 @@ /* NTSTATUS Status; */ DWORD dwError; - DPRINT1("RSetServiceObjectSecurity() called\n"); + DPRINT("RSetServiceObjectSecurity() called\n"); hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } @@ -875,14 +875,14 @@ if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, DesiredAccess)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -960,21 +960,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_QUERY_STATUS)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -1026,21 +1026,21 @@ if (hServiceStatus == 0) { - DPRINT1("hServiceStatus == NULL!\n"); + DPRINT("hServiceStatus == NULL!\n"); return ERROR_INVALID_HANDLE; } lpService = ScmGetServiceEntryByClientHandle((HANDLE)hServiceStatus); if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } /* Check current state */ if (!ScmIsValidServiceState(lpServiceStatus->dwCurrentState)) { - DPRINT1("Invalid service state!\n"); + DPRINT("Invalid service state!\n"); return ERROR_INVALID_DATA; } @@ -1048,14 +1048,14 @@ if (!(lpServiceStatus->dwServiceType & SERVICE_WIN32) && (lpServiceStatus->dwServiceType & SERVICE_DRIVER)) { - DPRINT1("Invalid service type!\n"); + DPRINT("Invalid service type!\n"); return ERROR_INVALID_DATA; } /* Check accepted controls */ if (lpServiceStatus->dwControlsAccepted & ~0xFF) { - DPRINT1("Invalid controls accepted!\n"); + DPRINT("Invalid controls accepted!\n"); return ERROR_INVALID_DATA; } @@ -1139,21 +1139,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_CHANGE_CONFIG)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -1162,7 +1162,7 @@ if (lpService->bDeleted) { /* FIXME: Unlock database */ - DPRINT1("The service has already been marked for delete!\n"); + DPRINT("The service has already been marked for delete!\n"); return ERROR_SERVICE_MARKED_FOR_DELETE; } @@ -1365,14 +1365,14 @@ *RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) + sizeof(WCHAR)); if (*RelativeName == NULL) { - DPRINT1("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name!\n"); return ERROR_NOT_ENOUGH_MEMORY; } /* Copy it */ wcscpy(*RelativeName, CanonName); - DPRINT1("Bootdriver name %S\n", *RelativeName); + DPRINT("Bootdriver name %S\n", *RelativeName); return ERROR_SUCCESS; } @@ -1385,7 +1385,7 @@ if (*RelativeName == NULL) { - DPRINT1("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name!\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1393,7 +1393,7 @@ wcscpy(*RelativeName, L"\\SystemRoot\\"); wcscat(*RelativeName, CanonName + 13); - DPRINT1("Bootdriver name %S\n", *RelativeName); + DPRINT("Bootdriver name %S\n", *RelativeName); return ERROR_SUCCESS; } @@ -1402,7 +1402,7 @@ if (BufferSize <= 1) { - DPRINT1("Error during a call to ExpandEnvironmentStringsW()\n"); + DPRINT("Error during a call to ExpandEnvironmentStringsW()\n"); return ERROR_INVALID_ENVIRONMENT; } @@ -1410,7 +1410,7 @@ Expanded = LocalAlloc(LMEM_ZEROINIT, BufferSize * sizeof(WCHAR) + sizeof(WCHAR)); if (!Expanded) { - DPRINT1("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name!\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1418,7 +1418,7 @@ if (ExpandEnvironmentStringsW(L"%SystemRoot%\\", Expanded, BufferSize) > BufferSize) { - DPRINT1("Error during a call to ExpandEnvironmentStringsW()\n"); + DPRINT("Error during a call to ExpandEnvironmentStringsW()\n"); LocalFree(Expanded); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1426,7 +1426,7 @@ /* Convert to NY-style path */ if (!RtlDosPathNameToNtPathName_U(Expanded, &NtPathName, NULL, NULL)) { - DPRINT1("Error during a call to RtlDosPathNameToNtPathName_U()\n"); + DPRINT("Error during a call to RtlDosPathNameToNtPathName_U()\n"); return ERROR_INVALID_ENVIRONMENT; } @@ -1439,7 +1439,7 @@ Expanded = LocalAlloc(LMEM_ZEROINIT, NtPathName.Length + sizeof(WCHAR)); if (!Expanded) { - DPRINT1("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name!\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1455,7 +1455,7 @@ (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); if (*RelativeName == NULL) { - DPRINT1("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name!\n"); LocalFree(Expanded); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1491,7 +1491,7 @@ /* Check if required buffer size is sane */ if (BufferSize > 0xFFFD) { - DPRINT1("Too large buffer required\n"); + DPRINT("Too large buffer required\n"); *RelativeName = 0; if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); @@ -1503,7 +1503,7 @@ LinkTarget.Buffer = LocalAlloc(LMEM_ZEROINIT, BufferSize + sizeof(WCHAR)); if (!LinkTarget.Buffer) { - DPRINT1("Unable to alloc buffer\n"); + DPRINT("Unable to alloc buffer\n"); if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); LocalFree(Expanded); return ERROR_NOT_ENOUGH_MEMORY; @@ -1527,7 +1527,7 @@ if (*RelativeName == NULL) { - DPRINT1("Unable to alloc buffer\n"); + DPRINT("Unable to alloc buffer\n"); if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); LocalFree(Expanded); RtlFreeUnicodeString(&NtPathName); @@ -1557,7 +1557,7 @@ } else { - DPRINT1("Error, Status = %08X\n", Status); + DPRINT("Error, Status = %08X\n", Status); if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); LocalFree(Expanded); RtlFreeUnicodeString(&NtPathName); @@ -1566,7 +1566,7 @@ } else { - DPRINT1("Error, Status = %08X\n", Status); + DPRINT("Error, Status = %08X\n", Status); if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); LocalFree(Expanded); RtlFreeUnicodeString(&NtPathName); @@ -1575,7 +1575,7 @@ } else { - DPRINT1("Error, Status = %08X\n", Status); + DPRINT("Error, Status = %08X\n", Status); LocalFree(Expanded); return ERROR_INVALID_PARAMETER; } @@ -1608,7 +1608,7 @@ if (*lpCanonName == NULL) { - DPRINT1("Error allocating memory for canonized service name!\n"); + DPRINT("Error allocating memory for canonized service name!\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1632,7 +1632,7 @@ if (*lpCanonName == NULL) { - DPRINT1("Error allocating memory for canonized service name!\n"); + DPRINT("Error allocating memory for canonized service name!\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1653,7 +1653,7 @@ if (*lpCanonName == NULL) { - DPRINT1("Error allocating memory for canonized service name!\n"); + DPRINT("Error allocating memory for canonized service name!\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1666,7 +1666,7 @@ /* It seems to be a DOS path, convert it */ if (!RtlDosPathNameToNtPathName_U(lpServiceName, &NtServiceName, NULL, NULL)) { - DPRINT1("RtlDosPathNameToNtPathName_U() failed!\n"); + DPRINT("RtlDosPathNameToNtPathName_U() failed!\n"); return ERROR_INVALID_PARAMETER; } @@ -1674,7 +1674,7 @@ if (*lpCanonName == NULL) { - DPRINT1("Error allocating memory for canonized service name!\n"); + DPRINT("Error allocating memory for canonized service name!\n"); RtlFreeUnicodeString(&NtServiceName); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1697,7 +1697,7 @@ { /* There is a problem, free name and return */ LocalFree(*lpCanonName); - DPRINT1("Error converting named!\n"); + DPRINT("Error converting named!\n"); return Result; } @@ -1759,7 +1759,7 @@ hManager = (PMANAGER_HANDLE)hSCManager; if (!hManager || hManager->Handle.Tag != MANAGER_TAG) { - DPRINT1("Invalid manager handle!\n"); + DPRINT("Invalid manager handle!\n"); return ERROR_INVALID_HANDLE; } @@ -1767,8 +1767,8 @@ if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, SC_MANAGER_CREATE_SERVICE)) { - DPRINT1("Insufficient access rights! 0x%lx\n", - hManager->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", + hManager->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } @@ -2086,8 +2086,8 @@ if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SC_MANAGER_ENUMERATE_SERVICE)) { - DPRINT1("Insufficient access rights! 0x%lx\n", - hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", + hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } @@ -2123,7 +2123,7 @@ (dwServicesReturned + 1) * sizeof(PSERVICE)); if (!lpServicesArray) { - DPRINT1("Could not allocate a buffer!!\n"); + DPRINT("Could not allocate a buffer!!\n"); dwError = ERROR_NOT_ENOUGH_MEMORY; goto Done; } @@ -2214,7 +2214,7 @@ hManager = (PMANAGER_HANDLE)hSCManager; if (!hManager || hManager->Handle.Tag != MANAGER_TAG) { - DPRINT1("Invalid manager handle!\n"); + DPRINT("Invalid manager handle!\n"); return ERROR_INVALID_HANDLE; } @@ -2237,7 +2237,7 @@ if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, SC_MANAGER_ENUMERATE_SERVICE)) { - DPRINT1("Insufficient access rights! 0x%lx\n", + DPRINT("Insufficient access rights! 0x%lx\n", hManager->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } @@ -2418,7 +2418,7 @@ &hHandle); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmCreateManagerHandle() failed (Error %lu)\n", dwError); + DPRINT("ScmCreateManagerHandle() failed (Error %lu)\n", dwError); return dwError; } @@ -2427,7 +2427,7 @@ dwDesiredAccess | SC_MANAGER_CONNECT); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmCheckAccess() failed (Error %lu)\n", dwError); + DPRINT("ScmCheckAccess() failed (Error %lu)\n", dwError); HeapFree(GetProcessHeap(), 0, hHandle); return dwError; } @@ -2465,7 +2465,7 @@ hManager = (PMANAGER_HANDLE)hSCManager; if (!hManager || hManager->Handle.Tag != MANAGER_TAG) { - DPRINT1("Invalid manager handle!\n"); + DPRINT("Invalid manager handle!\n"); return ERROR_INVALID_HANDLE; } @@ -2490,7 +2490,7 @@ &hHandle); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmCreateServiceHandle() failed (Error %lu)\n", dwError); + DPRINT("ScmCreateServiceHandle() failed (Error %lu)\n", dwError); return dwError; } @@ -2499,7 +2499,7 @@ dwDesiredAccess); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmCheckAccess() failed (Error %lu)\n", dwError); + DPRINT("ScmCheckAccess() failed (Error %lu)\n", dwError); HeapFree(GetProcessHeap(), 0, hHandle); return dwError; } @@ -2545,21 +2545,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_QUERY_CONFIG)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -2753,21 +2753,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_START)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -2810,7 +2810,7 @@ // hManager = (PMANAGER_HANDLE)hSCManager; // if (hManager->Handle.Tag != MANAGER_TAG) // { -// DPRINT1("Invalid manager handle!\n"); +// DPRINT("Invalid manager handle!\n"); // return ERROR_INVALID_HANDLE; // } @@ -2818,7 +2818,7 @@ lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT1("Could not find a service!\n"); + DPRINT("Could not find a service!\n"); /* If the service could not be found and lpcchBuffer is less than 2, windows puts null in lpDisplayName and puts 2 in lpcchBuffer */ @@ -2884,7 +2884,7 @@ // hManager = (PMANAGER_HANDLE)hSCManager; // if (hManager->Handle.Tag != MANAGER_TAG) // { -// DPRINT1("Invalid manager handle!\n"); +// DPRINT("Invalid manager handle!\n"); // return ERROR_INVALID_HANDLE; // } @@ -2892,7 +2892,7 @@ lpService = ScmGetServiceEntryByDisplayName(lpDisplayName); if (lpService == NULL) { - DPRINT1("Could not find a service!\n"); + DPRINT("Could not find a service!\n"); /* If the service could not be found and lpcchBuffer is less than 2, windows puts null in lpDisplayName and puts 2 in lpcchBuffer */ @@ -2979,21 +2979,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_CHANGE_CONFIG)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -3002,7 +3002,7 @@ if (lpService->bDeleted) { /* FIXME: Unlock database */ - DPRINT1("The service has already been marked for delete!\n"); + DPRINT("The service has already been marked for delete!\n"); return ERROR_SERVICE_MARKED_FOR_DELETE; } @@ -3414,8 +3414,8 @@ if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SC_MANAGER_ENUMERATE_SERVICE)) { - DPRINT1("Insufficient access rights! 0x%lx\n", - hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", + hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } @@ -3456,7 +3456,7 @@ (dwServicesReturned + 1) * sizeof(PSERVICE)); if (!lpServicesArray) { - DPRINT1("Could not allocate a buffer!!\n"); + DPRINT("Could not allocate a buffer!!\n"); dwError = ERROR_NOT_ENOUGH_MEMORY; goto Done; } @@ -3554,7 +3554,7 @@ lpStatusPtrW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwBufSize); if (!lpStatusPtrW) { - DPRINT1("Failed to allocate buffer!\n"); + DPRINT("Failed to allocate buffer!\n"); return ERROR_NOT_ENOUGH_MEMORY; } } @@ -3719,21 +3719,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_QUERY_CONFIG)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -3952,7 +3952,7 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - DPRINT1("RStartServiceA() called\n"); + DPRINT("RStartServiceA() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -3960,21 +3960,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_START)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -4017,7 +4017,7 @@ // hManager = (PMANAGER_HANDLE)hSCManager; // if (hManager->Handle.Tag != MANAGER_TAG) // { -// DPRINT1("Invalid manager handle!\n"); +// DPRINT("Invalid manager handle!\n"); // return ERROR_INVALID_HANDLE; // } @@ -4044,7 +4044,7 @@ if (lpService == NULL) { - DPRINT1("Could not find a service!\n"); + DPRINT("Could not find a service!\n"); /* If the service could not be found and lpcchBuffer is 0, windows puts null in lpDisplayName and puts 1 in lpcchBuffer */ @@ -4140,7 +4140,7 @@ if (lpService == NULL) { - DPRINT1("Could not find the service!\n"); + DPRINT("Could not find the service!\n"); /* If the service could not be found and lpcchBuffer is 0, put null in lpDisplayName and puts 1 in lpcchBuffer, verified WINXP. */ @@ -4341,21 +4341,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_CHANGE_CONFIG)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -4364,7 +4364,7 @@ if (lpService->bDeleted) { /* FIXME: Unlock database */ - DPRINT1("The service has already been marked for delete!\n"); + DPRINT("The service has already been marked for delete!\n"); return ERROR_SERVICE_MARKED_FOR_DELETE; } @@ -4385,7 +4385,7 @@ if (lpServiceDescription != NULL && lpServiceDescription->lpDescription != NULL) { - DPRINT1("Setting value %S\n", lpServiceDescription->lpDescription); + DPRINT("Setting value %S\n", lpServiceDescription->lpDescription); RegSetValueExW(hServiceKey, L"Description", 0, @@ -4430,8 +4430,8 @@ LPWSTR lpDescriptionW = NULL; LPSTR lpDescription = NULL; - DPRINT1("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n", - hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + DPRINT("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n", + hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); if (!lpBuffer) return ERROR_INVALID_ADDRESS; @@ -4442,21 +4442,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_QUERY_CONFIG)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -4562,21 +4562,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_QUERY_CONFIG)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -4715,21 +4715,21 @@ hSvc = (PSERVICE_HANDLE)hService; if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG) { - DPRINT1("Invalid handle tag!\n"); + DPRINT("Invalid handle tag!\n"); return ERROR_INVALID_HANDLE; } if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, SERVICE_QUERY_STATUS)) { - DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT("lpService == NULL!\n"); return ERROR_INVALID_HANDLE; } @@ -4775,7 +4775,7 @@ pszGroupNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (strlen(pszGroupName) + 1) * sizeof(WCHAR)); if (!pszGroupNameW) { - DPRINT1("Failed to allocate buffer!\n"); + DPRINT("Failed to allocate buffer!\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -4792,7 +4792,7 @@ lpStatusPtrW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbBufSize); if (!lpStatusPtrW) { - DPRINT1("Failed to allocate buffer!\n"); + DPRINT("Failed to allocate buffer!\n"); return ERROR_NOT_ENOUGH_MEMORY; } } @@ -4908,7 +4908,7 @@ hManager = (PMANAGER_HANDLE)hSCManager; if (!hManager || hManager->Handle.Tag != MANAGER_TAG) { - DPRINT1("Invalid manager handle!\n"); + DPRINT("Invalid manager handle!\n"); return ERROR_INVALID_HANDLE; } @@ -4917,13 +4917,13 @@ if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) { - DPRINT1("Not a valid Service Type!\n"); + DPRINT("Not a valid Service Type!\n"); return ERROR_INVALID_PARAMETER; } if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) { - DPRINT1("Not a valid Service State!\n"); + DPRINT("Not a valid Service State!\n"); return ERROR_INVALID_PARAMETER; } @@ -4931,8 +4931,8 @@ if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, SC_MANAGER_ENUMERATE_SERVICE)) { - DPRINT1("Insufficient access rights! 0x%lx\n", - hManager->Handle.DesiredAccess); + DPRINT("Insufficient access rights! 0x%lx\n", + hManager->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; }

1 0

[ekohl] 45636: [ADVAPI32] Silence a lot of non-critical service manager error messages (ERR->TRACE).
by ekohl＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: ekohl Date: Sat Feb 20 17:33:28 2010 New Revision: 45636 URL: http://svn.reactos.org/svn/reactos?rev=45636&view=rev Log: [ADVAPI32] Silence a lot of non-critical service manager error messages (ERR->TRACE). Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Feb 20 17:33:28 2010 @@ -258,7 +258,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RChangeServiceConfig2A() failed (Error %lu)\n", dwError); + TRACE("RChangeServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -316,7 +316,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RChangeServiceConfig2W() failed (Error %lu)\n", dwError); + TRACE("RChangeServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -390,7 +390,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RChangeServiceConfigA() failed (Error %lu)\n", dwError); + TRACE("RChangeServiceConfigA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -464,7 +464,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RChangeServiceConfigW() failed (Error %lu)\n", dwError); + TRACE("RChangeServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -504,7 +504,7 @@ if (dwError) { - ERR("RCloseServiceHandle() failed (Error %lu)\n", dwError); + TRACE("RCloseServiceHandle() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -545,7 +545,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RControlService() failed (Error %lu)\n", dwError); + TRACE("RControlService() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -653,7 +653,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RCreateServiceA() failed (Error %lu)\n", dwError); + TRACE("RCreateServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -743,7 +743,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RCreateServiceW() failed (Error %lu)\n", dwError); + TRACE("RCreateServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -777,7 +777,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RDeleteService() failed (Error %lu)\n", dwError); + TRACE("RDeleteService() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -839,7 +839,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("REnumDependentServicesA() failed (Error %lu)\n", dwError); + TRACE("REnumDependentServicesA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -903,7 +903,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("REnumDependentServicesW() failed (Error %lu)\n", dwError); + TRACE("REnumDependentServicesW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1037,7 +1037,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("REnumServicesStatusA() failed (Error %lu)\n", dwError); + TRACE("REnumServicesStatusA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1111,7 +1111,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("REnumServicesStatusW() failed (Error %lu)\n", dwError); + TRACE("REnumServicesStatusW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1195,7 +1195,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("REnumServicesStatusExA() failed (Error %lu)\n", dwError); + TRACE("REnumServicesStatusExA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1267,7 +1267,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("REnumServicesStatusExW() failed (Error %lu)\n", dwError); + TRACE("REnumServicesStatusExW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1329,7 +1329,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RGetServiceDisplayNameA() failed (Error %lu)\n", dwError); + TRACE("RGetServiceDisplayNameA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1386,7 +1386,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RGetServiceDisplayNameW() failed (Error %lu)\n", dwError); + TRACE("RGetServiceDisplayNameW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1443,7 +1443,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RGetServiceKeyNameA() failed (Error %lu)\n", dwError); + TRACE("RGetServiceKeyNameA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1500,7 +1500,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RGetServiceKeyNameW() failed (Error %lu)\n", dwError); + TRACE("RGetServiceKeyNameW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1536,7 +1536,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RLockServiceDatabase() failed (Error %lu)\n", dwError); + TRACE("RLockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1621,7 +1621,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("ROpenSCManagerA() failed (Error %lu)\n", dwError); + TRACE("ROpenSCManagerA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1666,7 +1666,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("ROpenSCManagerW() failed (Error %lu)\n", dwError); + TRACE("ROpenSCManagerW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1715,7 +1715,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("ROpenServiceA() failed (Error %lu)\n", dwError); + TRACE("ROpenServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1764,10 +1764,7 @@ if (dwError != ERROR_SUCCESS) { - if (dwError == ERROR_SERVICE_DOES_NOT_EXIST) - WARN("ROpenServiceW() failed (Error %lu)\n", dwError); - else - ERR("ROpenServiceW() failed (Error %lu)\n", dwError); + TRACE("ROpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1810,7 +1807,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceConfigA() failed (Error %lu)\n", dwError); + TRACE("RQueryServiceConfigA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1879,10 +1876,7 @@ if (dwError != ERROR_SUCCESS) { - if (dwError == ERROR_INSUFFICIENT_BUFFER) - WARN("RQueryServiceConfigW() failed (Error %lu)\n", dwError); - else - ERR("RQueryServiceConfigW() failed (Error %lu)\n", dwError); + TRACE("RQueryServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1933,8 +1927,8 @@ { DWORD dwError; - DbgPrint("QueryServiceConfig2A(hService %p, dwInfoLevel %lu, lpBuffer %p, cbBufSize %lu, pcbBytesNeeded %p)\n", - hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + TRACE("QueryServiceConfig2A(hService %p, dwInfoLevel %lu, lpBuffer %p, cbBufSize %lu, pcbBytesNeeded %p)\n", + hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION && dwInfoLevel != SERVICE_CONFIG_FAILURE_ACTIONS) @@ -1967,7 +1961,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceConfig2A() failed (Error %lu)\n", dwError); + TRACE("RQueryServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2062,7 +2056,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceConfig2W() failed (Error %lu)\n", dwError); + TRACE("RQueryServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2140,7 +2134,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceLockStatusA() failed (Error %lu)\n", dwError); + TRACE("RQueryServiceLockStatusA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2188,7 +2182,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceLockStatusW() failed (Error %lu)\n", dwError); + TRACE("RQueryServiceLockStatusW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2239,7 +2233,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); + TRACE("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2307,7 +2301,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RServiceObjectSecurity() failed (Error %lu)\n", dwError); + TRACE("RServiceObjectSecurity() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2350,7 +2344,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceStatus() failed (Error %lu)\n", dwError); + TRACE("RQueryServiceStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2398,7 +2392,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceStatusEx() failed (Error %lu)\n", dwError); + TRACE("RQueryServiceStatusEx() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2433,7 +2427,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RStartServiceA() failed (Error %lu)\n", dwError); + TRACE("RStartServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2468,7 +2462,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RStartServiceW() failed (Error %lu)\n", dwError); + TRACE("RStartServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2502,7 +2496,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("RUnlockServiceDatabase() failed (Error %lu)\n", dwError); + TRACE("RUnlockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2537,7 +2531,7 @@ if (dwError != ERROR_SUCCESS) { - ERR("NotifyBootConfigStatus() failed (Error %lu)\n", dwError); + TRACE("NotifyBootConfigStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; }

1 0

[sir_richard] 45635: [NTOS]: Remove SwapEntry parameter from MmAllocPage since it was always zero. [NTOS]: Store SwapEntry as WsIndex. We can do this now since Flink is only used when the page is in a list (meaning it's not active, ie. free or zero), and non-active pages don't have a swap entry.
by sir_richard＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: sir_richard Date: Sat Feb 20 15:47:23 2010 New Revision: 45635 URL: http://svn.reactos.org/svn/reactos?rev=45635&view=rev Log: [NTOS]: Remove SwapEntry parameter from MmAllocPage since it was always zero. [NTOS]: Store SwapEntry as WsIndex. We can do this now since Flink is only used when the page is in a list (meaning it's not active, ie. free or zero), and non-active pages don't have a swap entry. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Feb 20 15:47:23 2010 @@ -1339,8 +1339,7 @@ PFN_TYPE NTAPI MmAllocPage( - ULONG Consumer, - SWAPENTRY SavedSwapEntry + ULONG Consumer ); LONG Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Feb 20 15:47:23 2010 @@ -547,7 +547,7 @@ // // Allocate a page for it and create it // - PageFrameIndex = MmAllocPage(MC_SYSTEM, 0); + PageFrameIndex = MmAllocPage(MC_SYSTEM); TempPde.u.Hard.PageFrameNumber = PageFrameIndex; TempPde.u.Hard.Global = FALSE; // Hyperspace is local! ASSERT(StartPde->u.Hard.Valid == 0); Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sat Feb 20 15:47:23 2010 @@ -1251,7 +1251,7 @@ // // Allocate a page and map the first paged pool PDE // - PageFrameIndex = MmAllocPage(MC_NPPOOL, 0); + PageFrameIndex = MmAllocPage(MC_NPPOOL); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; ASSERT(PointerPde->u.Hard.Valid == 0); ASSERT(TempPte.u.Hard.Valid == 1); Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sat Feb 20 15:47:23 2010 @@ -97,7 +97,7 @@ // // Get a page // - PageFrameNumber = MmAllocPage(MC_PPOOL, 0); + PageFrameNumber = MmAllocPage(MC_PPOOL); DPRINT("New pool page: %lx\n", PageFrameNumber); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sat Feb 20 15:47:23 2010 @@ -236,7 +236,7 @@ // // Request a paged pool page and write the PFN for it // - PageFrameNumber = MmAllocPage(MC_PPOOL, 0); + PageFrameNumber = MmAllocPage(MC_PPOOL); TempPte.u.Hard.PageFrameNumber = PageFrameNumber; // @@ -499,7 +499,7 @@ // // Allocate a page // - PageFrameNumber = MmAllocPage(MC_NPPOOL, 0); + PageFrameNumber = MmAllocPage(MC_NPPOOL); // // Get the PFN entry for it Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Feb 20 15:47:23 2010 @@ -158,7 +158,7 @@ // // Get a page // - PageFrameIndex = MmAllocPage(MC_NPPOOL, 0); + PageFrameIndex = MmAllocPage(MC_NPPOOL); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; // @@ -257,7 +257,7 @@ // // Get a page // - PageFrameIndex = MmAllocPage(MC_NPPOOL, 0); + PageFrameIndex = MmAllocPage(MC_NPPOOL); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; // Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sat Feb 20 15:47:23 2010 @@ -260,7 +260,7 @@ if ((Consumer == MC_NPPOOL) || (Consumer == MC_SYSTEM) || MiIsBalancerThread()) { OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MmAllocPage(Consumer, 0); + Page = MmAllocPage(Consumer); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); if (Page == 0) { @@ -326,7 +326,7 @@ * Actually allocate the page. */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MmAllocPage(Consumer, 0); + Page = MmAllocPage(Consumer); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); if (Page == 0) { Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Feb 20 15:47:23 2010 @@ -30,7 +30,6 @@ // REACTOS NT // #define RmapListHead AweReferenceCount -#define SavedSwapEntry u4.EntireFrame #define PHYSICAL_PAGE MMPFN #define PPHYSICAL_PAGE PMMPFN @@ -255,7 +254,6 @@ // MiRemoveFromList(Pfn1); Pfn1->u3.e2.ReferenceCount = 1; - Pfn1->SavedSwapEntry = 0; // // Check if it was already zeroed @@ -448,7 +446,6 @@ Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; Pfn1->u3.e2.ReferenceCount = 1; - Pfn1->SavedSwapEntry = 0; // // Decrease available pages @@ -497,7 +494,6 @@ Pfn1->u3.e2.ReferenceCount = 1; Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; - Pfn1->SavedSwapEntry = 0; // // Decrease available pages @@ -747,7 +743,7 @@ KIRQL oldIrql; oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MiGetPfnEntry(Pfn)->SavedSwapEntry = SwapEntry; + MiGetPfnEntry(Pfn)->u1.WsIndex = SwapEntry; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -759,7 +755,7 @@ KIRQL oldIrql; oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - SwapEntry = MiGetPfnEntry(Pfn)->SavedSwapEntry; + SwapEntry = MiGetPfnEntry(Pfn)->u1.WsIndex; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(SwapEntry); @@ -845,7 +841,7 @@ PFN_TYPE NTAPI -MmAllocPage(ULONG Type, SWAPENTRY SwapEntry) +MmAllocPage(ULONG Type) { PFN_TYPE PfnOffset; PPHYSICAL_PAGE PageDescriptor; @@ -876,7 +872,6 @@ } PageDescriptor->u3.e2.ReferenceCount = 1; - PageDescriptor->SavedSwapEntry = SwapEntry; MmAvailablePages--;

1 0

[sir_richard] 45634: [NTOS]: Manage the PFN lists using the correct Flink/Blink semantics of the MMPFN structure, instead of typecasting a LIST_ENTRY on top of Flink and PteAddress. This allows PteAddress to be used now, and minimizes the number of differences between MMPFN and the ReactOS PHYSICAL_PAGE. [NTOS]: Zero pages starting at the head of the free list, insert them at the back. [NTOS]: Add MiInsertPageInFreeList to build the colored lists (not yet used) in the ARM3 PFN database. [NTOS]:
by sir_richard＠svn.reactos.org 20 Feb '10

20 Feb '10

Author: sir_richard Date: Sat Feb 20 15:40:21 2010 New Revision: 45634 URL: http://svn.reactos.org/svn/reactos?rev=45634&view=rev Log: [NTOS]: Manage the PFN lists using the correct Flink/Blink semantics of the MMPFN structure, instead of typecasting a LIST_ENTRY on top of Flink and PteAddress. This allows PteAddress to be used now, and minimizes the number of differences between MMPFN and the ReactOS PHYSICAL_PAGE. [NTOS]: Zero pages starting at the head of the free list, insert them at the back. [NTOS]: Add MiInsertPageInFreeList to build the colored lists (not yet used) in the ARM3 PFN database. [NTOS]: Rename the ReactOS PFN lists for free/zero to their real names as used in Windows. Added: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c (with props) Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Feb 20 15:40:21 2010 @@ -58,6 +58,11 @@ #else #error Define these please! #endif + +// +// PFN List Sentinel +// +#define LIST_HEAD 0xFFFFFFFF // // FIXFIX: These should go in ex.h after the pool merge @@ -211,6 +216,7 @@ extern ULONG MmNumberOfSystemPtes; extern ULONG MmMaximumNonPagedPoolPercent; extern ULONG MmLargeStackSize; +extern PMMCOLOR_TABLES MmFreePagesByColor[FreePageList + 1]; #define MI_PFN_TO_PFNENTRY(x) (&MmPfnDatabase[1][x]) #define MI_PFNENTRY_TO_PFN(x) (x - MmPfnDatabase[1]) @@ -374,4 +380,30 @@ IN PMDL Mdl ); +VOID +NTAPI +MiInsertInListTail( + IN PMMPFNLIST ListHead, + IN PMMPFN Entry +); + +VOID +NTAPI +MiRemoveFromList( + IN PMMPFN Entry +); + +PMMPFN +NTAPI +MiRemoveHeadList( + IN PMMPFNLIST ListHead +); + + +VOID +NTAPI +MiInsertPageInFreeList( + IN PFN_NUMBER PageFrameIndex +); + /* EOF */ Added: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sat Feb 20 15:40:21 2010 @@ -1,0 +1,240 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/pfnlist.c + * PURPOSE: ARM Memory Manager PFN List Manipulation + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::PFNLIST" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +MMPFNLIST MmZeroedPageListHead; +MMPFNLIST MmFreePageListHead; +MMPFNLIST MmStandbyPageListHead; +MMPFNLIST MmModifiedPageListHead; +MMPFNLIST MmModifiedNoWritePageListHead; + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +MiInsertInListTail(IN PMMPFNLIST ListHead, + IN PMMPFN Entry) +{ + PFN_NUMBER OldBlink, EntryIndex = MiGetPfnEntryIndex(Entry); + + /* Get the back link */ + OldBlink = ListHead->Blink; + if (OldBlink != LIST_HEAD) + { + /* Set the back pointer to point to us now */ + MiGetPfnEntry(OldBlink)->u1.Flink = EntryIndex; + } + else + { + /* Set the list to point to us */ + ListHead->Flink = EntryIndex; + } + + /* Set the entry to point to the list head forwards, and the old page backwards */ + Entry->u1.Flink = LIST_HEAD; + Entry->u2.Blink = OldBlink; + + /* And now the head points back to us, since we are last */ + ListHead->Blink = EntryIndex; + ListHead->Total++; +} + +VOID +NTAPI +MiRemoveFromList(IN PMMPFN Entry) +{ + PFN_NUMBER OldFlink, OldBlink; + PMMPFNLIST ListHead; + + /* Find the list for this */ + if (Entry->u3.e1.PageLocation == ZeroedPageList) + { + ListHead = &MmZeroedPageListHead; + } + else if (Entry->u3.e1.PageLocation == FreePageList) + { + ListHead = &MmFreePageListHead; + } + else + { + ListHead = NULL; + ASSERT(ListHead != NULL); + } + + /* Get the forward and back pointers */ + OldFlink = Entry->u1.Flink; + OldBlink = Entry->u2.Blink; + + /* Check if the next entry is the list head */ + if (OldFlink != LIST_HEAD) + { + /* It is not, so set the backlink of the actual entry, to our backlink */ + MiGetPfnEntry(OldFlink)->u2.Blink = OldBlink; + } + else + { + /* Set the list head's backlink instead */ + ListHead->Blink = OldFlink; + } + + /* Check if the back entry is the list head */ + if (OldBlink != LIST_HEAD) + { + /* It is not, so set the backlink of the actual entry, to our backlink */ + MiGetPfnEntry(OldBlink)->u1.Flink = OldFlink; + } + else + { + /* Set the list head's backlink instead */ + ListHead->Flink = OldFlink; + } + + /* We are not on a list anymore */ + ListHead->Total--; + Entry->u1.Flink = Entry->u2.Blink = 0; +} + +PMMPFN +NTAPI +MiRemoveHeadList(IN PMMPFNLIST ListHead) +{ + PFN_NUMBER Entry, Flink; + PMMPFN Pfn1; + + /* Get the entry that's currently first on the list */ + Entry = ListHead->Flink; + Pfn1 = MiGetPfnEntry(Entry); + + /* Make the list point to the entry following the first one */ + Flink = Pfn1->u1.Flink; + ListHead->Flink = Flink; + + /* Check if the next entry is actually the list head */ + if (ListHead->Flink != LIST_HEAD) + { + /* It isn't, so therefore whoever is coming next points back to the head */ + MiGetPfnEntry(Flink)->u2.Blink = LIST_HEAD; + } + else + { + /* Then the list is empty, so the backlink should point back to us */ + ListHead->Blink = LIST_HEAD; + } + + /* We are not on a list anymore */ + Pfn1->u1.Flink = Pfn1->u2.Blink = 0; + ListHead->Total--; + + /* Return the head element */ + return Pfn1; +} + +VOID +NTAPI +MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) +{ + MMLISTS ListName; + PMMPFNLIST ListHead; + PFN_NUMBER LastPage; + PMMPFN Pfn1, Blink; + ULONG Color; + PMMCOLOR_TABLES ColorHead; + + /* Make sure the page index is valid */ + ASSERT((PageFrameIndex != 0) && + (PageFrameIndex <= MmHighestPhysicalPage) && + (PageFrameIndex >= MmLowestPhysicalPage)); + + /* Get the PFN entry */ + Pfn1 = MI_PFN_TO_PFNENTRY(PageFrameIndex); + + /* Sanity checks that a right kind of page is being inserted here */ + ASSERT(Pfn1->u4.MustBeCached == 0); + ASSERT(Pfn1->u3.e1.Rom != 1); + ASSERT(Pfn1->u3.e1.RemovalRequested == 0); + ASSERT(Pfn1->u4.VerifierAllocation == 0); + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); + + /* Get the free page list and increment its count */ + ListHead = &MmFreePageListHead; + ListName = FreePageList; + ListHead->Total++; + + /* Get the last page on the list */ + LastPage = ListHead->Blink; + if (LastPage != -1) + { + /* Link us with the previous page, so we're at the end now */ + MI_PFN_TO_PFNENTRY(LastPage)->u1.Flink = PageFrameIndex; + } + else + { + /* The list is empty, so we are the first page */ + ListHead->Flink = PageFrameIndex; + } + + /* Now make the list head point back to us (since we go at the end) */ + ListHead->Blink = PageFrameIndex; + + /* And initialize our own list pointers */ + Pfn1->u1.Flink = -1; + Pfn1->u2.Blink = LastPage; + + /* Set the list name and default priority */ + Pfn1->u3.e1.PageLocation = ListName; + Pfn1->u4.Priority = 3; + + /* Clear some status fields */ + Pfn1->u4.InPageError = 0; + Pfn1->u4.AweAllocation = 0; + + /* FIXME: More work to be done regarding page accounting */ + + /* Get the page color */ + Color = PageFrameIndex & MmSecondaryColorMask; + + /* Get the first page on the color list */ + ColorHead = &MmFreePagesByColor[ListName][Color]; + if (ColorHead->Flink == -1) + { + /* The list is empty, so we are the first page */ + Pfn1->u4.PteFrame = -1; + ColorHead->Flink = PageFrameIndex; + } + else + { + /* Get the previous page */ + Blink = (PMMPFN)ColorHead->Blink; + + /* Make it link to us */ + Pfn1->u4.PteFrame = MI_PFNENTRY_TO_PFN(Blink); + Blink->OriginalPte.u.Long = PageFrameIndex; + } + + /* Now initialize our own list pointers */ + ColorHead->Blink = Pfn1; + Pfn1->OriginalPte.u.Long = -1; + + /* And increase the count in the colored list */ + ColorHead->Count++; + + /* FIXME: Notify zero page thread if enough pages are on the free list now */ +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Feb 20 15:40:21 2010 @@ -31,9 +31,6 @@ // #define RmapListHead AweReferenceCount #define SavedSwapEntry u4.EntireFrame -#define RemoveEntryList(x) RemoveEntryList((PLIST_ENTRY)x) -#define InsertTailList(x, y) InsertTailList(x, (PLIST_ENTRY)y) -#define ListEntry u1 #define PHYSICAL_PAGE MMPFN #define PPHYSICAL_PAGE PMMPFN @@ -52,25 +49,8 @@ SIZE_T MmPeakCommitment; SIZE_T MmtotalCommitLimitMaximum; -MMPFNLIST MmZeroedPageListHead; -MMPFNLIST MmFreePageListHead; -MMPFNLIST MmStandbyPageListHead; -MMPFNLIST MmModifiedPageListHead; -MMPFNLIST MmModifiedNoWritePageListHead; - -/* List of pages zeroed by the ZPW (MmZeroPageThreadMain) */ -static LIST_ENTRY FreeZeroedPageListHead; -/* List of free pages, filled by MmGetReferenceCountPage and - * and MmInitializePageList */ -static LIST_ENTRY FreeUnzeroedPageListHead; - static KEVENT ZeroPageThreadEvent; static BOOLEAN ZeroPageThreadShouldTerminate = FALSE; - -static ULONG UnzeroedPageCount = 0; - -/* FUNCTIONS *************************************************************/ - static RTL_BITMAP MiUserPfnBitMap; /* FUNCTIONS *************************************************************/ @@ -153,7 +133,7 @@ MiIsPfnInUse(IN PMMPFN Pfn1) { return ((Pfn1->u3.e1.PageLocation != FreePageList) && - (Pfn1->u3.e1.PageLocation != ZeroedPageList)); + (Pfn1->u3.e1.PageLocation != ZeroedPageList)); } PFN_NUMBER @@ -266,11 +246,6 @@ do { // - // If this was an unzeroed page, there are now less - // - if (Pfn1->u3.e1.PageLocation == ZeroedPageList) UnzeroedPageCount--; - - // // One less free page // MmAvailablePages--; @@ -278,7 +253,7 @@ // // This PFN is now a used page, set it up // - RemoveEntryList(&Pfn1->ListEntry); + MiRemoveFromList(Pfn1); Pfn1->u3.e2.ReferenceCount = 1; Pfn1->SavedSwapEntry = 0; @@ -368,7 +343,6 @@ PFN_NUMBER PageCount, LowPage, HighPage, SkipPages, PagesFound = 0, Page; PPFN_NUMBER MdlPage, LastMdlPage; KIRQL OldIrql; - PLIST_ENTRY ListEntry; PPHYSICAL_PAGE Pfn1; INT LookForZeroedPages; ASSERT (KeGetCurrentIrql() <= APC_LEVEL); @@ -439,20 +413,19 @@ // // Do we have zeroed pages? // - if (!IsListEmpty(&FreeZeroedPageListHead)) + if (MmZeroedPageListHead.Total) { // // Grab a zero page // - ListEntry = RemoveTailList(&FreeZeroedPageListHead); + Pfn1 = MiRemoveHeadList(&MmZeroedPageListHead); } - else if (!IsListEmpty(&FreeUnzeroedPageListHead)) + else if (MmFreePageListHead.Total) { // // Nope, grab an unzeroed page // - ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); - UnzeroedPageCount--; + Pfn1 = MiRemoveHeadList(&MmFreePageListHead); } else { @@ -462,11 +435,6 @@ ASSERT(PagesFound); break; } - - // - // Get the PFN entry for this page - // - Pfn1 = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); // // Make sure it's really free @@ -530,12 +498,7 @@ Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; Pfn1->SavedSwapEntry = 0; - - // - // If this page was unzeroed, we've consumed such a page - // - if (Pfn1->u3.e1.PageLocation != ZeroedPageList) UnzeroedPageCount--; - + // // Decrease available pages // @@ -681,8 +644,10 @@ ULONG NrSystemPages = 0; /* Initialize the page lists */ - InitializeListHead(&FreeUnzeroedPageListHead); - InitializeListHead(&FreeZeroedPageListHead); + MmFreePageListHead.Flink = MmFreePageListHead.Blink = LIST_HEAD; + MmZeroedPageListHead.Flink = MmZeroedPageListHead.Blink = LIST_HEAD; + MmZeroedPageListHead.Total = 0; + MmFreePageListHead.Total = 0; /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); @@ -694,12 +659,10 @@ NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; NextEntry = NextEntry->Flink) { -#undef ListEntry /* Get the descriptor */ Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); -#define ListEntry u1 /* Skip bad memory */ if ((Md->MemoryType == LoaderFirmwarePermanent) || @@ -722,9 +685,8 @@ { /* Mark it as a free page */ MmPfnDatabase[0][Md->BasePage + i].u3.e1.PageLocation = FreePageList; - InsertTailList(&FreeUnzeroedPageListHead, - &MmPfnDatabase[0][Md->BasePage + i].ListEntry); - UnzeroedPageCount++; + MiInsertInListTail(&MmFreePageListHead, + &MmPfnDatabase[0][Md->BasePage + i]); MmAvailablePages++; } } @@ -873,10 +835,8 @@ { MmAvailablePages++; Page->u3.e1.PageLocation = FreePageList; - InsertTailList(&FreeUnzeroedPageListHead, - &Page->ListEntry); - UnzeroedPageCount++; - if (UnzeroedPageCount > 8 && 0 == KeReadStateEvent(&ZeroPageThreadEvent)) + MiInsertInListTail(&MmFreePageListHead, Page); + if (MmFreePageListHead.Total > 8 && 0 == KeReadStateEvent(&ZeroPageThreadEvent)) { KeSetEvent(&ZeroPageThreadEvent, IO_NO_INCREMENT, FALSE); } @@ -888,16 +848,15 @@ MmAllocPage(ULONG Type, SWAPENTRY SwapEntry) { PFN_TYPE PfnOffset; - PLIST_ENTRY ListEntry; PPHYSICAL_PAGE PageDescriptor; BOOLEAN NeedClear = FALSE; DPRINT("MmAllocPage()\n"); - if (IsListEmpty(&FreeZeroedPageListHead)) + if (MmZeroedPageListHead.Total == 0) { - if (IsListEmpty(&FreeUnzeroedPageListHead)) - { + if (MmFreePageListHead.Total == 0) + { /* Check if this allocation is for the PFN DB itself */ if (MmNumberOfPhysicalPages == 0) { @@ -907,18 +866,13 @@ DPRINT1("MmAllocPage(): Out of memory\n"); return 0; } - ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); - UnzeroedPageCount--; - - PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); + PageDescriptor = MiRemoveHeadList(&MmFreePageListHead); NeedClear = TRUE; } else { - ListEntry = RemoveTailList(&FreeZeroedPageListHead); - - PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); + PageDescriptor = MiRemoveHeadList(&MmZeroedPageListHead); } PageDescriptor->u3.e2.ReferenceCount = 1; @@ -931,7 +885,7 @@ { MiZeroPage(PfnOffset); } - + PageDescriptor->u3.e1.PageLocation = ActiveAndValid; return PfnOffset; } @@ -961,7 +915,6 @@ { NTSTATUS Status; KIRQL oldIrql; - PLIST_ENTRY ListEntry; PPHYSICAL_PAGE PageDescriptor; PFN_TYPE Pfn; ULONG Count; @@ -988,11 +941,9 @@ } Count = 0; oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - while (!IsListEmpty(&FreeUnzeroedPageListHead)) + while (MmFreePageListHead.Total) { - ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); - UnzeroedPageCount--; - PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); + PageDescriptor = MiRemoveHeadList(&MmFreePageListHead); /* We set the page to used, because MmCreateVirtualMapping failed with unused pages */ KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); Pfn = PageDescriptor - MmPfnDatabase[0]; @@ -1001,15 +952,14 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); if (NT_SUCCESS(Status)) { - InsertHeadList(&FreeZeroedPageListHead, ListEntry); + MiInsertInListTail(&MmZeroedPageListHead, PageDescriptor); PageDescriptor->u3.e1.PageLocation = ZeroedPageList; Count++; } else { - InsertHeadList(&FreeUnzeroedPageListHead, ListEntry); + MiInsertInListTail(&MmFreePageListHead, PageDescriptor); PageDescriptor->u3.e1.PageLocation = FreePageList; - UnzeroedPageCount++; } } 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] Sat Feb 20 15:40:21 2010 @@ -394,6 +394,7 @@ <file>mmsup.c</file> <file>ncache.c</file> <file>pagfault.c</file> + <file>pfnlist.c</file> <file>pool.c</file> <file>procsup.c</file> <file>syspte.c</file>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs